weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期时区问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-28 21:21:51 +08:00
parent 39503f9f3c
commit c7cb8614ef
170 changed files with 690 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysCompanyApp.java
+2 -2
View File
@@ -41,7 +41,7 @@ public class SysCompanyApp extends BaseEntity
private String appVersion;
/** 上架时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "上架时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDatetime;
@@ -149,4 +149,4 @@ public class SysCompanyApp extends BaseEntity
.append("delFlag", getDelFlag())
.toString();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentGps.java
+3 -3
View File
@@ -44,12 +44,12 @@ public class SysEquipmentGps extends BaseEntity
private Integer delFlag;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDatetime;
/** 修改时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDatetime;
@@ -149,4 +149,4 @@ public class SysEquipmentGps extends BaseEntity
.append("updateDatetime", getUpdateDatetime())
.toString();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentPrinter.java
+3 -3
View File
@@ -44,12 +44,12 @@ public class SysEquipmentPrinter extends BaseEntity
private Integer delFlag;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDate;
@@ -149,4 +149,4 @@ public class SysEquipmentPrinter extends BaseEntity
.append("updateDate", getUpdateDate())
.toString();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgCenter.java
+3 -3
View File
@@ -37,14 +37,14 @@ public class SysMsgCenter extends BaseEntity
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/** 更新人 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
/** 状态 */
@@ -58,4 +58,4 @@ public class SysMsgCenter extends BaseEntity
private String msgType;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgPush.java
+3 -3
View File
@@ -37,7 +37,7 @@ public class SysMsgPush extends BaseEntity
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/** 删除状态 */
@@ -47,7 +47,7 @@ public class SysMsgPush extends BaseEntity
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/dto/SysMsgPushDTO.java
+8 -8
View File
@@ -37,11 +37,11 @@ public class SysMsgPushDTO extends BaseEntity
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/** 推送时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date pushTime;
/** 删除状态 */
@@ -51,21 +51,21 @@ public class SysMsgPushDTO extends BaseEntity
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
/* 创建时间搜索 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startCreateTime;
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endCreateTime;
/* 推送时间搜索 */
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startPushTime;
@JsonFormat(pattern = "YYYY-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endPushTime;
}
}