安全检查登记的nfc提交时间会异常

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterNfcVo.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.safetyCheck.vo.regsiter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -55,5 +56,6 @@ public class TaskRegisterNfcVo {
     private String img;
 
     @ApiModelProperty(value = "提交时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date submitTime;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterPointVo.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.safetyCheck.vo.regsiter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,5 +45,6 @@ public class TaskRegisterPointVo {
     private Long submitBy;
 
     @ApiModelProperty(value = "提交时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date submitTime;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -735,7 +735,8 @@ SELECT t.id,
                p.required                          as mustScan,
                if(dn.status is null, 0, dn.status) as status,
                dn.scan_method                      as scanMethod,
-               dn.img                              as scanMethod
+               dn.img                              as scanMethod,
+               dn.submit_time
         FROM core_safecheck_plan_to_point p
                  inner join core_safetycheck_rule_point rp on p.point_id = rp.id
                  inner join sys_nfc_bind nfc on nfc.area_id = rp.area_id
@@ -757,7 +758,8 @@ SELECT t.id,
         <!--               p.required                          as mustScan,-->
         if(dn.status is null, 0, dn.status) as status,
         dn.scan_method as scanMethod,
-        dn.img as scanMethod
+        dn.img as scanMethod,
+        dn.submit_time
         FROM core_safety_task_data_nfc dn
         inner join sys_nfc_bind nfc on nfc.id = dn.nfc_id
         where dn.task_id = #{taskId}