[修改]调整标题【预计到账日期】在excel中的位置

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java

@@ -389,7 +389,7 @@ public class PayMemberProjectSubitem implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期", width = 15,orderNum = "5")
+    @Excel(name = "预计到账日期", width = 15,orderNum = "9")
     private String estimatedArrivalDate;
 
     /**预计到账开始日期*/

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java

@@ -125,6 +125,14 @@ public class PayWorkingGroupSubItem implements Serializable {
     @DecimalMax(value = "9999999999.99",message = "待确收金额（元）格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal receivableAmount;
+
+    /**预计到账日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "预计到账日期")
+    @Excel(name = "预计到账日期",width = 15,format = "yyyy-MM-dd")
+    private String estimatedArrivalDate;
+
 	/**实收金额（元）*/
     @ApiModelProperty(value = "实收金额（元）")
     @DecimalMax(value = "9999999999.99",message = "实收金额（元）格式错误")
@@ -165,13 +173,6 @@ public class PayWorkingGroupSubItem implements Serializable {
     @ApiModelProperty(value = "收费通知文件id")
     private java.lang.String chargeNoticeId;
 
-    /**预计到账日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期",width = 15,format = "yyyy-MM-dd")
-    private String estimatedArrivalDate;
-
 	/**打包（1：是，0：否）*/
     @ApiModelProperty(value = "打包（1：是，0：否）")
     private java.lang.Integer pack;

jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java

@@ -53,6 +53,14 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
     @ApiModelProperty(value = "实收金额（元）")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal paidAmount;
+
+    /**预计到账日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "预计到账日期")
+    @Excel(name = "预计到账日期",width = 15)
+    private String estimatedArrivalDate;
+
     /**
      * 合同编号
      */
@@ -66,13 +74,6 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
     @ApiModelProperty(value = "收费通知号")
     private String chargeNoticeNo;
 
-    /**预计到账日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期",width = 15)
-    private String estimatedArrivalDate;
-
     /**
      * 打包
      */