diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialCommonFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialCommonFeign.java index 4a27cac49..3b6775166 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialCommonFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialCommonFeign.java @@ -82,12 +82,12 @@ public class MaterialCommonFeign extends BaseVOEntity{ private String dangerLevelName; @ApiModelProperty("生产日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionTime; @ApiModelProperty("失效日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd") private Date expirationTime; @@ -101,4 +101,4 @@ public class MaterialCommonFeign extends BaseVOEntity{ @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java index 0ccd4662f..413411bda 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java @@ -71,7 +71,7 @@ public class StockOutOrder extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class StockOutOrder extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class StockOutOrder extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java index c1dbb225a..fb6951f12 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java @@ -71,7 +71,7 @@ public class StockOutOrderTZPD extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class StockOutOrderTZPD extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class StockOutOrderTZPD extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserUpdateDTO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserUpdateDTO.java index 802a9e3e2..03818569f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserUpdateDTO.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserUpdateDTO.java @@ -42,10 +42,10 @@ public class UserUpdateDTO extends BaseVOEntity { private String userIdcardNumber; @ApiModelProperty(name = "身份证号加密") private String userIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private Date userIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private Date userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -89,15 +89,15 @@ public class UserUpdateDTO extends BaseVOEntity { private int userAuthStatus; @ApiModelProperty(name = "用户审核人用户姓名") private String userAuthByUsername; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户审核时间") private Date userAuthTime; @ApiModelProperty(name = "加入黑名单备注（解除时需要清空）") private String userStatusRemark; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户状态更新时间") private Date userStatusTime; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private Date userBirthday; @ApiModelProperty(name = "用户住址信息") diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDTO.java index 457658fe8..c90f508ad 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDTO.java @@ -131,7 +131,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{ private Integer payStatus; @ApiModelProperty("付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTime; @@ -139,7 +139,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; @@ -208,7 +208,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{ private BigDecimal commissionRate; @ApiModelProperty("货主付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTimeShipper; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java index 901e47c2d..eb53b120a 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java @@ -46,7 +46,7 @@ public class DispatchFeignDto extends BaseVOEntity{ private Date dispatchDate; /** 计划发车日期 */ @ApiModelProperty("计划发车日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "计划发车日期", width = 30, dateFormat = "yyyy-MM-dd") private Date planDepartureDate; /** 计划送货时间/提货时间 */ @@ -56,12 +56,12 @@ public class DispatchFeignDto extends BaseVOEntity{ private Date deliveryDate; /** 最后装车时间 */ @ApiModelProperty("最后装车时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "最后装车时间", width = 30, dateFormat = "yyyy-MM-dd") private Date loadDate; /** 发车日期 */ @ApiModelProperty("发车日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发车日期", width = 30, dateFormat = "yyyy-MM-dd") private Date departureDate; /** 接车日期（入库时间） */ @@ -191,12 +191,12 @@ public class DispatchFeignDto extends BaseVOEntity{ private Long transportStatus; /** 到达时间 */ @ApiModelProperty("到达时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd") private Date arriveDate; /** 实际提货/送货时间 */ @ApiModelProperty("实际提货/送货时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "实际提货/送货时间", width = 30, dateFormat = "yyyy-MM-dd") private Date actualDeliveryDate; @ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）") diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java index 95d2fd5d6..d822270a1 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java @@ -89,12 +89,12 @@ public class ReconciliationDTO extends BaseVOEntity{ private String waybillSourceName; @ApiModelProperty("对账起始日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账起始日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationStart; @ApiModelProperty("对账结束日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账结束日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationEnd; @@ -186,7 +186,7 @@ public class ReconciliationDTO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; @@ -202,27 +202,27 @@ public class ReconciliationDTO extends BaseVOEntity{ private Long invoiceInfoId; @ApiModelProperty("核销时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "核销时间开始", width = 30, dateFormat = "yyyy-MM-dd") private Date collectionTimeStart; @ApiModelProperty("核销时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "核销时间结束", width = 30, dateFormat = "yyyy-MM-dd") private Date collectionTimeEnd; @ApiModelProperty("创建时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd") private String createTimeStart; @ApiModelProperty("创建时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd") private String createTimeEnd; @ApiModelProperty("审核时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd") private Date authTimeStart; @ApiModelProperty("审核时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间结束", width = 30, dateFormat = "yyyy-MM-dd") private Date authTimeEnd; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java index 0245eb646..4781ad673 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java @@ -99,7 +99,7 @@ public class ServiceBillDO extends BaseVOEntity { private Date signTime; @ApiModelProperty("交账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date reportTime; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDTO.java index c1865cadc..4d7cd3493 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDTO.java @@ -45,10 +45,10 @@ public class UserDTO extends BaseVOEntity { private String userIdcardNumber; @ApiModelProperty(name = "身份证号加密") private String userIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private Date userIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private Date userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -79,7 +79,7 @@ public class UserDTO extends BaseVOEntity { private String userWechatSessionKey; @ApiModelProperty(name = "密码登录错误次数") private Integer passwordWrongTimes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "最近一次登录时间") private Date lastLoginTime; @ApiModelProperty(name = "最近一次登录IP") @@ -92,15 +92,15 @@ public class UserDTO extends BaseVOEntity { private Integer userAuthStatus; @ApiModelProperty(name = "用户审核人用户姓名") private String userAuthByUsername; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户审核时间") private Date userAuthTime; @ApiModelProperty(name = "加入黑名单备注（解除时需要清空）") private String userStatusRemark; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户状态更新时间") private Date userStatusTime; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private Date userBirthday; @ApiModelProperty(name = "用户住址信息") @@ -149,4 +149,4 @@ public class UserDTO extends BaseVOEntity { private List userIds; @ApiModelProperty(name = "菜单表ID") public Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDriverDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDriverDTO.java index b3c1f9fcf..3829b4ecd 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDriverDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/UserDriverDTO.java @@ -36,15 +36,15 @@ public class UserDriverDTO { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private Date driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private Date driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private Date driverLicenseDateTo; @@ -75,15 +75,15 @@ public class UserDriverDTO { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private Date driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private Date driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private Date driverWorkLicenseDateTo; @@ -102,10 +102,10 @@ public class UserDriverDTO { @ApiModelProperty(name = "经营许可证业户名称") private String driverBusinessLicenseOwner; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "经营许可证有效期开始日期") private Date driverBusinessLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "经营许可证有效期到期日期") private Date driverBusinessLicenseDateTo; @@ -130,11 +130,11 @@ public class UserDriverDTO { @ApiModelProperty(name = "企业注册地址") private String driverEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业执照有效期开始日期") private Date driverEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业执照有效期到期日期") private Date driverEnterpriseLicenseDateTo; @@ -156,11 +156,11 @@ public class UserDriverDTO { @ApiModelProperty(name = "法人身份证号") private String driverCorpIdcardNumber; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期开始日期") private Date driverCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期结束日期") private Date driverCorpIdcardDateTo; @@ -205,4 +205,4 @@ public class UserDriverDTO { @ApiModelProperty(value = "绑定来源 1-新增，2-绑定接口") private Integer bindSource; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java index 0903da8c4..945e75165 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java @@ -89,7 +89,7 @@ public class CapitalFlowReport extends BaseVOEntity{ private Integer reportStatus; @ApiModelProperty("上报日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd") private Date reportTime; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/DriverReport.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/DriverReport.java index 1fb86c9d2..4812cb53d 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/DriverReport.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/DriverReport.java @@ -59,22 +59,22 @@ public class DriverReport extends BaseVOEntity { private String remark; @ApiModelProperty("驾驶证有效期自") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "驾驶证有效期自", width = 30, dateFormat = "yyyy-MM-dd") private Date validPeriodFrom; @ApiModelProperty("驾驶证有效期至") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "驾驶证有效期至", width = 30, dateFormat = "yyyy-MM-dd") private Date validPeriodTo; @ApiModelProperty("身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date idCardPeriodFrom; @ApiModelProperty("身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date idCardPeriodTo; @@ -83,7 +83,7 @@ public class DriverReport extends BaseVOEntity { private Integer idCardIsEndless; @ApiModelProperty("首次驾照签发日期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "首次驾照签发日期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date icenseFirstGetDate; @@ -92,7 +92,7 @@ public class DriverReport extends BaseVOEntity { private Integer reportStatus; @ApiModelProperty("上报日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd") private Date reportTime; @@ -105,7 +105,7 @@ public class DriverReport extends BaseVOEntity { private Integer verifyStatus; @ApiModelProperty("信息检验时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd") private Date verifyTime; @@ -163,4 +163,4 @@ public class DriverReport extends BaseVOEntity { @ApiModelProperty("操作类型(1- 新增 2-绑定车辆 3-解绑车辆)") private Integer typeFlag; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/TransportNoteReport.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/TransportNoteReport.java index 3e81ba4ee..a53abbdf4 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/TransportNoteReport.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/TransportNoteReport.java @@ -48,12 +48,12 @@ public class TransportNoteReport extends BaseVOEntity{ private String waybillId; @ApiModelProperty("运单生成时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "运单生成时间", width = 30, dateFormat = "yyyy-MM-dd") private Date consignmentDateTime; @ApiModelProperty("上报时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd") private Date sendToProDateTime; @@ -62,12 +62,12 @@ public class TransportNoteReport extends BaseVOEntity{ private String businessTypeCode; @ApiModelProperty("发货日期时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发货日期时间", width = 30, dateFormat = "yyyy-MM-dd") private Date dispatchActualDateTime; @ApiModelProperty("收货日期时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "收货日期时间", width = 30, dateFormat = "yyyy-MM-dd") private Date goodsReceiptDateTime; @@ -244,7 +244,7 @@ public class TransportNoteReport extends BaseVOEntity{ private Integer reportStatus; @ApiModelProperty("上报日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd") private Date reportTime; @@ -257,7 +257,7 @@ public class TransportNoteReport extends BaseVOEntity{ private Integer verifyStatus; @ApiModelProperty("信息检验时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd") private Date verifyTime; @@ -270,7 +270,7 @@ public class TransportNoteReport extends BaseVOEntity{ private Integer flowReportStatus; @ApiModelProperty("上报日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd") private Date flowReportTime; @@ -283,7 +283,7 @@ public class TransportNoteReport extends BaseVOEntity{ private Integer flowVerifyStatus; @ApiModelProperty("信息检验时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd") private Date flowVerifyTime; @@ -312,7 +312,7 @@ public class TransportNoteReport extends BaseVOEntity{ private String onlineFileUrl; @ApiModelProperty("合同签订时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "合同签订时间", width = 30, dateFormat = "yyyy-MM-dd") private Date settlementTime; @@ -349,4 +349,4 @@ public class TransportNoteReport extends BaseVOEntity{ private String belongSystem; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/VehicleReport.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/VehicleReport.java index 800735f13..88fa4ec9e 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/VehicleReport.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/VehicleReport.java @@ -87,7 +87,7 @@ public class VehicleReport extends BaseVOEntity { private Date issueDate; @ApiModelProperty("道路运输许可证过期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "道路运输许可证过期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date transportLicenseExpireDate; @@ -124,7 +124,7 @@ public class VehicleReport extends BaseVOEntity { private Integer reportStatus; @ApiModelProperty("上报日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd") private Date reportTime; @@ -137,7 +137,7 @@ public class VehicleReport extends BaseVOEntity { private Integer verifyStatus; @ApiModelProperty("车辆信息检验时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "车辆信息检验时间", width = 30, dateFormat = "yyyy-MM-dd") private Date verifyTime; @@ -198,4 +198,4 @@ public class VehicleReport extends BaseVOEntity { private String belongSystem; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java index f16d88ba5..08c0a827d 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java @@ -178,7 +178,7 @@ public class Order extends BaseVOEntity{ private BigDecimal commissionCharges; @ApiModelProperty("放款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "放款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date loanTime; @@ -263,7 +263,7 @@ public class Order extends BaseVOEntity{ private String deliveryRemark; @ApiModelProperty("预约提货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预约提货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date sendCarStartTime; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/ContractManagePO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/ContractManagePO.java index 698aaef39..4db7d5167 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/ContractManagePO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/ContractManagePO.java @@ -87,17 +87,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; @@ -160,7 +160,7 @@ public class ContractManagePO extends BaseVOEntity{ private Integer automaticFlag; @ApiModelProperty("出账日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date paymentDate; @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)") @@ -169,4 +169,4 @@ public class ContractManagePO extends BaseVOEntity{ @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)") private Integer transportationCosts; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java index c7f075680..04f4df28a 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java @@ -38,12 +38,12 @@ public class DispatchPo extends BaseVOEntity { private Long dispatchType; /** 调度配（派）车日期 */ @ApiModelProperty("调度配（派）车日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "调度配", readConverterExp = "派=") private Date dispatchDate; /** 计划发车日期 */ @ApiModelProperty("计划发车日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "计划发车日期", width = 30, dateFormat = "yyyy-MM-dd") private Date planDepartureDate; /** 计划送货时间/提货时间 */ @@ -53,17 +53,17 @@ public class DispatchPo extends BaseVOEntity { private Date deliveryDate; /** 最后装车时间 */ @ApiModelProperty("最后装车时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "最后装车时间", width = 30, dateFormat = "yyyy-MM-dd") private Date loadDate; /** 发车日期 */ @ApiModelProperty("发车日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发车日期", width = 30, dateFormat = "yyyy-MM-dd") private Date departureDate; /** 接车日期（入库时间） */ @ApiModelProperty("接车日期（入库时间）") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "接车日期", readConverterExp = "入=库时间") private Date pickUpDate; /** 寄件(发站)网点 */ @@ -187,12 +187,12 @@ public class DispatchPo extends BaseVOEntity { private Long transportStatus; /** 到达时间 */ @ApiModelProperty("到达时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd") private Date arriveDate; /** 实际提货/送货时间 */ @ApiModelProperty("实际提货/送货时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "实际提货/送货时间", width = 30, dateFormat = "yyyy-MM-dd") private Date actualDeliveryDate; @ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）") diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java index f80939491..ca248e012 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java @@ -274,7 +274,7 @@ public class OrderVerificationPo extends BaseVOEntity{ private String deliveryRemark; @ApiModelProperty("预约提货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预约提货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date sendCarStartTime; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserAuthPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserAuthPo.java index 2ca56c193..d4012797f 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserAuthPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserAuthPo.java @@ -18,10 +18,10 @@ public class UserAuthPo { @ApiModelProperty(name = "身份证号") private String userIdcardNumber; @ApiModelProperty(name = "身份证有效期自") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateFrom; @ApiModelProperty(name = "身份证有效期至") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") private Integer userIdcardLong; @@ -46,4 +46,4 @@ public class UserAuthPo { @ApiModelProperty(name = "用户生日") private String userBirthday = ""; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverAuthPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverAuthPo.java index 0a194d25b..84be64389 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverAuthPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverAuthPo.java @@ -22,15 +22,15 @@ public class UserDriverAuthPo { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private String driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private String driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private String driverLicenseDateTo; @@ -61,15 +61,15 @@ public class UserDriverAuthPo { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private String driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo; @@ -98,4 +98,4 @@ public class UserDriverAuthPo { @ApiModelProperty(name = "核定载质量") private BigDecimal vehicleApprovedLoadQuantity; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterpriseAuthPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterpriseAuthPo.java index 6262ada96..08d40bfbf 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterpriseAuthPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterpriseAuthPo.java @@ -40,12 +40,12 @@ public class UserDriverEnterpriseAuthPo{ private String driverBusinessLicenseOwner; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -74,12 +74,12 @@ public class UserDriverEnterpriseAuthPo{ private String driverEnterpriseAddress; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -112,12 +112,12 @@ public class UserDriverEnterpriseAuthPo{ private String driverCorpIdcardNumber; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -144,4 +144,4 @@ public class UserDriverEnterpriseAuthPo{ private String driverEnterpriseFillName; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterprisePo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterprisePo.java index 8013aa1e1..c1e20e278 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterprisePo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverEnterprisePo.java @@ -41,12 +41,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity { private String driverBusinessLicenseOwner=""; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -75,12 +75,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity { private String driverEnterpriseAddress=""; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -109,12 +109,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity { private String driverCorpIdcardNumber=""; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -141,7 +141,7 @@ public class UserDriverEnterprisePo extends BaseVOEntity { private String driverEnterpriseFillName=""; /** 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseFillTime; @@ -165,4 +165,4 @@ public class UserDriverEnterprisePo extends BaseVOEntity { @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java index 20995faf3..a85965d84 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java @@ -34,10 +34,10 @@ public class UserDriverListPo { private String organizationName = ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -57,7 +57,7 @@ public class UserDriverListPo { private String driverWorkLicenseAuthorityName = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo = ""; @@ -79,18 +79,18 @@ public class UserDriverListPo { private String driverBusinessLicenseOwner=""; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String driverBusinessLicenseDateFrom=""; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String driverBusinessLicenseDateTo=""; @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String driverEnterpriseLicenseDateFrom=""; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String driverEnterpriseLicenseDateTo=""; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @ApiModelProperty("企业营业执照是否长期：0-无状态，1-是，2-否") @@ -137,7 +137,7 @@ public class UserDriverListPo { * 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") @JsonSerialize(nullsUsing = DateNullToStringSerializer.class) private Date driverEnterpriseFillTime; @@ -153,7 +153,7 @@ public class UserDriverListPo { @ApiModelProperty("承运人车队长认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效") private Integer driverCaptainFill = 0; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private Date driverLicenseDateTo; @@ -172,7 +172,7 @@ public class UserDriverListPo { @ApiModelProperty(name = "经营许可证件校验状态（0-无状态，1-未核验，2-核验通过，3-核验失败）") private Integer driverBusinessLicenseCheckoutStatus = 0; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; @@ -182,14 +182,14 @@ public class UserDriverListPo { @ApiModelProperty(name = "从业资格证主页图片地址") private String driverWorkLicenseFrontUrl; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private Date driverLicenseDateFrom; @ApiModelProperty(name = "驾驶证档案编号") private String driverLicenseNumber; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private Date driverLicenseFirstDate; @@ -208,7 +208,7 @@ public class UserDriverListPo { @ApiModelProperty(name = "详细地址") private String userAreaAddress = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @@ -247,11 +247,11 @@ public class UserDriverListPo { @ApiModelProperty(name = "法人身份证手持照片") private String driverCorpIdcardInhandUrl; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期开始日期") private Date driverCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期结束日期") private Date driverCorpIdcardDateTo; @@ -267,7 +267,7 @@ public class UserDriverListPo { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private Date driverWorkLicenseFirstDate; @@ -312,4 +312,4 @@ public class UserDriverListPo { @ApiModelProperty(name = "") private String wlhydriverId; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java index 5027edf44..8625bbbfd 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java @@ -46,17 +46,17 @@ public class UserDriverPo { @ApiModelProperty(name = "备注/用户基本信息") private String userRemark = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "用户头像") private String avatar= ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -80,15 +80,15 @@ public class UserDriverPo { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private String driverLicenseFirstDate = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private String driverLicenseDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private String driverLicenseDateTo = ""; @@ -119,15 +119,15 @@ public class UserDriverPo { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private String driverWorkLicenseFirstDate = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo = ""; @@ -210,4 +210,4 @@ public class UserDriverPo { private String promoCode; @ApiModelProperty(value = "公司名称") private String companyName = ""; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java index fb671aaa7..ee3260087 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java @@ -47,10 +47,10 @@ public class UserPo { @ApiModelProperty(name = "身份证号加密") private String userIdcardNumberDes = ""; @ApiModelProperty(name = "身份证有效期自") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateFrom = ""; @ApiModelProperty(name = "身份证有效期至") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") private Integer userIdcardLong = 0; @@ -103,7 +103,7 @@ public class UserPo { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(name = "用户状态更新时间") private String userStatusTime = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "用户住址信息") diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperAuthPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperAuthPo.java index 032598c3f..c96efb5eb 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperAuthPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperAuthPo.java @@ -29,11 +29,11 @@ public class UserShipperAuthPo { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") private String shipperEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") private String shipperEnterpriseLicenseDateTo; @@ -56,10 +56,10 @@ public class UserShipperAuthPo { private String shipperCorpLegalName; @ApiModelProperty(name = "法人身份证号") private String shipperCorpIdcardNumber; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") private String shipperCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private String shipperCorpIdcardDateTo; @ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否") @@ -86,4 +86,4 @@ public class UserShipperAuthPo { @ApiModelProperty(name = "托运人发货企业审核原因") private String shipperEnterpriseFillRemark; -} +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java index 97d9bd4e4..db3ff7e9f 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java @@ -33,7 +33,7 @@ public class UserShipperPo { private String userIdcardBackUrl = ""; @ApiModelProperty(name = "手持身份证") private String userIdcardInhandUrl = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "手机号码") @@ -47,10 +47,10 @@ public class UserShipperPo { private String roleName = ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -82,11 +82,11 @@ public class UserShipperPo { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") private String shipperEnterpriseLicenseDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") private String shipperEnterpriseLicenseDateTo = ""; @@ -132,10 +132,10 @@ public class UserShipperPo { private String shipperCorpIdcardNumber = ""; @ApiModelProperty(name = "法人身份证号加密") private String shipperCorpIdcardNumberDes = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") private String shipperCorpIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private String shipperCorpIdcardDateTo = ""; @ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否") @@ -271,6 +271,4 @@ public class UserShipperPo { @ApiModelProperty("货主code") private String roleCodeShipper; - } - - + } \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/report/UserDriverReportPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/report/UserDriverReportPo.java index 5bb01ebd3..2bb7e4e1c 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/report/UserDriverReportPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/report/UserDriverReportPo.java @@ -48,17 +48,17 @@ public class UserDriverReportPo { @ApiModelProperty(name = "备注/用户基本信息") private String userRemark; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday; @ApiModelProperty(name = "用户头像") private String avatar; @ApiModelProperty(name = "身份证号") private String userIdcardNumber; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -85,15 +85,15 @@ public class UserDriverReportPo { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private String driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private String driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private String driverLicenseDateTo; @@ -124,15 +124,15 @@ public class UserDriverReportPo { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private String driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo; @@ -193,4 +193,4 @@ public class UserDriverReportPo { -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java index 8cdff265c..9c5cddcad 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java +++ b/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 = "出账天数") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java index 6ede0c62c..0f3b140ea 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java +++ b/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; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java index 180240c17..5902d3a01 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java +++ b/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 = "出账天数") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java index 7bd070d98..8af878e6e 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java index d57dffe07..a67500951 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java index 80acd301c..0691d5915 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java index 6e6da37e8..27e5621ce 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java +++ b/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("费用类别") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/entity/ProjectManage.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/entity/ProjectManage.java index 1f1f90e0b..bf16af26b 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/entity/ProjectManage.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/po/ProjectManagePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/po/ProjectManagePO.java index 00dc44930..135b3d8a1 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/po/ProjectManagePO.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/todo/ProjectManageDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/todo/ProjectManageDO.java index d119e4142..aaa519a6b 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/projectManage/repository/todo/ProjectManageDO.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/entity/ScheduledTask.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/entity/ScheduledTask.java index e910d3078..bd684ba07 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/entity/ScheduledTask.java +++ b/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; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTaskLog/entity/ScheduledTaskLog.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTaskLog/entity/ScheduledTaskLog.java index 59ff409fc..162aa5edf 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTaskLog/entity/ScheduledTaskLog.java +++ b/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; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/ContractManageDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/ContractManageDTO.java index bf93087b3..fdd7a3478 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/ContractManageDTO.java +++ b/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 = "出账天数") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManageDetail/ContractManageDetailDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManageDetail/ContractManageDetailDTO.java index d45098c18..92d2b4400 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManageDetail/ContractManageDetailDTO.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/projectManage/ProjectManageDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/projectManage/ProjectManageDTO.java index 655e7572d..10216d2ac 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/projectManage/ProjectManageDTO.java +++ b/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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysCompanyApp.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysCompanyApp.java index 03956b367..bafb0c73d 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysCompanyApp.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysCompanyApp.java @@ -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(); } -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentGps.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentGps.java index 25b057fe4..4a5c9a05f 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentGps.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentGps.java @@ -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(); } -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentPrinter.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentPrinter.java index a2309bc9a..58feb2edc 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentPrinter.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysEquipmentPrinter.java @@ -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(); } -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgCenter.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgCenter.java index e1c7d7cf2..d68a09077 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgCenter.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgCenter.java @@ -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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgPush.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgPush.java index e8e16fea9..90f25c7e4 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgPush.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/SysMsgPush.java @@ -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; -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/dto/SysMsgPushDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/dto/SysMsgPushDTO.java index a40ea6cd6..94a62a509 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/dto/SysMsgPushDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/domain/dto/SysMsgPushDTO.java @@ -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; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEnterprise.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEnterprise.java index 923a4320e..dfb6a6ccd 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEnterprise.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEnterprise.java @@ -44,12 +44,12 @@ public class UserDriverEnterprise extends BaseVOEntity{ private String driverBusinessLicenseOwner; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -78,12 +78,12 @@ public class UserDriverEnterprise extends BaseVOEntity{ private String driverEnterpriseAddress; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -116,12 +116,12 @@ public class UserDriverEnterprise extends BaseVOEntity{ private String driverCorpIdcardNumber; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -146,7 +146,7 @@ public class UserDriverEnterprise extends BaseVOEntity{ private Integer driverEnterpriseFill; /** 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseFillTime; @@ -184,4 +184,4 @@ public class UserDriverEnterprise extends BaseVOEntity{ @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java index 547cbd8b1..2bb313af5 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java @@ -42,15 +42,15 @@ public class UserDriverEntity extends BaseVOEntity { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private Date driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private Date driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private Date driverLicenseDateTo; @@ -81,15 +81,15 @@ public class UserDriverEntity extends BaseVOEntity { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private Date driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private Date driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private Date driverWorkLicenseDateTo; @@ -149,4 +149,4 @@ public class UserDriverEntity extends BaseVOEntity { */ @ApiModelProperty(name = "组织名称") private String organizationName; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java index 9dc934f64..a8daa108d 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java @@ -47,11 +47,11 @@ public class UserShipperEntity extends BaseVOEntity { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") private Date shipperEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") private Date shipperEnterpriseLicenseDateTo; @@ -84,11 +84,11 @@ public class UserShipperEntity extends BaseVOEntity { @ApiModelProperty(name = "法人身份证号加密") private String shipperCorpIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") private Date shipperCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private Date shipperCorpIdcardDateTo; @@ -275,4 +275,4 @@ public class UserShipperEntity extends BaseVOEntity { @ApiModelProperty(name = "推送人姓名") private String pushByName; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserAuthPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserAuthPo.java index 252b727b4..e97f4cc2a 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserAuthPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserAuthPo.java @@ -18,10 +18,10 @@ public class UserAuthPo { @ApiModelProperty(name = "身份证号") private String userIdcardNumber; @ApiModelProperty(name = "身份证有效期自") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateFrom; @ApiModelProperty(name = "身份证有效期至") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") private Integer userIdcardLong; @@ -56,4 +56,4 @@ public class UserAuthPo { @ApiModelProperty("身份证发证机关") private String certificationAuthority; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverAuthPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverAuthPo.java index c97454e07..88139aef1 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverAuthPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverAuthPo.java @@ -22,15 +22,15 @@ public class UserDriverAuthPo { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private String driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private String driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private String driverLicenseDateTo; @@ -63,15 +63,15 @@ public class UserDriverAuthPo { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private String driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo; @@ -109,4 +109,4 @@ public class UserDriverAuthPo { @ApiModelProperty(name = "核定载质量") private BigDecimal vehicleApprovedLoadQuantity; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverCaptainAuthPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverCaptainAuthPo.java index bd7afda66..b51b63900 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverCaptainAuthPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverCaptainAuthPo.java @@ -28,10 +28,10 @@ public class UserDriverCaptainAuthPo { @ApiModelProperty(name = "身份证号") private String userIdcardNumber; @ApiModelProperty(name = "身份证有效期自") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateFrom; @ApiModelProperty(name = "身份证有效期至") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") private Integer userIdcardLong; @@ -58,4 +58,4 @@ public class UserDriverCaptainAuthPo { private String userAuthStatusName; @ApiModelProperty(name = "用户生日") private String userBirthday = ""; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterpriseAuthPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterpriseAuthPo.java index e44f9b3f9..9afc687b9 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterpriseAuthPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterpriseAuthPo.java @@ -41,12 +41,12 @@ public class UserDriverEnterpriseAuthPo { private String driverBusinessLicenseOwner; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -76,12 +76,12 @@ public class UserDriverEnterpriseAuthPo { private String driverEnterpriseAddress; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -115,12 +115,12 @@ public class UserDriverEnterpriseAuthPo { private String driverCorpIdcardNumber; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -165,4 +165,4 @@ public class UserDriverEnterpriseAuthPo { @ApiModelProperty(value = "法人证件类型名称") private String legalPersonIdName; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterprisePo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterprisePo.java index 478197b08..657fbb4a0 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterprisePo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverEnterprisePo.java @@ -42,12 +42,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity{ private String driverBusinessLicenseOwner=""; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -76,12 +76,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity{ private String driverEnterpriseAddress=""; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -114,12 +114,12 @@ public class UserDriverEnterprisePo extends BaseVOEntity{ private String driverCorpIdcardNumber=""; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -145,7 +145,7 @@ public class UserDriverEnterprisePo extends BaseVOEntity{ /** 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseFillTime; @@ -189,4 +189,4 @@ public class UserDriverEnterprisePo extends BaseVOEntity{ @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverInfoPO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverInfoPO.java index 566406976..2d975f4fa 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverInfoPO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverInfoPO.java @@ -32,13 +32,13 @@ public class UserDriverInfoPO extends BaseVOEntity { private String driverLicenseBackUrl = ""; @ApiModelProperty(name = "准驾车型名称") private String driverAllowDrivingTypeName = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private String driverLicenseFirstDate = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private String driverLicenseDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private String driverLicenseDateTo = ""; @ApiModelProperty(name = "驾驶证是否长期：0-无状态，1-是，2-否") @@ -60,13 +60,13 @@ public class UserDriverInfoPO extends BaseVOEntity { private String driverWorkLicenseNumber = ""; @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private String driverWorkLicenseFirstDate = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo = ""; @ApiModelProperty(name = "从业资格证是否长期：0-无状态，1-是，2-否") @@ -86,15 +86,15 @@ public class UserDriverInfoPO extends BaseVOEntity { private String userName = ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") private Integer userIdcardLong; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "县区名称") @@ -120,11 +120,11 @@ public class UserDriverInfoPO extends BaseVOEntity { @ApiModelProperty("企业注册电话") private String driverEnterprisePhone=""; @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; @ApiModelProperty("企业营业执照是否长期：0-无状态，1-是，2-否") @@ -145,11 +145,11 @@ public class UserDriverInfoPO extends BaseVOEntity { @ApiModelProperty("法人身份证号") private String driverCorpIdcardNumber=""; @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; @ApiModelProperty("法人身份证是否长期：0-无状态，1-是，2-否") @@ -164,11 +164,11 @@ public class UserDriverInfoPO extends BaseVOEntity { @ApiModelProperty("经营许可证业户名称") private String driverBusinessLicenseOwner=""; @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; @ApiModelProperty("经营许可证是否长期：0-无状态，1-是，2-否") @@ -177,4 +177,4 @@ public class UserDriverInfoPO extends BaseVOEntity { -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java index 8456359f0..5e6bdefaf 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java @@ -56,17 +56,17 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "部门ID") private String departmentId; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "用户头像") private String avatar= ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -90,15 +90,15 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private String driverLicenseFirstDate = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private String driverLicenseDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private String driverLicenseDateTo = ""; @NeedSetValue @@ -129,15 +129,15 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private String driverWorkLicenseFirstDate = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private String driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private String driverWorkLicenseDateTo = ""; @@ -237,4 +237,4 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "经营许可证号") private String driverBusinessLicenseNumber; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperAuthPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperAuthPo.java index 39353cf20..6ef7b2635 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperAuthPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperAuthPo.java @@ -33,11 +33,11 @@ public class UserShipperAuthPo { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") private String shipperEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") private String shipperEnterpriseLicenseDateTo; @@ -61,10 +61,10 @@ public class UserShipperAuthPo { private String shipperCorpLegalName; @ApiModelProperty(name = "法人身份证号") private String shipperCorpIdcardNumber; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") private String shipperCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private String shipperCorpIdcardDateTo; @ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否") @@ -121,4 +121,4 @@ public class UserShipperAuthPo { @ApiModelProperty(name = "成立日期") private String establishDate; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java index f02467097..45d02c12c 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java @@ -33,7 +33,7 @@ public class UserShipperPo implements Serializable { @NeedSetValue @ApiModelProperty(name = "手持身份证") private String userIdcardInhandUrl = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "手机号码") @@ -47,10 +47,10 @@ public class UserShipperPo implements Serializable { private String roleName = ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -82,11 +82,11 @@ public class UserShipperPo implements Serializable { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") private String shipperEnterpriseLicenseDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") private String shipperEnterpriseLicenseDateTo = ""; @@ -137,10 +137,10 @@ public class UserShipperPo implements Serializable { private String shipperCorpIdcardNumber = ""; @ApiModelProperty(name = "法人身份证号加密") private String shipperCorpIdcardNumberDes = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") private String shipperCorpIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private String shipperCorpIdcardDateTo = ""; @ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否") @@ -335,4 +335,4 @@ public class UserShipperPo implements Serializable { @ApiModelProperty(value = "推送人姓名") private String pushByName; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java index bad8143e1..7dd6ca320 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java @@ -57,15 +57,15 @@ public class UserDriverDO extends UserDO { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private Date driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private Date driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private Date driverLicenseDateTo; @@ -98,15 +98,15 @@ public class UserDriverDO extends UserDO { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private Date driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private Date driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private Date driverWorkLicenseDateTo; @@ -176,11 +176,11 @@ public class UserDriverDO extends UserDO { private String driverBusinessLicenseNumber; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date driverBusinessLicenseDateTo; /** 企业名称 */ @ApiModelProperty("企业名称") @@ -189,12 +189,12 @@ public class UserDriverDO extends UserDO { private String driverEnterpriseSocialCreditCode; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; @@ -292,4 +292,4 @@ public class UserDriverDO extends UserDO { @ApiModelProperty("当前用户的组织是否开启排队") private Integer isQueue; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverEnterpriseDo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverEnterpriseDo.java index 02dd83823..5408e33cc 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverEnterpriseDo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverEnterpriseDo.java @@ -42,12 +42,12 @@ public class UserDriverEnterpriseDo extends UserDO{ private String driverBusinessLicenseOwner; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -77,12 +77,12 @@ public class UserDriverEnterpriseDo extends UserDO{ private String driverEnterpriseAddress; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -116,12 +116,12 @@ public class UserDriverEnterpriseDo extends UserDO{ private String driverCorpIdcardNumber; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -149,7 +149,7 @@ public class UserDriverEnterpriseDo extends UserDO{ private Integer driverEnterpriseFill; /** 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseFillTime; @@ -215,4 +215,4 @@ public class UserDriverEnterpriseDo extends UserDO{ @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java index ea12a7413..37a0b5d5e 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java @@ -45,11 +45,11 @@ public class UserShipperDO extends UserDO { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperEnterpriseLicenseDateTo; @@ -87,12 +87,12 @@ public class UserShipperDO extends UserDO { @ApiModelProperty(name = "法人身份证号加密") private String shipperCorpIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperCorpIdcardDateTo; @@ -127,10 +127,10 @@ public class UserShipperDO extends UserDO { @ApiModelProperty(name = "货主审核原因") private String shipperStatusRemark; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private Date shipperCorpIdcardDateToStart; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private Date shipperCorpIdcardDateToEnd; @@ -315,4 +315,4 @@ public class UserShipperDO extends UserDO { @ApiModelProperty(name = "登录密码（6-20位）") private String userPassword; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java index b1362e70e..fcdaad5f9 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java @@ -53,10 +53,10 @@ public class UserDTO extends BaseVOEntity { private String userIdcardNumber; @ApiModelProperty(name = "身份证号加密") private String userIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private Date userIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private Date userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -91,7 +91,7 @@ public class UserDTO extends BaseVOEntity { private String userWechatSessionKey; @ApiModelProperty(name = "密码登录错误次数") private Integer passwordWrongTimes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "最近一次登录时间") private Date lastLoginTime; @ApiModelProperty(name = "最近一次登录时间起") @@ -116,15 +116,15 @@ public class UserDTO extends BaseVOEntity { private Integer userAuthStatus; @ApiModelProperty(name = "用户审核人用户姓名") private String userAuthByUsername; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户审核时间") private Date userAuthTime; @ApiModelProperty(name = "加入黑名单备注（解除时需要清空）") private String userStatusRemark; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户状态更新时间") private Date userStatusTime; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private Date userBirthday; @ApiModelProperty(name = "用户住址信息") diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java index 5568c1264..7b5860df8 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java @@ -47,15 +47,15 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "驾驶证发证机关") private String driverCertificationAuthority; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "初次领证日期") private Date driverLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期开始日期") private Date driverLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "驾驶证有效期到期日期") private Date driverLicenseDateTo; @@ -88,15 +88,15 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "从业资格证类别名称") private String driverWorkLicenseTypeName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证初次领证日期") private Date driverWorkLicenseFirstDate; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期开始日期") private Date driverWorkLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "从业资格证有效期到期日期") private Date driverWorkLicenseDateTo; @@ -120,10 +120,10 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "经营许可证业户名称") private String driverBusinessLicenseOwner; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "经营许可证有效期开始日期") private Date driverBusinessLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "经营许可证有效期到期日期") private Date driverBusinessLicenseDateTo; @@ -149,11 +149,11 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "企业注册地址") private String driverEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业执照有效期开始日期") private Date driverEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业执照有效期到期日期") private Date driverEnterpriseLicenseDateTo; @@ -176,11 +176,11 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "法人身份证号") private String driverCorpIdcardNumber; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期开始日期") private Date driverCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期结束日期") private Date driverCorpIdcardDateTo; @@ -316,4 +316,4 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "车辆主体") private String vehicleBody; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverEnterpriseDto.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverEnterpriseDto.java index 32dbc75bc..e5eae42ee 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverEnterpriseDto.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverEnterpriseDto.java @@ -42,12 +42,12 @@ public class UserDriverEnterpriseDto extends UserDTO{ private String driverBusinessLicenseOwner; /** 经营许可证有效期开始日期 */ @ApiModelProperty("经营许可证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateFrom; /** 经营许可证有效期到期日期 */ @ApiModelProperty("经营许可证有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "经营许可证有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseDateTo; /** 经营许可证是否长期：0-无状态，1-是，2-否 */ @@ -77,12 +77,12 @@ public class UserDriverEnterpriseDto extends UserDTO{ private String driverEnterpriseAddress; /** 企业营业执照有效期开始日期 */ @ApiModelProperty("企业营业执照有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateFrom; /** 企业营业执照有效期到期日期 */ @ApiModelProperty("企业营业执照有效期到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "企业营业执照有效期到期日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseLicenseDateTo; /** 企业营业执照是否长期：0-无状态，1-是，2-否 */ @@ -116,12 +116,12 @@ public class UserDriverEnterpriseDto extends UserDTO{ private String driverCorpIdcardNumber; /** 法人身份证有效期开始日期 */ @ApiModelProperty("法人身份证有效期开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期开始日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateFrom; /** 法人身份证有效期结束日期 */ @ApiModelProperty("法人身份证有效期结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "法人身份证有效期结束日期", width = 30, dateFormat = "yyyy-MM-dd") private Date driverCorpIdcardDateTo; /** 法人身份证是否长期：0-无状态，1-是，2-否 */ @@ -149,7 +149,7 @@ public class UserDriverEnterpriseDto extends UserDTO{ private Integer driverEnterpriseFill; /** 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseFillTime; /** 承运人企业认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效' */ @@ -158,7 +158,7 @@ public class UserDriverEnterpriseDto extends UserDTO{ private Integer driverEnterpriseInfoFill; /** 承运人企业认证时间 */ @ApiModelProperty("承运人企业认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人企业认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverEnterpriseInfoFillTime; /** 承运人经营许可证认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效' */ @@ -167,7 +167,7 @@ public class UserDriverEnterpriseDto extends UserDTO{ private Integer driverBusinessLicenseFill; /** 承运人经营许可证认证时间 */ @ApiModelProperty("承运人经营许可证认证时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "承运人经营许可证认证时间", width = 30, dateFormat = "yyyy-MM-dd") private Date driverBusinessLicenseFillTime; @ApiModelProperty(name = "组织ID集合") @@ -203,4 +203,4 @@ public class UserDriverEnterpriseDto extends UserDTO{ @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java index a4e9c212e..5e7b72eda 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java @@ -46,12 +46,12 @@ public class UserShipperDTO extends UserDTO { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperEnterpriseLicenseDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperEnterpriseLicenseDateTo; @@ -85,12 +85,12 @@ public class UserShipperDTO extends UserDTO { @ApiModelProperty(name = "法人身份证号加密") private String shipperCorpIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperCorpIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date shipperCorpIdcardDateTo; @@ -256,4 +256,4 @@ public class UserShipperDTO extends UserDTO { @ApiModelProperty(name = "登录密码（6-20位）") private String userPassword; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserUpdateDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserUpdateDTO.java index f235d9fcb..5896ca819 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserUpdateDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserUpdateDTO.java @@ -42,10 +42,10 @@ public class UserUpdateDTO extends BaseVOEntity { private String userIdcardNumber; @ApiModelProperty(name = "身份证号加密") private String userIdcardNumberDes; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private Date userIdcardDateFrom; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private Date userIdcardDateTo; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -89,15 +89,15 @@ public class UserUpdateDTO extends BaseVOEntity { private int userAuthStatus; @ApiModelProperty(name = "用户审核人用户姓名") private String userAuthByUsername; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户审核时间") private Date userAuthTime; @ApiModelProperty(name = "加入黑名单备注（解除时需要清空）") private String userStatusRemark; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户状态更新时间") private Date userStatusTime; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private Date userBirthday; @ApiModelProperty(name = "用户住址信息") diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facadeApi/Po/UserShipperAuthAppPo.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facadeApi/Po/UserShipperAuthAppPo.java index f71bb6529..eee83098d 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facadeApi/Po/UserShipperAuthAppPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facadeApi/Po/UserShipperAuthAppPo.java @@ -26,7 +26,7 @@ public class UserShipperAuthAppPo { private String userIdcardBackUrl = ""; @ApiModelProperty(name = "手持身份证") private String userIdcardInhandUrl = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "用户生日") private String userBirthday = ""; @ApiModelProperty(name = "手机号码") @@ -40,10 +40,10 @@ public class UserShipperAuthAppPo { private String roleName = ""; @ApiModelProperty(name = "身份证号") private String userIdcardNumber = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期自") private String userIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "身份证有效期至") private String userIdcardDateTo = ""; @ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否") @@ -75,11 +75,11 @@ public class UserShipperAuthAppPo { @ApiModelProperty(name = "企业注册地址") private String shipperEnterpriseAddress = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限起") private String shipperEnterpriseLicenseDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "企业营业期限止") private String shipperEnterpriseLicenseDateTo = ""; @@ -125,10 +125,10 @@ public class UserShipperAuthAppPo { private String shipperCorpIdcardNumber = ""; @ApiModelProperty(name = "法人身份证号加密") private String shipperCorpIdcardNumberDes = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期自") private String shipperCorpIdcardDateFrom = ""; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "法人身份证有效期止") private String shipperCorpIdcardDateTo = ""; @ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否") @@ -163,4 +163,4 @@ public class UserShipperAuthAppPo { @ApiModelProperty(name = "托运人发货企业审核原因") private String shipperEnterpriseFillRemark=""; -} +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java index 700726cea..a54201841 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java @@ -120,17 +120,17 @@ public class BillManage extends BaseVOEntity{ private String financialReviewOpinion; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; @ApiModelProperty("收款/付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "收款/付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date settlementTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java index 1a0cb7eee..5c4c7bac5 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java @@ -82,17 +82,17 @@ public class BillDetailPO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("业务日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date businessDate; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java index 724a36e00..a4c4e3403 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java @@ -129,17 +129,17 @@ public class BillManagePO extends BaseVOEntity{ private String financialReviewOpinion; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; @ApiModelProperty("收款/付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "收款/付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date settlementTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java index 92aabee3f..399ad44c4 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java @@ -120,17 +120,17 @@ public class BillManageDO extends BaseVOEntity{ private String financialReviewOpinion; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; @ApiModelProperty("收款/付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "收款/付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date settlementTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/entity/BillingStatement.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/entity/BillingStatement.java index e0978f0dd..98d69bbcf 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/entity/BillingStatement.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/entity/BillingStatement.java @@ -52,17 +52,17 @@ public class BillingStatement extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("业务日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date businessDate; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java index 2a6ec910a..447b38446 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java @@ -50,17 +50,17 @@ public class BillingStatementPO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("业务日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date businessDate; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java index 438a1e6ac..af1576753 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java @@ -51,17 +51,17 @@ public class BillingStatementDO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("业务日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date businessDate; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java index c1b895398..dd740c80f 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java @@ -128,7 +128,7 @@ public class BusinessDocument extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("计费时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd") private Date billingTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java index fb85c302b..66e8a517e 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java @@ -126,7 +126,7 @@ public class BusinessDocumentPO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("计费时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd") private Date billingTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java index 129e88965..899da7af5 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java @@ -128,7 +128,7 @@ public class BusinessDocumentDO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("计费时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd") private Date billingTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManageDetailPO.java b/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManageDetailPO.java index 7ba827968..93a041db5 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManageDetailPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/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; -} +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java b/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java index 8fefd8216..7015777c7 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java @@ -87,17 +87,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; @@ -163,10 +163,10 @@ public class ContractManagePO extends BaseVOEntity{ private Integer automaticFlag; @ApiModelProperty("出账日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date paymentDate; @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)") private Integer principalType; -} +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java index 5d9446fc8..9c42728a0 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java @@ -87,17 +87,17 @@ public class BillDetailDTO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("业务日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date businessDate; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java index 98d8cf99f..225e23588 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java @@ -120,17 +120,17 @@ public class BillManageDTO extends BaseVOEntity{ private String financialReviewOpinion; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; @ApiModelProperty("收款/付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "收款/付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date settlementTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java index a87587d0b..48e195c69 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java @@ -52,17 +52,17 @@ public class BillingStatementDTO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("业务日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date businessDate; @ApiModelProperty("周期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleBeginTime; @ApiModelProperty("周期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cycleEndTime; diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java index 36a188b5c..aefb1c14b 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java @@ -126,7 +126,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{ private String settlementEntity; @ApiModelProperty("计费时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd") private Date billingTime; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java b/mhd_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java index 23c76b803..3f6ec25c1 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java @@ -112,7 +112,7 @@ public class AccountTransferRecharge extends BaseVOEntity private String accountTransferReviewer; /** 审核时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(name = "审核时间") private Date transferReviewerTime; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java b/mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java index 041dd778c..bdefc3ddd 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java @@ -65,12 +65,12 @@ public class BranchBill extends BaseVOEntity { private Integer billStatus; @ApiModelProperty("交账周期开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交账周期开始", width = 30, dateFormat = "yyyy-MM-dd") private Date billTimeStart; @ApiModelProperty("交账周期结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交账周期结束", width = 30, dateFormat = "yyyy-MM-dd") private Date billTimeEnd; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/entity/BusinessDocument.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/entity/BusinessDocument.java index d92938396..ce136b158 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/entity/BusinessDocument.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/entity/BusinessDocument.java @@ -118,7 +118,7 @@ public class BusinessDocument extends BaseVOEntity{ private Integer payStatus; @ApiModelProperty("付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTime; @@ -126,7 +126,7 @@ public class BusinessDocument extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; @@ -165,7 +165,7 @@ public class BusinessDocument extends BaseVOEntity{ private BigDecimal commissionRate; @ApiModelProperty("货主付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTimeShipper; @@ -174,4 +174,4 @@ public class BusinessDocument extends BaseVOEntity{ @ApiModelProperty(value = "合单主单单号（单据类型为2 不能为空）") private String mainOrderNumber; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/AccountsReceivableAppPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/AccountsReceivableAppPO.java index 867b1facd..17c351e99 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/AccountsReceivableAppPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/AccountsReceivableAppPO.java @@ -85,7 +85,7 @@ public class AccountsReceivableAppPO extends BaseVOEntity{ private String vehicleLicensePlateNumber = ""; @ApiModelProperty("接收时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "接收时间", width = 30, dateFormat = "yyyy-MM-dd") @JsonSerialize(nullsUsing = DateNullToStringSerializer.class) private Date receptionTime; @@ -100,4 +100,4 @@ public class AccountsReceivableAppPO extends BaseVOEntity{ private String mailAreaName = ""; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentAppPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentAppPO.java index 9d08bb70c..2e01c797c 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentAppPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentAppPO.java @@ -104,7 +104,7 @@ public class BusinessDocumentAppPO extends BaseVOEntity{ private String vehicleLicensePlateNumber = ""; @ApiModelProperty("接收时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "接收时间", width = 30, dateFormat = "yyyy-MM-dd") @JsonSerialize(nullsUsing = DateNullToStringSerializer.class) private Date receptionTime; @@ -124,7 +124,7 @@ public class BusinessDocumentAppPO extends BaseVOEntity{ private Integer payStatus; @ApiModelProperty("付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") @JsonSerialize(nullsUsing = DateNullToStringSerializer.class) private Date payTime; @@ -133,7 +133,7 @@ public class BusinessDocumentAppPO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") @JsonSerialize(nullsUsing = DateNullToStringSerializer.class) private Date waybillVerifyTime; @@ -154,7 +154,7 @@ public class BusinessDocumentAppPO extends BaseVOEntity{ private String freightName = ""; @ApiModelProperty("货主付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTimeShipper; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentPO.java index 10e653bb2..d536ed7b8 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/po/BusinessDocumentPO.java @@ -120,7 +120,7 @@ public class BusinessDocumentPO extends BaseVOEntity{ private Integer payStatus; @ApiModelProperty("付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTime; @@ -128,7 +128,7 @@ public class BusinessDocumentPO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; @@ -167,7 +167,7 @@ public class BusinessDocumentPO extends BaseVOEntity{ private BigDecimal commissionRate; @ApiModelProperty("货主付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTimeShipper; @@ -176,4 +176,4 @@ public class BusinessDocumentPO extends BaseVOEntity{ @ApiModelProperty(value = "合单主单单号（单据类型为2 不能为空）") private String mainOrderNumber; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/todo/BusinessDocumentDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/todo/BusinessDocumentDO.java index 30749910b..516b69ddc 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/todo/BusinessDocumentDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/todo/BusinessDocumentDO.java @@ -129,7 +129,7 @@ public class BusinessDocumentDO extends BaseVOEntity{ private Integer payStatus; @ApiModelProperty("付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTime; @@ -137,7 +137,7 @@ public class BusinessDocumentDO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; @@ -209,7 +209,7 @@ public class BusinessDocumentDO extends BaseVOEntity{ private BigDecimal commissionRate; @ApiModelProperty("货主付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTimeShipper; @@ -218,4 +218,4 @@ public class BusinessDocumentDO extends BaseVOEntity{ @ApiModelProperty(value = "合单主单单号（单据类型为2 不能为空）") private String mainOrderNumber; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java index 88875a82a..b6fbc955f 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java @@ -125,12 +125,12 @@ public class BusinessDocumentDetali extends BaseVOEntity{ // private Integer payStatusShipper; // @ApiModelProperty("付款时间") -// @JsonFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") // @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") // private Date payTime; // // @ApiModelProperty("货主付款时间") -// @JsonFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") // @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") // private Date payTimeShipper; @@ -170,4 +170,4 @@ public class BusinessDocumentDetali extends BaseVOEntity{ @ApiModelProperty("司机姓名") private String driver; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliPO.java index 16dc2ff4f..413093b1a 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliPO.java @@ -113,11 +113,11 @@ public class BusinessDocumentDetaliPO extends BaseVOEntity{ private Integer payStatusShipper; @ApiModelProperty("付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTime; @ApiModelProperty("货主付款时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTimeShipper; @@ -126,4 +126,4 @@ public class BusinessDocumentDetaliPO extends BaseVOEntity{ @ApiModelProperty("油卡号") private String fuelCardNumber; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java index a7551095e..18cb05abf 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java @@ -80,12 +80,12 @@ public class Reconciliation extends BaseVOEntity{ private String waybillSourceName; @ApiModelProperty("对账起始日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账起始日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationStart; @ApiModelProperty("对账结束日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账结束日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationEnd; @@ -169,7 +169,7 @@ public class Reconciliation extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java index 717b9d6c6..21dbe939c 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java @@ -86,12 +86,12 @@ public class ReconciliationPO extends BaseVOEntity{ private String waybillSourceName; @ApiModelProperty("对账起始日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账起始日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationStart; @ApiModelProperty("对账结束日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账结束日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationEnd; @@ -177,7 +177,7 @@ public class ReconciliationPO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java index c0f0894a0..4770dc5df 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java @@ -98,12 +98,12 @@ public class ReconciliationDO extends BaseVOEntity{ private String waybillSourceName; @ApiModelProperty("对账起始日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账起始日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationStart; @ApiModelProperty("对账结束日") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "对账结束日", width = 30, dateFormat = "yyyy-MM-dd") private Date reconciliationEnd; @@ -199,7 +199,7 @@ public class ReconciliationDO extends BaseVOEntity{ private Integer waybillVerifyFlag; @ApiModelProperty("标记核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd") private Date waybillVerifyTime; @@ -215,27 +215,27 @@ public class ReconciliationDO extends BaseVOEntity{ private Long invoiceInfoId; @ApiModelProperty("核销时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "核销时间开始", width = 30, dateFormat = "yyyy-MM-dd") private Date collectionTimeStart; @ApiModelProperty("核销时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "核销时间结束", width = 30, dateFormat = "yyyy-MM-dd") private Date collectionTimeEnd; @ApiModelProperty("创建时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd") private String createTimeStart; @ApiModelProperty("创建时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd") private String createTimeEnd; @ApiModelProperty("审核时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd") private Date authTimeStart; @ApiModelProperty("审核时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间结束", width = 30, dateFormat = "yyyy-MM-dd") private Date authTimeEnd; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/entity/WithdrawApplication.java b/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/entity/WithdrawApplication.java index 403395566..3560e4626 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/entity/WithdrawApplication.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/entity/WithdrawApplication.java @@ -47,7 +47,7 @@ public class WithdrawApplication extends BaseVOEntity{ private String applicantLicenseNumber; @ApiModelProperty("申请时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") private Date applyTime; @@ -84,7 +84,7 @@ public class WithdrawApplication extends BaseVOEntity{ private String bindingPhone; @ApiModelProperty("转账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "转账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date transferTime; @@ -97,7 +97,7 @@ public class WithdrawApplication extends BaseVOEntity{ private String remark; @ApiModelProperty("到账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date arriveAccountTime; @@ -150,4 +150,4 @@ public class WithdrawApplication extends BaseVOEntity{ private String organizationName; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/po/WithdrawApplicationPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/po/WithdrawApplicationPO.java index 9004133d3..39b7aa15c 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/po/WithdrawApplicationPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/po/WithdrawApplicationPO.java @@ -46,7 +46,7 @@ public class WithdrawApplicationPO extends BaseVOEntity{ private String applicantLicenseNumber; @ApiModelProperty("申请时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") private Date applyTime; @@ -83,7 +83,7 @@ public class WithdrawApplicationPO extends BaseVOEntity{ private String bindingPhone; @ApiModelProperty("转账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "转账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date transferTime; @@ -96,7 +96,7 @@ public class WithdrawApplicationPO extends BaseVOEntity{ private String remark; @ApiModelProperty("到账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date arriveAccountTime; @@ -150,4 +150,4 @@ public class WithdrawApplicationPO extends BaseVOEntity{ -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/todo/WithdrawApplicationDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/todo/WithdrawApplicationDO.java index 4750c3fc7..29b8d478e 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/todo/WithdrawApplicationDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/withdrawApplication/repository/todo/WithdrawApplicationDO.java @@ -46,7 +46,7 @@ public class WithdrawApplicationDO extends BaseVOEntity{ private String applicantLicenseNumber; @ApiModelProperty("申请时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") private Date applyTime; @@ -83,7 +83,7 @@ public class WithdrawApplicationDO extends BaseVOEntity{ private String bindingPhone; @ApiModelProperty("转账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "转账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date transferTime; @@ -96,7 +96,7 @@ public class WithdrawApplicationDO extends BaseVOEntity{ private String remark; @ApiModelProperty("到账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date arriveAccountTime; @@ -153,4 +153,4 @@ public class WithdrawApplicationDO extends BaseVOEntity{ @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/WithdrawApplicationDTO.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/WithdrawApplicationDTO.java index a7a66b787..5b0deb367 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/WithdrawApplicationDTO.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/WithdrawApplicationDTO.java @@ -48,7 +48,7 @@ public class WithdrawApplicationDTO extends BaseVOEntity{ private String applicantLicenseNumber; @ApiModelProperty("申请时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") private Date applyTime; @@ -85,7 +85,7 @@ public class WithdrawApplicationDTO extends BaseVOEntity{ private String bindingPhone; @ApiModelProperty("转账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "转账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date transferTime; @@ -98,7 +98,7 @@ public class WithdrawApplicationDTO extends BaseVOEntity{ private String remark; @ApiModelProperty("到账时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到账时间", width = 30, dateFormat = "yyyy-MM-dd") private Date arriveAccountTime; @@ -159,4 +159,4 @@ public class WithdrawApplicationDTO extends BaseVOEntity{ @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/entity/InterceptOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/entity/InterceptOrder.java index d95e3a4a2..38e2b36c0 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/entity/InterceptOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/entity/InterceptOrder.java @@ -57,7 +57,7 @@ public class InterceptOrder extends BaseVOEntity { private String interceptByName; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date interceptTime; @@ -70,4 +70,4 @@ public class InterceptOrder extends BaseVOEntity { private String taskNos; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/po/InterceptOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/po/InterceptOrderPO.java index 6bc47ac01..8f4769361 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/po/InterceptOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/po/InterceptOrderPO.java @@ -54,7 +54,7 @@ public class InterceptOrderPO extends BaseVOEntity { private String interceptByName; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date interceptTime; @@ -92,4 +92,4 @@ public class InterceptOrderPO extends BaseVOEntity { -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/todo/InterceptOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/todo/InterceptOrderDO.java index 999563e1e..c2c3202dd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/todo/InterceptOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/todo/InterceptOrderDO.java @@ -53,7 +53,7 @@ public class InterceptOrderDO extends BaseVOEntity { private String interceptByName; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date interceptTime; @@ -70,4 +70,4 @@ public class InterceptOrderDO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/entity/PurchaseOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/entity/PurchaseOrder.java index dd0a7aaca..5ec9c8303 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/entity/PurchaseOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/entity/PurchaseOrder.java @@ -46,7 +46,7 @@ public class PurchaseOrder extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -91,7 +91,7 @@ public class PurchaseOrder extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -120,7 +120,7 @@ public class PurchaseOrder extends BaseVOEntity { private String receivingWarehouse; @ApiModelProperty("交货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -170,7 +170,7 @@ public class PurchaseOrder extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -199,4 +199,4 @@ public class PurchaseOrder extends BaseVOEntity { @ApiModelProperty("下发系统") @Excel(name = "下发系统") private String deliverySystem; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/po/PurchaseOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/po/PurchaseOrderPO.java index 7c54137b1..dde562551 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/po/PurchaseOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/po/PurchaseOrderPO.java @@ -43,7 +43,7 @@ public class PurchaseOrderPO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -88,7 +88,7 @@ public class PurchaseOrderPO extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -117,7 +117,7 @@ public class PurchaseOrderPO extends BaseVOEntity { private String receivingWarehouse; @ApiModelProperty("交货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -166,7 +166,7 @@ public class PurchaseOrderPO extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -213,4 +213,4 @@ public class PurchaseOrderPO extends BaseVOEntity { @Excel(name = "下发系统") private String deliverySystem; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderAuditDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderAuditDO.java index c679bc413..be33a1f77 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderAuditDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderAuditDO.java @@ -22,7 +22,7 @@ public class PurchaseOrderAuditDO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -34,4 +34,4 @@ public class PurchaseOrderAuditDO extends BaseVOEntity { @Excel(name = "审核结果") private String auditResult; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderDO.java index 3248e1692..4dd3210a6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderDO.java @@ -42,7 +42,7 @@ public class PurchaseOrderDO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -87,7 +87,7 @@ public class PurchaseOrderDO extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -120,7 +120,7 @@ public class PurchaseOrderDO extends BaseVOEntity { private String receivingWarehouse; @ApiModelProperty("交货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -169,7 +169,7 @@ public class PurchaseOrderDO extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -194,4 +194,4 @@ public class PurchaseOrderDO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java index b863181e7..874960216 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java @@ -353,17 +353,17 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO @ApiModelProperty("生产日期") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date productionDate; @ApiModelProperty("过期日期") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiryDate; @ApiModelProperty("存货日期") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inventoryDate; @ApiModelProperty("扩展属性1") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java index 627697887..967299b4a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java @@ -71,7 +71,7 @@ public class ReservationStockOutOrder extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class ReservationStockOutOrder extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class ReservationStockOutOrder extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java index cbf2e407e..f0e24df35 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java @@ -75,7 +75,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -202,7 +202,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -223,7 +223,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index 0c2f4de2c..ca3c6a3aa 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -71,7 +71,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index bc2b70f57..e1ceaaea5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -69,7 +69,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -196,7 +196,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -217,7 +217,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java index ff8789bf4..78d4e93d7 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java @@ -354,17 +354,17 @@ public class ReserveInMaterialDetailPO extends ReserveStockInOrderBasePO { @ApiModelProperty("生产日期") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date productionDate; @ApiModelProperty("过期日期") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiryDate; @ApiModelProperty("存货日期") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inventoryDate; @ApiModelProperty("扩展属性1") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java index 91e791383..464ccbb11 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java @@ -71,7 +71,7 @@ public class ReserveStockOutOrder extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class ReserveStockOutOrder extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class ReserveStockOutOrder extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java index 5ed857021..6a1049f85 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java @@ -71,7 +71,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java index 055187264..1e7a27c9c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java @@ -70,7 +70,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -197,7 +197,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -218,7 +218,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java index 826d416fb..677164a2d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java @@ -68,7 +68,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -195,7 +195,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -216,7 +216,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/entity/SalesOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/entity/SalesOrder.java index c67487e63..0d9875c14 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/entity/SalesOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/entity/SalesOrder.java @@ -34,7 +34,7 @@ public class SalesOrder extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -135,7 +135,7 @@ public class SalesOrder extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -152,7 +152,7 @@ public class SalesOrder extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -165,7 +165,7 @@ public class SalesOrder extends BaseVOEntity { private String deliveryWarehouse; @ApiModelProperty("发货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -202,4 +202,4 @@ public class SalesOrder extends BaseVOEntity { private String remark; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/po/SalesOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/po/SalesOrderPO.java index 2224b976f..cf00ab1e9 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/po/SalesOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/po/SalesOrderPO.java @@ -31,7 +31,7 @@ public class SalesOrderPO extends BaseVOEntity { private String auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -120,7 +120,7 @@ public class SalesOrderPO extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -137,7 +137,7 @@ public class SalesOrderPO extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -150,7 +150,7 @@ public class SalesOrderPO extends BaseVOEntity { private String deliveryWarehouse; @ApiModelProperty("发货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -194,4 +194,4 @@ public class SalesOrderPO extends BaseVOEntity { @Excel(name = "作业任务类型") private String jobTaskType; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderAuditDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderAuditDO.java index 556b63ef1..115e874c2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderAuditDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderAuditDO.java @@ -29,7 +29,7 @@ public class SalesOrderAuditDO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -40,4 +40,4 @@ public class SalesOrderAuditDO extends BaseVOEntity { @ApiModelProperty("审核结果") @Excel(name = "审核结果") private String auditResult; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderDO.java index 1c72414a1..fab7c60a3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderDO.java @@ -30,7 +30,7 @@ public class SalesOrderDO extends BaseVOEntity { private String auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -131,7 +131,7 @@ public class SalesOrderDO extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -148,7 +148,7 @@ public class SalesOrderDO extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -161,7 +161,7 @@ public class SalesOrderDO extends BaseVOEntity { private String deliveryWarehouse; @ApiModelProperty("发货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -202,4 +202,4 @@ public class SalesOrderDO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/interceptOrder/InterceptOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/interceptOrder/InterceptOrderDTO.java index 7aecb90c6..8fb40e56d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/interceptOrder/InterceptOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/interceptOrder/InterceptOrderDTO.java @@ -52,7 +52,7 @@ public class InterceptOrderDTO extends BaseVOEntity { private String interceptByName; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date interceptTime; @@ -70,4 +70,4 @@ public class InterceptOrderDTO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderAuditDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderAuditDTO.java index 9f54e7ad8..2c7ead0fc 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderAuditDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderAuditDTO.java @@ -24,7 +24,7 @@ public class PurchaseOrderAuditDTO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -37,4 +37,4 @@ public class PurchaseOrderAuditDTO extends BaseVOEntity { private String auditResult; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderDTO.java index 55b03f645..b28e6faa3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderDTO.java @@ -41,7 +41,7 @@ public class PurchaseOrderDTO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -86,7 +86,7 @@ public class PurchaseOrderDTO extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -115,7 +115,7 @@ public class PurchaseOrderDTO extends BaseVOEntity { private String receivingWarehouse; @ApiModelProperty("交货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -164,7 +164,7 @@ public class PurchaseOrderDTO extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -182,4 +182,4 @@ public class PurchaseOrderDTO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderExcelDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderExcelDTO.java index f630cb737..74b92afdc 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderExcelDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderExcelDTO.java @@ -46,7 +46,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity { @ExcelProperty(index = 4) @ApiModelProperty("订单日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date orderTime; @ExcelProperty(index = 5) @@ -59,7 +59,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity { @ExcelProperty(index = 7) @ApiModelProperty("交货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date deliveryDate; @ExcelProperty(index = 8) diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderAuditDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderAuditDTO.java index 193ffcd2c..ee87eb7aa 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderAuditDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderAuditDTO.java @@ -28,7 +28,7 @@ public class SalesOrderAuditDTO extends BaseVOEntity { private Long auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -39,4 +39,4 @@ public class SalesOrderAuditDTO extends BaseVOEntity { @ApiModelProperty("审核结果") @Excel(name = "审核结果") private String auditResult; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderDTO.java index a363eeba2..cd12ef8f8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderDTO.java @@ -29,7 +29,7 @@ public class SalesOrderDTO extends BaseVOEntity { private String auditBy; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -118,7 +118,7 @@ public class SalesOrderDTO extends BaseVOEntity { private Integer tacklState; @ApiModelProperty("拦截时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd") private Date tacklTime; @@ -135,7 +135,7 @@ public class SalesOrderDTO extends BaseVOEntity { private String org; @ApiModelProperty("订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; @@ -148,7 +148,7 @@ public class SalesOrderDTO extends BaseVOEntity { private String deliveryWarehouse; @ApiModelProperty("发货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; @@ -190,4 +190,4 @@ public class SalesOrderDTO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderExcelDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderExcelDTO.java index d9a02017e..90626ebe2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderExcelDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderExcelDTO.java @@ -54,7 +54,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity { @ExcelProperty(index = 4) @ApiModelProperty("订单日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date orderTime; @ExcelProperty(index = 5) @@ -75,7 +75,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity { @ExcelProperty(index = 7) @ApiModelProperty("发货日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date deliveryDate; @ExcelProperty(index = 8) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java index 971295e47..9946e65a7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java @@ -67,12 +67,12 @@ public class HandoverTaskOrder extends BaseVOEntity { private Long platformUseTimeId; @ApiModelProperty("月台使用开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseStartTime; @ApiModelProperty("月台使用结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseEndTime; @@ -130,7 +130,7 @@ public class HandoverTaskOrder extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java index 916be243a..7ee490859 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java @@ -69,12 +69,12 @@ public class HandoverTaskOrderPO extends BaseVOEntity { private Long platformUseTimeId; @ApiModelProperty("月台使用开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseStartTime; @ApiModelProperty("月台使用结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseEndTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java index 8bbd8065d..b81215fde 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java @@ -65,12 +65,12 @@ public class HandoverTaskOrderDO extends BaseVOEntity { private Long platformUseTimeId; @ApiModelProperty("月台使用开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseStartTime; @ApiModelProperty("月台使用结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseEndTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java index e4ace113c..240f20d7f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java @@ -357,17 +357,17 @@ public class InMaterialDetailPO extends StockInOrderBasePO { @ApiModelProperty("生产日期") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date productionDate; @ApiModelProperty("过期日期") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiryDate; @ApiModelProperty("存货日期") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inventoryDate; @ApiModelProperty("扩展属性1") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/entity/InventoryWarningAnalyze.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/entity/InventoryWarningAnalyze.java index f98f4fb2b..0445b2c8c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/entity/InventoryWarningAnalyze.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/entity/InventoryWarningAnalyze.java @@ -144,7 +144,7 @@ public class InventoryWarningAnalyze extends BaseVOEntity { private BigDecimal warningStandardQuantity; @ApiModelProperty("预警时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd") private Date warningTime; @@ -157,4 +157,4 @@ public class InventoryWarningAnalyze extends BaseVOEntity { @Excel(name = "物料条形码") private String barCode; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/po/InventoryWarningAnalyzePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/po/InventoryWarningAnalyzePO.java index 1846ca73f..62b4a5596 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/po/InventoryWarningAnalyzePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/po/InventoryWarningAnalyzePO.java @@ -143,7 +143,7 @@ public class InventoryWarningAnalyzePO extends BaseVOEntity { private BigDecimal warningStandardQuantity; @ApiModelProperty("预警时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd") private Date warningTime; @@ -159,4 +159,4 @@ public class InventoryWarningAnalyzePO extends BaseVOEntity { private String barCode; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/todo/InventoryWarningAnalyzeDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/todo/InventoryWarningAnalyzeDO.java index 4665cecd6..66fd12673 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/todo/InventoryWarningAnalyzeDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryWarningAnalyze/repository/todo/InventoryWarningAnalyzeDO.java @@ -142,7 +142,7 @@ public class InventoryWarningAnalyzeDO extends BaseVOEntity { private BigDecimal warningStandardQuantity; @ApiModelProperty("预警时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd") private Date warningTime; @@ -159,4 +159,4 @@ public class InventoryWarningAnalyzeDO extends BaseVOEntity { @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/entity/InvestigationManage.java b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/entity/InvestigationManage.java index 88df50f63..52f5edca8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/entity/InvestigationManage.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/entity/InvestigationManage.java @@ -110,7 +110,7 @@ public class InvestigationManage extends BaseVOEntity { private String auditByName; @ApiModelProperty("盘点审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "盘点审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -119,7 +119,7 @@ public class InvestigationManage extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -142,4 +142,4 @@ public class InvestigationManage extends BaseVOEntity { @ApiModelProperty("盘点详情") @TableField(exist = false) private List investigetionManageDetailList; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/po/InvestigationManagePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/po/InvestigationManagePO.java index 7d3aa0df6..ccbb65031 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/po/InvestigationManagePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/po/InvestigationManagePO.java @@ -110,7 +110,7 @@ public class InvestigationManagePO extends BaseVOEntity { private String auditByName; @ApiModelProperty("盘点审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "盘点审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -119,7 +119,7 @@ public class InvestigationManagePO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -165,4 +165,4 @@ public class InvestigationManagePO extends BaseVOEntity { @ApiModelProperty("盘点进度=已盘点状态的库存数量/盘点单库存总数量") private BigDecimal investigationProgress; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/todo/InvestigationManageDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/todo/InvestigationManageDO.java index 18a55e9c3..c53b07b5d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/todo/InvestigationManageDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/todo/InvestigationManageDO.java @@ -108,7 +108,7 @@ public class InvestigationManageDO extends BaseVOEntity { private String auditByName; @ApiModelProperty("盘点审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "盘点审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -117,7 +117,7 @@ public class InvestigationManageDO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -173,4 +173,4 @@ public class InvestigationManageDO extends BaseVOEntity { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @TableField(exist = false) private Date createEndTime; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/entity/MaterialCommon.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/entity/MaterialCommon.java index 29c29648b..06a1f965e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/entity/MaterialCommon.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/entity/MaterialCommon.java @@ -84,12 +84,12 @@ public class MaterialCommon extends BaseVOEntity { private String dangerLevelName; @ApiModelProperty("生产日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionTime; @ApiModelProperty("失效日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd") private Date expirationTime; @@ -98,4 +98,4 @@ public class MaterialCommon extends BaseVOEntity { private String remark; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/po/MaterialCommonPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/po/MaterialCommonPO.java index be353f89c..ca2c32944 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/po/MaterialCommonPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/po/MaterialCommonPO.java @@ -83,12 +83,12 @@ public class MaterialCommonPO extends BaseVOEntity { private String dangerLevelName; @ApiModelProperty("生产日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionTime; @ApiModelProperty("失效日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd") private Date expirationTime; @@ -98,4 +98,4 @@ public class MaterialCommonPO extends BaseVOEntity { -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/todo/MaterialCommonDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/todo/MaterialCommonDO.java index 07166700f..fb03ad8b5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/todo/MaterialCommonDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialCommon/repository/todo/MaterialCommonDO.java @@ -82,12 +82,12 @@ public class MaterialCommonDO extends BaseVOEntity { private String dangerLevelName; @ApiModelProperty("生产日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionTime; @ApiModelProperty("失效日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd") private Date expirationTime; @@ -100,4 +100,4 @@ public class MaterialCommonDO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/entity/MobilizeManage.java b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/entity/MobilizeManage.java index 1d7b92ef0..9b9237e6a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/entity/MobilizeManage.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/entity/MobilizeManage.java @@ -88,7 +88,7 @@ public class MobilizeManage extends BaseVOEntity { private String auditByName; @ApiModelProperty("调拨审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "调拨审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -97,7 +97,7 @@ public class MobilizeManage extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/po/MobilizeManagePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/po/MobilizeManagePO.java index e065ef1e5..fe74fbfd7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/po/MobilizeManagePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/po/MobilizeManagePO.java @@ -89,7 +89,7 @@ public class MobilizeManagePO extends BaseVOEntity { private String auditByName; @ApiModelProperty("调拨审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "调拨审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -98,7 +98,7 @@ public class MobilizeManagePO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/todo/MobilizeManageDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/todo/MobilizeManageDO.java index 3e7ae621a..076b77719 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/todo/MobilizeManageDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/repository/todo/MobilizeManageDO.java @@ -90,7 +90,7 @@ public class MobilizeManageDO extends BaseVOEntity { private String auditByName; @ApiModelProperty("调拨审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "调拨审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -99,7 +99,7 @@ public class MobilizeManageDO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/entity/QualityInspection.java b/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/entity/QualityInspection.java index c80815adf..c727cdb27 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/entity/QualityInspection.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/entity/QualityInspection.java @@ -76,7 +76,7 @@ public class QualityInspection extends BaseVOEntity { private String qualityInspectionName; @ApiModelProperty("质检时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "质检时间", width = 30, dateFormat = "yyyy-MM-dd") private Date qualityInspectionTime; @@ -101,7 +101,7 @@ public class QualityInspection extends BaseVOEntity { private String handleByName; @ApiModelProperty("处理时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") private Date handleTime; @@ -134,4 +134,4 @@ public class QualityInspection extends BaseVOEntity { private String remark; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/po/QualityInspectionPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/po/QualityInspectionPO.java index 284c2dd9a..ffa730d4f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/po/QualityInspectionPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/po/QualityInspectionPO.java @@ -75,7 +75,7 @@ public class QualityInspectionPO extends BaseVOEntity { private String qualityInspectionName; @ApiModelProperty("质检时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "质检时间", width = 30, dateFormat = "yyyy-MM-dd") private Date qualityInspectionTime; @@ -100,7 +100,7 @@ public class QualityInspectionPO extends BaseVOEntity { private String handleByName; @ApiModelProperty("处理时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") private Date handleTime; @@ -198,4 +198,4 @@ public class QualityInspectionPO extends BaseVOEntity { -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/todo/QualityInspectionDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/todo/QualityInspectionDO.java index fef43e7b8..9b02093b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/todo/QualityInspectionDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/qualityInspection/repository/todo/QualityInspectionDO.java @@ -74,7 +74,7 @@ public class QualityInspectionDO extends BaseVOEntity { private String qualityInspectionName; @ApiModelProperty("质检时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "质检时间", width = 30, dateFormat = "yyyy-MM-dd") private Date qualityInspectionTime; @@ -99,7 +99,7 @@ public class QualityInspectionDO extends BaseVOEntity { private String handleByName; @ApiModelProperty("处理时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") private Date handleTime; @@ -201,4 +201,4 @@ public class QualityInspectionDO extends BaseVOEntity { @Excel(name = "质检项: 1-包装 2-纯度") private Integer qualityInspectionTerm; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java index 0180bb7ed..7155196a6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java @@ -273,17 +273,17 @@ public class ReceiptMaterialDetail extends BaseVOEntity { @ApiModelProperty("生产日期") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date productionDate; @ApiModelProperty("过期日期") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiryDate; @ApiModelProperty("存货日期") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inventoryDate; @ApiModelProperty("扩展属性1") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java index a72451282..117f783cb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java @@ -303,17 +303,17 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity { @ApiModelProperty("生产日期") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date productionDate; @ApiModelProperty("过期日期") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiryDate; @ApiModelProperty("存货日期") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inventoryDate; @ApiModelProperty("扩展属性1") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java index df8fad088..3ab3cd1d6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java @@ -287,17 +287,17 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("生产日期") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date productionDate; @ApiModelProperty("过期日期") @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiryDate; @ApiModelProperty("存货日期") @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inventoryDate; @ApiModelProperty("扩展属性1") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/entity/ShiftManage.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/entity/ShiftManage.java index 9a782c889..3b3625a9c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/entity/ShiftManage.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/entity/ShiftManage.java @@ -96,7 +96,7 @@ public class ShiftManage extends BaseVOEntity { private String auditByName; @ApiModelProperty("入库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "入库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -105,7 +105,7 @@ public class ShiftManage extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -150,4 +150,4 @@ public class ShiftManage extends BaseVOEntity { private List shiftMaterialDetailList; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/po/ShiftManagePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/po/ShiftManagePO.java index fd73933e6..a67b5e22d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/po/ShiftManagePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/po/ShiftManagePO.java @@ -103,7 +103,7 @@ public class ShiftManagePO extends BaseVOEntity { private String auditByName; @ApiModelProperty("移位单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "移位单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -112,7 +112,7 @@ public class ShiftManagePO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -150,4 +150,4 @@ public class ShiftManagePO extends BaseVOEntity { -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/todo/ShiftManageDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/todo/ShiftManageDO.java index 7657492b1..30084ced5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/todo/ShiftManageDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/todo/ShiftManageDO.java @@ -94,7 +94,7 @@ public class ShiftManageDO extends BaseVOEntity { private String auditByName; @ApiModelProperty("移位单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "移位单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -103,7 +103,7 @@ public class ShiftManageDO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -157,4 +157,4 @@ public class ShiftManageDO extends BaseVOEntity { @ApiModelProperty("移位详情") @TableField(exist = false) private String shiftProgress; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index 3575ab380..b4d45da1c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -71,7 +71,7 @@ public class StockOutOrder extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -198,7 +198,7 @@ public class StockOutOrder extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -219,7 +219,7 @@ public class StockOutOrder extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index f3c1a500e..b554c4647 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -73,7 +73,7 @@ public class StockOutOrderPO extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -200,7 +200,7 @@ public class StockOutOrderPO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -221,7 +221,7 @@ public class StockOutOrderPO extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index c52eb9057..9eb483106 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -70,7 +70,7 @@ public class StockOutOrderDO extends BaseVOEntity { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -197,7 +197,7 @@ public class StockOutOrderDO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -218,7 +218,7 @@ public class StockOutOrderDO extends BaseVOEntity { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/entity/WaveOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/entity/WaveOrder.java index 4a797f94f..4342e26e0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/entity/WaveOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/entity/WaveOrder.java @@ -155,7 +155,7 @@ public class WaveOrder extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消波次时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消波次时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -164,4 +164,4 @@ public class WaveOrder extends BaseVOEntity { private String remark; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/po/WaveOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/po/WaveOrderPO.java index 4b5afc871..a214999cb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/po/WaveOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/po/WaveOrderPO.java @@ -156,7 +156,7 @@ public class WaveOrderPO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消波次时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消波次时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -167,4 +167,4 @@ public class WaveOrderPO extends BaseVOEntity { @ApiModelProperty("物料明细") private List materialDetailList; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/todo/WaveOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/todo/WaveOrderDO.java index ed7d8a0a6..018721032 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/todo/WaveOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/repository/todo/WaveOrderDO.java @@ -154,7 +154,7 @@ public class WaveOrderDO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消波次时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消波次时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -173,4 +173,4 @@ public class WaveOrderDO extends BaseVOEntity { @ApiModelProperty("物料明细") private List materialDetailList; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java index bba696e89..33d70906b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java @@ -65,12 +65,12 @@ public class HandoverTaskOrderDTO extends BaseVOEntity { private Long platformUseTimeId; @ApiModelProperty("月台使用开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseStartTime; @ApiModelProperty("月台使用结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "月台使用结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date platformUseEndTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryWarningAnalyze/InventoryWarningAnalyzeDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryWarningAnalyze/InventoryWarningAnalyzeDTO.java index 5c68ddfe0..26732f39d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryWarningAnalyze/InventoryWarningAnalyzeDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryWarningAnalyze/InventoryWarningAnalyzeDTO.java @@ -141,7 +141,7 @@ public class InventoryWarningAnalyzeDTO extends BaseVOEntity { private BigDecimal warningStandardQuantity; @ApiModelProperty("预警时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd") private Date warningTime; @@ -159,4 +159,4 @@ public class InventoryWarningAnalyzeDTO extends BaseVOEntity { @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigationManageDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigationManageDTO.java index a84a74866..a92b08e4b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigationManageDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigationManageDTO.java @@ -107,7 +107,7 @@ public class InvestigationManageDTO extends BaseVOEntity { private String auditByName; @ApiModelProperty("盘点审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "盘点审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -116,7 +116,7 @@ public class InvestigationManageDTO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -173,4 +173,4 @@ public class InvestigationManageDTO extends BaseVOEntity { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @TableField(exist = false) private Date createEndTime; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialCommon/MaterialCommonDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialCommon/MaterialCommonDTO.java index 901cb85ab..e2178f15d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialCommon/MaterialCommonDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialCommon/MaterialCommonDTO.java @@ -81,12 +81,12 @@ public class MaterialCommonDTO extends BaseVOEntity { private String dangerLevelName; @ApiModelProperty("生产日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionTime; @ApiModelProperty("失效日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd") private Date expirationTime; @@ -100,4 +100,4 @@ public class MaterialCommonDTO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManage/MobilizeManageDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManage/MobilizeManageDTO.java index 409fb07e8..a16e8fd75 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManage/MobilizeManageDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManage/MobilizeManageDTO.java @@ -89,7 +89,7 @@ public class MobilizeManageDTO extends BaseVOEntity { private String auditByName; @ApiModelProperty("调拨审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "调拨审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -98,7 +98,7 @@ public class MobilizeManageDTO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/qualityInspection/QualityInspectionDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/qualityInspection/QualityInspectionDTO.java index 7503111be..2aea271bd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/qualityInspection/QualityInspectionDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/qualityInspection/QualityInspectionDTO.java @@ -73,7 +73,7 @@ public class QualityInspectionDTO extends BaseVOEntity { private String qualityInspectionName; @ApiModelProperty("质检时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "质检时间", width = 30, dateFormat = "yyyy-MM-dd") private Date qualityInspectionTime; @@ -98,7 +98,7 @@ public class QualityInspectionDTO extends BaseVOEntity { private String handleByName; @ApiModelProperty("处理时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") private Date handleTime; @@ -200,4 +200,4 @@ public class QualityInspectionDTO extends BaseVOEntity { @ApiModelProperty("质检项: 1-包装 2-纯度") @Excel(name = "质检项: 1-包装 2-纯度") private Integer qualityInspectionTerm; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftManage/ShiftManageDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftManage/ShiftManageDTO.java index a595766d7..80797139e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftManage/ShiftManageDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftManage/ShiftManageDTO.java @@ -94,7 +94,7 @@ public class ShiftManageDTO extends BaseVOEntity { private String auditByName; @ApiModelProperty("移位单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "移位单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -103,7 +103,7 @@ public class ShiftManageDTO extends BaseVOEntity { private Integer taskDistribution; @ApiModelProperty("任务下发时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; @@ -160,4 +160,4 @@ public class ShiftManageDTO extends BaseVOEntity { private List shiftMoveMaterialQuantityList; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index c6853873a..5152bf8f6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -68,7 +68,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { private String auditByName; @ApiModelProperty("出库单审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime; @@ -195,7 +195,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { private String cancelByName; @ApiModelProperty("取消订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -216,7 +216,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { private String closeByName; @ApiModelProperty("关闭订单时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date closeTime; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/waveOrder/WaveOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/waveOrder/WaveOrderDTO.java index 159337ab0..592684039 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/waveOrder/WaveOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/waveOrder/WaveOrderDTO.java @@ -153,7 +153,7 @@ public class WaveOrderDTO extends BaseVOEntity { private String cancelByName; @ApiModelProperty("取消波次时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "取消波次时间", width = 30, dateFormat = "yyyy-MM-dd") private Date cancelTime; @@ -173,4 +173,4 @@ public class WaveOrderDTO extends BaseVOEntity { @ApiModelProperty("物料明细") private List materialDetailList; -} +} \ No newline at end of file