修改

src/main/java/com/jianteng/modules/base/entity/CalendarDatetypeData.java

@@ -2,7 +2,9 @@ package com.jianteng.modules.base.entity;
 
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jianteng.common.utils.DateUtil;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -26,23 +28,23 @@ public class CalendarDatetypeData {
     private BigDecimal exceptduration6;
     private BigDecimal worktime;
     private String remark;
-    // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime1;
-    // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime2;
-    // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime3;
-    // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime4;
-    // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime5;
-    // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime6;
     private BigDecimal starttime;
     private BigDecimal endtime;

src/main/java/com/jianteng/modules/base/entity/CalendarDatetypeOutData.java

@@ -25,22 +25,22 @@ public class CalendarDatetypeOutData {
     private BigDecimal worktime;
     private String remark;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime1;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime2;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime3;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime4;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime5;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime6;
     private BigDecimal starttime;
     private BigDecimal endtime;

src/main/java/com/jianteng/modules/base/entity/CalendarExceptionData.java

@@ -28,22 +28,22 @@ public class CalendarExceptionData {
     private BigDecimal worktime;
     private String datetype;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime1;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime2;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime3;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime4;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime5;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date exceptexacttime6;
     private Date createdDate;
     private String createdBy;

src/main/java/com/jianteng/modules/base/entity/CalendarExceptionShiftData.java

@@ -14,14 +14,14 @@ public class CalendarExceptionShiftData {
     private String calendarId;
     private String shiftNo;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date scheduledate;
     private String shiftDesc;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date startexacttime;
     @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date endexacttime;
     private BigDecimal starttime;
     private BigDecimal endtime;