Explorar o código

修改日期字段从DATE类型改为DATETIME类型

wangxx hai 1 semana
pai
achega
b90ce224b1

+ 4 - 4
airport-common/src/main/java/com/sundot/airport/common/dto/LedgerCommonQueryReqVO.java

@@ -36,15 +36,15 @@ public class LedgerCommonQueryReqVO implements Serializable {
36 36
     /**
37 37
      * 开始时间
38 38
      */
39
-    @JsonFormat(pattern = "yyyy-MM-dd")
40
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
39
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
40
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
41 41
     private Date startDate;
42 42
 
43 43
     /**
44 44
      * 结束时间
45 45
      */
46
-    @JsonFormat(pattern = "yyyy-MM-dd")
47
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
46
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
47
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
48 48
     private Date endDate;
49 49
 
50 50
 }

+ 2 - 2
airport-common/src/main/java/com/sundot/airport/common/dto/LedgerCommonResVO.java

@@ -17,8 +17,8 @@ public class LedgerCommonResVO implements Serializable {
17 17
     /**
18 18
      * 日期
19 19
      */
20
-    @JsonFormat(pattern = "yyyy-MM-dd")
21
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
20
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
21
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
22 22
     private Date recordDate;
23 23
 
24 24
     /**

+ 4 - 4
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerLeaveSpecial.java

@@ -41,12 +41,12 @@ public class LedgerLeaveSpecial extends BaseEntity {
41 41
     @Excel(name = "假期类型")
42 42
     private String leaveType;
43 43
 
44
-    @JsonFormat(pattern = "yyyy-MM-dd")
45
-    @Excel(name = "开始日期", width = 20, dateFormat = "yyyy-MM-dd")
44
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
45
+    @Excel(name = "开始日期", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
46 46
     private Date startDate;
47 47
 
48
-    @JsonFormat(pattern = "yyyy-MM-dd")
49
-    @Excel(name = "结束日期", width = 20, dateFormat = "yyyy-MM-dd")
48
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
49
+    @Excel(name = "结束日期", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
50 50
     private Date endDate;
51 51
 
52 52
     @Excel(name = "天数")

+ 2 - 2
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerRealtimeInterception.java

@@ -20,8 +20,8 @@ public class LedgerRealtimeInterception extends BaseEntity {
20 20
     @TableId(type = IdType.AUTO)
21 21
     private Long id;
22 22
 
23
-    @JsonFormat(pattern = "yyyy-MM-dd")
24
-    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
23
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
24
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
25 25
     private Date recordDate;
26 26
 
27 27
     @Excel(name = "部门名称")

+ 2 - 2
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerSecurityTest.java

@@ -20,8 +20,8 @@ public class LedgerSecurityTest extends BaseEntity {
20 20
     @TableId(type = IdType.AUTO)
21 21
     private Long id;
22 22
 
23
-    @JsonFormat(pattern = "yyyy-MM-dd")
24
-    @Excel(name = "开展时间", width = 20, dateFormat = "yyyy-MM-dd")
23
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
24
+    @Excel(name = "开展时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
25 25
     private Date recordDate;
26 26
 
27 27
     @Excel(name = "测试区域")

+ 2 - 2
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerServicePatrol.java

@@ -20,8 +20,8 @@ public class LedgerServicePatrol extends BaseEntity {
20 20
     @TableId(type = IdType.AUTO)
21 21
     private Long id;
22 22
 
23
-    @JsonFormat(pattern = "yyyy-MM-dd")
24
-    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
23
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
24
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
25 25
     private Date recordDate;
26 26
 
27 27
     @Excel(name = "部门名称")

+ 2 - 2
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerSupervisionProblem.java

@@ -20,8 +20,8 @@ public class LedgerSupervisionProblem extends BaseEntity {
20 20
     @TableId(type = IdType.AUTO)
21 21
     private Long id;
22 22
 
23
-    @JsonFormat(pattern = "yyyy-MM-dd")
24
-    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
23
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
24
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
25 25
     private Date recordDate;
26 26
 
27 27
     @Excel(name = "部门名称")

+ 2 - 2
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerUnsafeEvent.java

@@ -20,8 +20,8 @@ public class LedgerUnsafeEvent extends BaseEntity {
20 20
     @TableId(type = IdType.AUTO)
21 21
     private Long id;
22 22
 
23
-    @JsonFormat(pattern = "yyyy-MM-dd")
24
-    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
23
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
24
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
25 25
     private Date recordDate;
26 26
 
27 27
     @Excel(name = "航班号")

+ 1 - 1
airport-ledger/src/main/resources/mapper/ledger/LedgerSeizureStatsMapper.xml

@@ -208,7 +208,7 @@
208 208
     <sql id="FILTER_FIXED_CRITERIA_SQL">
209 209
         del_flag = '0'
210 210
         <if test="startDate != null and endDate != null">
211
-            AND record_date BETWEEN #{startDate,jdbcType=DATE} AND #{endDate,jdbcType=DATE}
211
+            AND record_date BETWEEN #{startDate,jdbcType=TIMESTAMP} AND #{endDate,jdbcType=TIMESTAMP}
212 212
         </if>
213 213
         <include refid="FILTER_CRITERIA_SQL"/>
214 214
     </sql>

+ 1 - 1
airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

@@ -105,7 +105,7 @@
105 105
     <sql id="FILTER_CRITERIA_SQL">
106 106
         del_flag = '0'
107 107
         <if test="startDate != null and endDate != null">
108
-            AND record_date BETWEEN #{startDate,jdbcType=DATE} AND #{endDate,jdbcType=DATE}
108
+            AND record_date BETWEEN #{startDate,jdbcType=TIMESTAMP} AND #{endDate,jdbcType=TIMESTAMP}
109 109
         </if>
110 110
         <!-- 三级联动筛选 -->
111 111
         <if test="deptId != null">AND dept_id = #{deptId}</if>