风险管控跟踪-时间字段优化

src/main/java/com/chinaitop/depot/risk/mapper/RiskFollowMapper.xml

@@ -13,6 +13,7 @@
             risk_check as riskCheck,
             risk_solve as riskSolve,
             org_id as orgId,
+            zgsj as solveTime,
             create_time as createTime
         from
             risk_follow
@@ -36,10 +37,10 @@
                 #{riskCheck,jdbcType=VARCHAR},
                 #{riskSolve,jdbcType=VARCHAR},
                 #{orgId,jdbcType=INTEGER},
-                #{createTime,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP},
                 #{responsibleDept,jdbcType=VARCHAR},
                 #{responsiblePerson,jdbcType=VARCHAR},
-                #{solveTime,jdbcType=VARCHAR},
+                #{solveTime,jdbcType=TIMESTAMP},
                 #{baseRiskInfo,jdbcType=VARCHAR},
                 #{solveCheckInfo,jdbcType=VARCHAR})
 
@@ -65,7 +66,7 @@
                 zrr = #{responsiblePerson,jdbcType=INTEGER},
             </if>
             <if test="solveTime != null">
-                zgsj = #{solveTime,jdbcType=VARCHAR},
+                zgsj = #{solveTime,jdbcType=TIMESTAMP},
             </if>
             <if test="baseRiskInfo != null">
                 sgxx = #{baseRiskInfo,jdbcType=VARCHAR},

src/main/java/com/chinaitop/depot/risk/mapper/RiskManagementMapper.xml

@@ -50,7 +50,7 @@
                 #{responsibleDept,jdbcType=VARCHAR},
                 #{responsiblePerson,jdbcType=VARCHAR},
                 #{orgId,jdbcType=INTEGER},
-                #{createTime,jdbcType=VARCHAR})
+                #{createTime,jdbcType=TIMESTAMP})
 
     </insert>
 
@@ -91,7 +91,7 @@
                 responsible_person = #{responsiblePerson,jdbcType=VARCHAR},
             </if>
             <if test="modifyTime != null">
-                modify_time = #{modifyTime,jdbcType=DATE},
+                modify_time = #{modifyTime,jdbcType=TIMESTAMP},
             </if>
         </set>
         where id = #{id,jdbcType=INTEGER}

src/main/java/com/chinaitop/depot/risk/model/RiskFollow.java

@@ -1,7 +1,9 @@
 package com.chinaitop.depot.risk.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -64,7 +66,8 @@ public class RiskFollow {
     /**
      * 创建时间
      */
-    private String createTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
 
     /**
      * 责任单位
@@ -80,6 +83,8 @@ public class RiskFollow {
     /**
      * 整改时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private String solveTime;
 
 

src/main/java/com/chinaitop/depot/risk/service/impl/RiskFollowServiceImpl.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -40,7 +41,7 @@ public class RiskFollowServiceImpl implements RiskFollowService {
      */
     @Override
     public void saveData(RiskFollow riskFollow) {
-        riskFollow.setCreateTime(DateUtil.getNow());
+        riskFollow.setCreateTime(new Date());
         riskFollowMapper.insert(riskFollow);
     }