Sfoglia il codice sorgente

安全隐患表时间字段类型修改

aihua 3 anni fa
parent
commit
e5e242fe29

+ 1 - 1
src/main/java/com/chinaitop/depot/risk/controller/RiskManagementController.java

@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
20
 import org.springframework.web.bind.annotation.RequestMethod;
20
 import org.springframework.web.bind.annotation.RequestMethod;
21
 import org.springframework.web.bind.annotation.RestController;
21
 import org.springframework.web.bind.annotation.RestController;
22
 
22
 
23
-import java.util.List;
24
 import java.util.Map;
23
 import java.util.Map;
25
 
24
 
26
 /**
25
 /**
@@ -62,6 +61,7 @@ public class RiskManagementController {
62
             queryMap.put("endDate", ParameterUtil.string2datetime(endDate));
61
             queryMap.put("endDate", ParameterUtil.string2datetime(endDate));
63
         }
62
         }
64
         queryMap.put("orgId", orgId);
63
         queryMap.put("orgId", orgId);
64
+        log.info("startDate是:" +  ParameterUtil.string2datetime(startDate).toString());
65
         return ResponseEntity.ok(new PageInfo<>(riskManagementService.selectListPage(queryMap)));
65
         return ResponseEntity.ok(new PageInfo<>(riskManagementService.selectListPage(queryMap)));
66
     }
66
     }
67
 
67
 

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

@@ -91,7 +91,7 @@
91
                 responsible_person = #{responsiblePerson,jdbcType=VARCHAR},
91
                 responsible_person = #{responsiblePerson,jdbcType=VARCHAR},
92
             </if>
92
             </if>
93
             <if test="modifyTime != null">
93
             <if test="modifyTime != null">
94
-                modify_time = #{modifyTime,jdbcType=VARCHAR},
94
+                modify_time = #{modifyTime,jdbcType=DATE},
95
             </if>
95
             </if>
96
         </set>
96
         </set>
97
         where id = #{id,jdbcType=INTEGER}
97
         where id = #{id,jdbcType=INTEGER}

+ 2 - 2
src/main/java/com/chinaitop/depot/risk/model/RiskManagement.java

@@ -83,12 +83,12 @@ public class RiskManagement {
83
     /**
83
     /**
84
      * 创建时间
84
      * 创建时间
85
      */
85
      */
86
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
86
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
87
     private Date createTime;
87
     private Date createTime;
88
 
88
 
89
     /**
89
     /**
90
      * 修改时间
90
      * 修改时间
91
      */
91
      */
92
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
92
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
93
     private Date modifyTime;
93
     private Date modifyTime;
94
 }
94
 }