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_finance/src/main/java/com/linke/finance/domain/accountManage/entity/AccountTransferRecharge.java
+2 -2
View File
@@ -83,7 +83,7 @@ public class AccountTransferRecharge extends BaseVOEntity
private String transferTypeValue;
/** 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "交易时间")
private Date accountTransferTime;
@@ -122,4 +122,4 @@ public class AccountTransferRecharge extends BaseVOEntity
@ApiModelProperty(name = "组织id")
private Long organizationId;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/accountManage/repository/todo/AccountTransferRechargeDo.java
+3 -3
View File
@@ -83,7 +83,7 @@ public class AccountTransferRechargeDo extends BaseVOEntity
private String transferTypeValue;
/** 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "交易时间")
private Date accountTransferTime;
@@ -112,7 +112,7 @@ public class AccountTransferRechargeDo extends BaseVOEntity
private String accountTransferReviewer;
/** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "审核时间")
private Date transferReviewerTime;
@@ -154,4 +154,4 @@ public class AccountTransferRechargeDo extends BaseVOEntity
@ApiModelProperty(name = "支付方式（1-微信，2-对公转账）")
private Integer paymentMethod;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/entity/BranchBill.java
+2 -2
View File
@@ -109,7 +109,7 @@ public class BranchBill extends BaseVOEntity {
private Date deadlineTime;
@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;
@@ -132,4 +132,4 @@ public class BranchBill extends BaseVOEntity {
@ApiModelProperty("上交方式（1-线下转账，2-钱包转账）")
@Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/repository/po/BranchBillPO.java
+3 -3
View File
@@ -102,13 +102,13 @@ public class BranchBillPO extends BaseVOEntity {
private BigDecimal remainingAmount;
@ApiModelProperty(name = "截止时间")
@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")
@Excel(name = "截止时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date deadlineTime;
@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;
@@ -140,4 +140,4 @@ public class BranchBillPO extends BaseVOEntity {
@Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/branchBill/repository/todo/BranchBillDO.java
+2 -2
View File
@@ -111,7 +111,7 @@ public class BranchBillDO extends BaseVOEntity {
private Date deadlineTime;
@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;
@@ -158,4 +158,4 @@ public class BranchBillDO extends BaseVOEntity {
@ApiModelProperty("上交方式（1-线下转账，2-钱包转账）")
@Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/branchFreightBill/entity/BranchFreightBill.java
+4 -4
View File
@@ -100,17 +100,17 @@ public class BranchFreightBill 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;
@@ -123,4 +123,4 @@ public class BranchFreightBill extends BaseVOEntity {
private String authName;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/branchFreightBill/repository/todo/BranchFreightBillDO.java
+4 -4
View File
@@ -103,17 +103,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;
@@ -160,4 +160,4 @@ public class BranchFreightBillDO extends BaseVOEntity {
@ApiModelProperty(value = "更新时间-结束")
private String updateTimeEnd;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class ReconciliationDO 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_finance/src/main/java/com/linke/finance/domain/serviceBill/entity/ServiceBill.java
+4 -4
View File
@@ -91,19 +91,19 @@ public class ServiceBill 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;
@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 reportTime;
}
}
mhd_finance/src/main/java/com/linke/finance/domain/serviceBill/repository/po/ServiceBillPO.java
+4 -4
View File
@@ -90,17 +90,17 @@ public class ServiceBillPO 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;
@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 reportTime;
@@ -114,4 +114,4 @@ public class ServiceBillPO extends BaseVOEntity {
}
}
mhd_finance/src/main/java/com/linke/finance/domain/serviceBill/repository/todo/ServiceBillDO.java
+4 -4
View File
@@ -93,17 +93,17 @@ 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;
@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 reportTime;
@@ -133,4 +133,4 @@ public class ServiceBillDO extends BaseVOEntity {
@ApiModelProperty("交账时间-结束")
private String reportTimeEnd;
}
}
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/AccountTransferRechargeDto.java
+3 -3
View File
@@ -83,7 +83,7 @@ public class AccountTransferRechargeDto extends BaseVOEntity
private String transferTypeValue;
/** 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "交易时间")
private Date accountTransferTime;
@@ -112,7 +112,7 @@ public class AccountTransferRechargeDto extends BaseVOEntity
private String accountTransferReviewer;
/** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(name = "审核时间")
private Date transferReviewerTime;
@@ -151,4 +151,4 @@ public class AccountTransferRechargeDto extends BaseVOEntity
private Integer paymentMethod;
@ApiModelProperty(name = "银行卡管理表id")
private Long accountBankCardId;
}
}
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/BranchBillDTO.java
+2 -2
View File
@@ -110,7 +110,7 @@ public class BranchBillDTO extends BaseVOEntity {
private Date deadlineTime;
@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;
@@ -158,4 +158,4 @@ public class BranchBillDTO extends BaseVOEntity {
@ApiModelProperty("上交方式（1-线下转账，2-钱包转账）")
@Excel(name = "上交方式（1-线下转账，2-钱包转账）")
private Integer payMethod;
}
}
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/BranchFreightBillDTO.java
+4 -4
View File
@@ -103,17 +103,17 @@ public class BranchFreightBillDTO 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;
@@ -161,4 +161,4 @@ public class BranchFreightBillDTO extends BaseVOEntity {
@ApiModelProperty(value = "更新时间-结束")
private String updateTimeEnd;
}
}
mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ServiceBillDTO.java
+4 -4
View File
@@ -88,17 +88,17 @@ public class ServiceBillDTO 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;
@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 reportTime;
@@ -130,4 +130,4 @@ public class ServiceBillDTO extends BaseVOEntity {
@ApiModelProperty("交账时间-结束")
private String reportTimeEnd;
}
}