瀏覽代碼

日期格式

lyhzzz 2 年之前
父節點
當前提交
4ee1771db9

+ 2 - 1
src/main/java/com/fdkankan/manage/entity/CameraDetail.java

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -135,7 +136,7 @@ public class CameraDetail implements Serializable {
      * 购买时间
      */
     @TableField("buy_date")
-    private String buyDate;
+    private Date buyDate;
 
     /**
      * 记录的状态,A: 生效,I: 禁用

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -352,7 +352,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 throw new BusinessException(ResultCode.CAMERA_NOT_IN);
             }
             cameraDetail.setAgentId(param.getAgentId());
-            cameraDetail.setBuyDate(param.getBuyDate());
+            cameraDetail.setBuyDate(Dateutils.getDate(param.getBuyDate()));
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());

+ 5 - 4
src/main/java/com/fdkankan/manage/vo/response/CameraDetailVo.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.constant.CameraOutTypeEnum;
 import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
@@ -25,15 +26,15 @@ public class CameraDetailVo {
     private Integer agentId;
     private String agentName;
 
-    private String buyDate;
+    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date buyDate;
     private String warrantyDate;
 
     public String getWarrantyDate() {
-        if(StringUtils.isBlank(buyDate)){
+        if(buyDate ==null){
             return null;
         }
-        Date outTime =  Dateutils.getDate(buyDate);
-        Date date = Dateutils.dateAddOneYear(outTime, 1);
+        Date date = Dateutils.dateAddOneYear(buyDate, 1);
         date = Dateutils.dateAddOne(date, 7);
         return Dateutils.getDayDate(date) +" 23:59:59";
     }