소스 검색

fix: 出入库时间问题

liujing-123 2 주 전
부모
커밋
2116052007

+ 7 - 3
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxRespVO.java

@@ -17,6 +17,9 @@ import com.alibaba.excel.annotation.*;
17 17
 import com.unis.framework.excel.core.annotations.DictFormat;
18 18
 import com.unis.framework.excel.core.convert.DictConvert;
19 19
 
20
+import static com.unis.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
21
+import static com.unis.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
22
+
20 23
 @Schema(description = "管理后台 - 出入库信息 Response VO")
21 24
 @Data
22 25
 @ExcelIgnoreUnannotated
@@ -61,7 +64,8 @@ public class CrkxxRespVO {
61 64
 
62 65
     @Schema(description = "入门时间")
63 66
     @ExcelProperty("入门时间")
64
-    private LocalDateTime rmsj;
67
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
68
+    private String rmsj;
65 69
 
66 70
     @Schema(description = "登记人员")
67 71
     @ExcelProperty("登记人员")
@@ -69,7 +73,7 @@ public class CrkxxRespVO {
69 73
 
70 74
     @Schema(description = "出门时间")
71 75
     @ExcelProperty("出门时间")
72
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
73
-    private DateTime cmsj;
76
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
77
+    private String cmsj;
74 78
 
75 79
 }

+ 4 - 4
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxSaveReqVO.java

@@ -42,15 +42,15 @@ public class CrkxxSaveReqVO {
42 42
     private String ysgj;
43 43
 
44 44
     @Schema(description = "入门时间")
45
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
46
-    private LocalDateTime rmsj;
45
+//    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
46
+    private String rmsj;
47 47
 
48 48
     @Schema(description = "登记人员")
49 49
     private String djry;
50 50
 
51 51
     @Schema(description = "出门时间")
52
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
53
-    private LocalDateTime cmsj;
52
+//    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
53
+    private String cmsj;
54 54
 
55 55
     @Schema(description = "仓房id(DELIVERY_CAXX.ID)", example = "873")
56 56
     private Long cfId;