日期时区问题修改;

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java

@@ -92,17 +92,17 @@ public class ContractManage extends BaseVOEntity{
     private Integer accountingPeriod;
 
     @ApiModelProperty("合同签订日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date signingDate;
 
     @ApiModelProperty("合同生效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 
@@ -162,7 +162,7 @@ public class ContractManage extends BaseVOEntity{
     private Integer automaticFlag;
 
     @ApiModelProperty("出账日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date paymentDate;
 
     @ApiModelProperty(name = "出账天数")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java

@@ -90,17 +90,17 @@ public class ContractManagePO extends BaseVOEntity{
     private Integer accountingPeriod;
 
     @ApiModelProperty("合同签订日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date signingDate;
 
     @ApiModelProperty("合同生效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java

@@ -87,17 +87,17 @@ public class ContractManageDO extends BaseVOEntity{
     private Integer accountingPeriod;
 
     @ApiModelProperty("合同签订日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date signingDate;
 
     @ApiModelProperty("合同生效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 
@@ -196,7 +196,7 @@ public class ContractManageDO extends BaseVOEntity{
     private Integer automaticFlag;
 
     @ApiModelProperty("出账日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date paymentDate;
 
     @ApiModelProperty(name = "出账天数")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java

@@ -83,12 +83,12 @@ public class ContractManageDetail extends BaseVOEntity{
     private String billingAttributesCode;
 
     @ApiModelProperty("合同有效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectEffectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectExpirationDate;
 
@@ -98,4 +98,4 @@ public class ContractManageDetail extends BaseVOEntity{
     @ApiModelProperty("单据类型")
     private String documentType;
 
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java

@@ -82,12 +82,12 @@ public class ContractManageDetailPO extends BaseVOEntity{
     private String billingAttributesCode;
 
     @ApiModelProperty("合同有效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectEffectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectExpirationDate;
 
@@ -97,4 +97,4 @@ public class ContractManageDetailPO extends BaseVOEntity{
     @ApiModelProperty("单据类型")
     private String documentType;
 
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java

@@ -82,12 +82,12 @@ public class ContractManageDetailDO extends BaseVOEntity{
     private String billingAttributesCode;
 
     @ApiModelProperty("合同有效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectEffectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectExpirationDate;
 
@@ -102,4 +102,4 @@ public class ContractManageDetailDO extends BaseVOEntity{
 
     @ApiModelProperty("单据类型")
     private String documentType;
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java

@@ -56,18 +56,18 @@ public class LeaseDO extends BaseVOEntity{
     private BigDecimal leaseArea;
 
     @ApiModelProperty("开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
 
     @ApiModelProperty("结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
 
     @ApiModelProperty("备注")
     private String remark;
 
     @ApiModelProperty("当前时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date time;
 
     @ApiModelProperty("费用类别")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/entity/ProjectManage.java

@@ -63,12 +63,12 @@ public class ProjectManage extends BaseVOEntity{
     private Integer projectStats;
 
     @ApiModelProperty("项目开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginDate;
 
     @ApiModelProperty("项目结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
@@ -91,4 +91,4 @@ public class ProjectManage extends BaseVOEntity{
     @ApiModelProperty("备注")
     private String remark;
 
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/po/ProjectManagePO.java

@@ -62,12 +62,12 @@ public class ProjectManagePO extends BaseVOEntity{
     private Integer projectStats;
 
     @ApiModelProperty("项目开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginDate;
 
     @ApiModelProperty("项目结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
@@ -90,4 +90,4 @@ public class ProjectManagePO extends BaseVOEntity{
     @ApiModelProperty("备注")
     private String remark;
 
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/todo/ProjectManageDO.java

@@ -62,12 +62,12 @@ public class ProjectManageDO extends BaseVOEntity{
     private Integer projectStats;
 
     @ApiModelProperty("项目开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginDate;
 
     @ApiModelProperty("项目结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
@@ -114,4 +114,4 @@ public class ProjectManageDO extends BaseVOEntity{
     private String projectEndTimeStart;
     @ApiModelProperty(name = "项目结束时间查询条件结束日期")
     private String projectEndTimeEnd;
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/entity/ScheduledTask.java

@@ -42,7 +42,7 @@ public class ScheduledTask extends BaseVOEntity {
     private Integer retryCount;
 
     @ApiModelProperty("计划执行时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date executeTime;
 
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTaskLog/entity/ScheduledTaskLog.java

@@ -36,6 +36,6 @@ public class ScheduledTaskLog extends BaseVOEntity {
     private String taskStatus;
 
     @ApiModelProperty("执行时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date executeTime;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/ContractManageDTO.java

@@ -87,17 +87,17 @@ public class ContractManageDTO extends BaseVOEntity{
     private Integer accountingPeriod;
 
     @ApiModelProperty("合同签订日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date signingDate;
 
     @ApiModelProperty("合同生效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 
@@ -187,7 +187,7 @@ public class ContractManageDTO extends BaseVOEntity{
     private Integer automaticFlag;
 
     @ApiModelProperty("出账日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date paymentDate;
 
     @ApiModelProperty(name = "出账天数")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManageDetail/ContractManageDetailDTO.java

@@ -81,12 +81,12 @@ public class ContractManageDetailDTO extends BaseVOEntity{
     private String billingAttributesCode;
 
     @ApiModelProperty("合同有效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectEffectiveDate;
 
     @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date subjectExpirationDate;
 
@@ -102,4 +102,4 @@ public class ContractManageDetailDTO extends BaseVOEntity{
 
     @ApiModelProperty("单据类型")
     private String documentType;
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/projectManage/ProjectManageDTO.java

@@ -61,12 +61,12 @@ public class ProjectManageDTO extends BaseVOEntity{
     private Integer projectStats;
 
     @ApiModelProperty("项目开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目开始日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginDate;
 
     @ApiModelProperty("项目结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "项目结束日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
@@ -117,4 +117,4 @@ public class ProjectManageDTO extends BaseVOEntity{
     private String projectEndTimeStart;
     @ApiModelProperty(name = "项目结束时间查询条件结束日期")
     private String projectEndTimeEnd;
-}
+}