全所统计

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -55,6 +55,11 @@ public class PayMailBill implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    @NotNull(message = "项目名称不能为空")
+    private java.lang.String projectName;
 	/**票号*/
 	@Excel(name = "票号", width = 15)
     @ApiModelProperty(value = "票号")
@@ -80,8 +85,19 @@ public class PayMailBill implements Serializable {
 	@Excel(name = "快递单号", width = 15)
     @ApiModelProperty(value = "快递单号")
     private java.lang.String postNo;
+
+
+    @Excel(name = "项目负责人", width = 15)
+    @ApiModelProperty(value = "项目负责人")
+    @NotNull(message = "项目负责人不能为空")
+    private java.lang.String principalName;
+
+    /**来款单位*/
+    @Excel(name = "来款单位", width = 15)
+    @ApiModelProperty(value = "来款单位")
+    @NotNull(message = "来款单位不能为空")
+    private java.lang.String chargeCompanyName;
 	/**联系人id*/
-	@Excel(name = "联系人id", width = 15)
     @ApiModelProperty(value = "联系人id")
     private java.lang.String contactId;
 	/**联系人名字*/
@@ -96,20 +112,20 @@ public class PayMailBill implements Serializable {
     @ApiModelProperty(value = "联系人邮箱")
     private String email;
 	/**开票时间*/
-	@Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd")
+
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "开票时间")
     @NotNull(message = "开票时间不能为空")
     private java.util.Date billDate;
 	/**邮寄时间*/
-	@Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd")
+
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "邮寄时间")
     private java.util.Date sendDate;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
     /**
@@ -118,32 +134,20 @@ public class PayMailBill implements Serializable {
 	@TableField(exist = false)
     @ApiModelProperty(value = "项目id")
     private String projectId;
-	/**项目名称*/
-	@Excel(name = "项目名称", width = 15)
-    @ApiModelProperty(value = "项目名称")
-    @NotNull(message = "项目名称不能为空")
-    private java.lang.String projectName;
-    /**来款单位*/
-    @Excel(name = "来款单位", width = 15)
-    @ApiModelProperty(value = "来款单位")
-    @NotNull(message = "来款单位不能为空")
-    private java.lang.String chargeCompanyName;
 
-    @Excel(name = "项目负责人", width = 15)
+
-    @ApiModelProperty(value = "项目负责人")
+
-    @NotNull(message = "项目负责人不能为空")
-    private java.lang.String principalName;
 
     @NotNull(message = "项目负责人id不能为空")
     @ApiModelProperty(value = "项目负责人id")
     private java.lang.String principalId;
     /**邮政编码*/
-    @Excel(name = "邮政编码", width = 15)
+
     @ApiModelProperty(value = "邮政编码")
     @NotNull(message = "邮政编码")
     private java.lang.String postalCode;
     /**通讯地址*/
-    @Excel(name = "通讯地址", width = 15)
+
     @ApiModelProperty(value = "通讯地址")
     @NotNull(message = "通讯地址")
     private java.lang.String contactAddress;

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java

@@ -12,22 +12,7 @@ public class PayMailBillList {
 
     @ApiModelProperty(value = "id主键")
     private java.lang.String id;
-    @Dict(dicCode ="mail_type" )
+
-    @Excel(name = "邮寄状态", width = 15)
-    @ApiModelProperty(value = "邮寄状态")
-    private java.lang.String postStatus;
-    @Excel(name = "邮寄方式", width = 15)
-    @ApiModelProperty(value = "邮寄方式")
-    private java.lang.String sendMethod;
-    @Excel(name = "邮寄单号", width = 15)
-    @ApiModelProperty(value = "邮寄单号")
-    private java.lang.String postNo;
-    @Excel(name = "邮寄联系人", width = 15)
-    @ApiModelProperty(value = "邮寄联系人")
-    private java.lang.String liaisonMan;
-    @Excel(name = "邮寄联系人手机号", width = 15)
-    @ApiModelProperty(value = "邮寄联系人手机号")
-    private java.lang.String mobile;
     @Excel(name = "合同编号", width = 15)
     @ApiModelProperty(value = "合同编号")
     private java.lang.String contractNum;
@@ -45,15 +30,23 @@ public class PayMailBillList {
     @Excel(name = "合同总金额", width = 15)
     @ApiModelProperty(value = "合同总金额")
     private java.lang.String contractAmount;
-
+    @Dict(dicCode ="mail_type" )
-
+    @ApiModelProperty(value = "邮寄方式")
-    /**备注*/
+    private java.lang.String sendMethod;
-    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "邮寄单号")
+    private java.lang.String postNo;
+    @Excel(name = "邮寄联系人", width = 15)
+    @ApiModelProperty(value = "邮寄联系人")
+    private java.lang.String liaisonMan;
+    @Excel(name = "邮寄联系人手机号", width = 15)
+    @ApiModelProperty(value = "邮寄联系人手机号")
+    private java.lang.String mobile;
+    @Dict(dicCode = "mail_type")
+    @Excel(name = "邮寄状态", width = 15,dicCode = "mail_type")
+    @ApiModelProperty(value = "邮寄状态")
+    private java.lang.String postStatus;
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
-
-    /**邮寄时间*/
-    @Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "邮寄时间")