Browse Source

日期格式化问题修复

liuj 6 months ago
parent
commit
94cce8f992

+ 2 - 2
src/main/java/com/inkasso/factoring/acceptanceManagement/entity/CAcceptanceGoodsInfo.java

@@ -82,7 +82,7 @@ public class CAcceptanceGoodsInfo extends BaseEntity {
      */
      */
     @TableField("acceptance_date")
     @TableField("acceptance_date")
     @ExcelCell(index = 6)
     @ExcelCell(index = 6)
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date acceptanceDate;
     private Date acceptanceDate;
 
 
     /**
     /**
@@ -161,7 +161,7 @@ public class CAcceptanceGoodsInfo extends BaseEntity {
      * 预计结算日期
      * 预计结算日期
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expectedSettlementDate;
     private Date expectedSettlementDate;
 
 
     public String getGoodsName() {
     public String getGoodsName() {

+ 2 - 2
src/main/java/com/inkasso/factoring/financingmanagement/entity/CFinancingAccountsReceivableInfo.java

@@ -50,14 +50,14 @@ public class CFinancingAccountsReceivableInfo extends BaseBean {
      * 验收日期
      * 验收日期
      */
      */
     @TableField("acceptance_date")
     @TableField("acceptance_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date acceptanceDate;
     private Date acceptanceDate;
 
 
     /**
     /**
      * 预计结算日期
      * 预计结算日期
      */
      */
     @TableField("expected_settlement_date")
     @TableField("expected_settlement_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expectedSettlementDate;
     private Date expectedSettlementDate;
 
 
     /**
     /**

+ 1 - 1
src/main/java/com/inkasso/factoring/financingmanagement/entity/vo/BillingFactoringBusinessLoanRecord.java

@@ -22,7 +22,7 @@ public class BillingFactoringBusinessLoanRecord {
     /**
     /**
      * 此次放款日期
      * 此次放款日期
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date thisLoanDate;
     private Date thisLoanDate;
 
 
     public Long getId() {
     public Long getId() {

+ 1 - 1
src/main/java/com/inkasso/factoring/financingmanagement/entity/vo/PayCollPlanFactoringAmountAllocation.java

@@ -22,7 +22,7 @@ public class PayCollPlanFactoringAmountAllocation {
     /**
     /**
      * 实收日期
      * 实收日期
      */
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date actualDate;
     private Date actualDate;
 
 
     public Long getId() {
     public Long getId() {

+ 2 - 2
src/main/java/com/inkasso/factoring/financingmanagement/entity/vo/PaymentCollectionPlanFactoring.java

@@ -24,7 +24,7 @@ public class PaymentCollectionPlanFactoring {
     /**
     /**
      * 约定日期
      * 约定日期
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planDate;
     private Date planDate;
 
 
     /**
     /**
@@ -83,7 +83,7 @@ public class PaymentCollectionPlanFactoring {
     /**
     /**
      * 宽限应还日
      * 宽限应还日
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date overDate;
     private Date overDate;
 
 
     /**
     /**

+ 2 - 2
src/main/java/com/inkasso/factoring/financingmanagement/entity/vo/PaymentCollectionPlanReceivable.java

@@ -30,12 +30,12 @@ public class PaymentCollectionPlanReceivable {
     /**
     /**
      * 到期日
      * 到期日
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expireDate;
     private Date expireDate;
     /**
     /**
      * 应收账款到期日
      * 应收账款到期日
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
     private Date endDate;
     /**
     /**
      * 应收账款金额
      * 应收账款金额

+ 3 - 3
src/main/java/com/inkasso/factoring/financingmanagement/entity/vo/PaymentCollectionPlanReceivableTrade.java

@@ -28,12 +28,12 @@ public class PaymentCollectionPlanReceivableTrade {
     /**
     /**
      * 到期日
      * 到期日
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expireDate;
     private Date expireDate;
     /**
     /**
      * 应收账款到期日
      * 应收账款到期日
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
     private Date endDate;
     /**
     /**
      * 应收账款金额
      * 应收账款金额
@@ -71,7 +71,7 @@ public class PaymentCollectionPlanReceivableTrade {
     /**
     /**
      * 应收账款起始日期
      * 应收账款起始日期
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
     private Date startDate;
     /**
     /**
      * 应收账款期限
      * 应收账款期限

+ 8 - 4
src/main/java/com/inkasso/factoring/invoicemanage/model/dto/BusinessProcessingTaskDTO.java

@@ -47,7 +47,7 @@ public class BusinessProcessingTaskDTO {
     /**
     /**
      * 最近更新时间
      * 最近更新时间
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
     private Date gmtModified;
 
 
     /**
     /**
@@ -122,10 +122,14 @@ public class BusinessProcessingTaskDTO {
      **/
      **/
     private boolean buttonFlag;
     private boolean buttonFlag;
 
 
-    /** 资方名称 **/
+    /**
+     * 资方名称
+     **/
     private String institutionName;
     private String institutionName;
 
 
-    /** 批次号 **/
+    /**
+     * 批次号
+     **/
     private Integer quotaDisburseBatch;
     private Integer quotaDisburseBatch;
 
 
     /**
     /**
@@ -174,7 +178,7 @@ public class BusinessProcessingTaskDTO {
     private String executor;
     private String executor;
 
 
     /**
     /**
-     *是否显示删除按钮
+     * 是否显示删除按钮
      */
      */
     private Boolean delete;
     private Boolean delete;
 
 

+ 1 - 1
src/main/java/com/inkasso/factoring/ledgermanagement/entity/LedgerFundGoodsAssign.java

@@ -98,7 +98,7 @@ public class LedgerFundGoodsAssign extends BaseBean {
      * 放款日期/结算日期
      * 放款日期/结算日期
      */
      */
     @TableField("loan_date")
     @TableField("loan_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date loanDate;
     private Date loanDate;
 
 
     /**
     /**

+ 8 - 4
src/main/java/com/inkasso/factoring/settlement/model/dto/BusinessProcessingTaskDTO.java

@@ -47,7 +47,7 @@ public class BusinessProcessingTaskDTO {
     /**
     /**
      * 最近更新时间
      * 最近更新时间
      **/
      **/
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
     private Date gmtModified;
 
 
     /**
     /**
@@ -122,10 +122,14 @@ public class BusinessProcessingTaskDTO {
      **/
      **/
     private boolean buttonFlag;
     private boolean buttonFlag;
 
 
-    /** 资方名称 **/
+    /**
+     * 资方名称
+     **/
     private String institutionName;
     private String institutionName;
 
 
-    /** 批次号 **/
+    /**
+     * 批次号
+     **/
     private Integer quotaDisburseBatch;
     private Integer quotaDisburseBatch;
 
 
     /**
     /**
@@ -174,7 +178,7 @@ public class BusinessProcessingTaskDTO {
     private String executor;
     private String executor;
 
 
     /**
     /**
-     *是否显示删除按钮
+     * 是否显示删除按钮
      */
      */
     private Boolean delete;
     private Boolean delete;