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

日期时区问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-28 21:20:07 +08:00
parent ed90334752
commit 39503f9f3c
108 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BranchFreightBillDO.java
+4 -4
View File
@@ -98,17 +98,17 @@ public class BranchFreightBillDO extends BaseVOEntity {
private BigDecimal retainedAmount;
@ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime;
@ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime;
@ApiModelProperty("确认时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date authTime;
@@ -125,4 +125,4 @@ public class BranchFreightBillDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchFeignDto.java
+7 -7
View File
@@ -203,7 +203,7 @@ public class DispatchFeignDto extends BaseVOEntity{
@Excel(name = "是否接单（1-未接单，2-已接单，3-已拒绝）")
private Long receivingStatus;
@ApiModelProperty("接单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date receivingDate;
@ApiModelProperty("装货照片")
@@ -239,7 +239,7 @@ public class DispatchFeignDto extends BaseVOEntity{
@ApiModelProperty(name = "发货地址纬度")
private String sendLatitude;
@ApiModelProperty("发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime;
@ApiModelProperty(name = "收货地址地址")
@@ -249,7 +249,7 @@ public class DispatchFeignDto extends BaseVOEntity{
@ApiModelProperty(name = "收货地址纬度")
private String receiveLatitude;
@ApiModelProperty("收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime;
@ApiModelProperty(name = "派车运单id集合")
private Long[] waybillIds;
@@ -328,17 +328,17 @@ public class DispatchFeignDto extends BaseVOEntity{
private BigDecimal maxBiddingPrice;
@ApiModelProperty("议价截止时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date biddingTime;
@ApiModelProperty("议价截止时间-开始")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date biddingTimeStart;
@ApiModelProperty("议价截止时间-结束")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date biddingTimeEnd;
@@ -397,4 +397,4 @@ public class DispatchFeignDto extends BaseVOEntity{
@ApiModelProperty("支付凭证")
private String payImages;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/DispatchWaybillDto.java
+3 -3
View File
@@ -124,7 +124,7 @@ public class DispatchWaybillDto extends BaseVOEntity{
@ApiModelProperty(name = "发货地址纬度")
private String sendLatitude;
@ApiModelProperty("发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime;
@ApiModelProperty(name = "收货地址经度")
@@ -134,7 +134,7 @@ public class DispatchWaybillDto extends BaseVOEntity{
@ApiModelProperty(name = "收货地址纬度")
private String receiveLatitude;
@ApiModelProperty("收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime;
/**
@@ -164,4 +164,4 @@ public class DispatchWaybillDto extends BaseVOEntity{
@ApiModelProperty("支付凭证")
private String payImages;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class ReconciliationDTO extends BaseVOEntity{
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ServiceBillDO.java
+3 -3
View File
@@ -89,12 +89,12 @@ public class ServiceBillDO extends BaseVOEntity {
private BigDecimal freight;
@ApiModelProperty("开单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date billingTime;
@ApiModelProperty("签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signTime;
@@ -108,4 +108,4 @@ public class ServiceBillDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/report/CapitalFlowReport.java
+2 -2
View File
@@ -102,7 +102,7 @@ public class CapitalFlowReport extends BaseVOEntity{
private Integer verifyStatus;
@ApiModelProperty("信息检验时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "信息检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date verifyTime;
@@ -129,4 +129,4 @@ public class CapitalFlowReport extends BaseVOEntity{
@ApiModelProperty("符合全部流水上报条件（1-符合，2-不符合）")
private Integer accordReportFlag;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Order.java
+2 -2
View File
@@ -311,7 +311,7 @@ public class Order extends BaseVOEntity{
private String paymentTypeName;
@ApiModelProperty("寄件日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "寄件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mailDate;
@@ -393,4 +393,4 @@ public class Order extends BaseVOEntity{
@ApiModelProperty("是否作废（1-是，2-否）")
private Integer cancelFlag;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/DispatchPo.java
+4 -4
View File
@@ -198,7 +198,7 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty("是否接单（1-未接单，2-已接单，3-已拒绝）")
private Long receivingStatus;
@ApiModelProperty("接单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date receivingDate;
@ApiModelProperty("装货照片")
@@ -221,7 +221,7 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty(name = "发货地址纬度")
private String sendLatitude;
@ApiModelProperty("发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime;
@ApiModelProperty(name = "收货地址")
@@ -231,7 +231,7 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty(name = "收货地址纬度")
private String receiveLatitude;
@ApiModelProperty("收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime;
@ApiModelProperty(name = "状态1正常2作废")
@@ -245,4 +245,4 @@ public class DispatchPo extends BaseVOEntity {
@ApiModelProperty("是否是自己的网点1是2否")
private Integer isOwn;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/OrderVerificationPo.java
+5 -5
View File
@@ -189,7 +189,7 @@ public class OrderVerificationPo extends BaseVOEntity{
private BigDecimal commissionCharges;
@ApiModelProperty("放款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "放款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date loanTime;
@@ -335,7 +335,7 @@ public class OrderVerificationPo extends BaseVOEntity{
private String paymentTypeName;
@ApiModelProperty("寄件日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "寄件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date mailDate;
@@ -376,12 +376,12 @@ public class OrderVerificationPo extends BaseVOEntity{
private Date freightCollectPaymentTime;
@ApiModelProperty("收款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectionTime;
@ApiModelProperty("收款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date cancelAfterVerificationTime;
@@ -464,4 +464,4 @@ public class OrderVerificationPo extends BaseVOEntity{
private Date withholdPaymentPaidTime;
}
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseEntity.java
+3 -3
View File
@@ -22,14 +22,14 @@ public class BaseEntity implements Serializable
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/** 备注 */
@@ -111,4 +111,4 @@ public class BaseEntity implements Serializable
{
this.params = params;
}
}
}