From 7aadf30f75821cd47696062ebda0ebe38f00b09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 1 Sep 2021 16:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/PayWorkingGroupSubItem.java    | 15 +++++++++++++++
 .../project/mapper/xml/PayWorkingGroupMapper.xml  |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
index 8792cbf5..6dd476fd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
@@ -13,6 +13,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 /**
@@ -46,6 +49,8 @@ public class PayWorkingGroupSubItem implements Serializable {
     /**成员单位id*/
     @Excel(name = "成员单位id", width = 15)
     @ApiModelProperty(value = "成员单位id")
+    @NotEmpty(message = "成员单位id不能为空！")
+    @Size(max = 32,message = "成员单位id长度应小于32个字符")
     private java.lang.String chargeCompanyId;
 	/**临时成员单位id*/
 	@Excel(name = "临时成员单位id", width = 15)
@@ -58,6 +63,8 @@ public class PayWorkingGroupSubItem implements Serializable {
     /**企业联系人一id*/
     @Excel(name = "企业联系人一id", width = 15)
     @ApiModelProperty(value = "企业联系人一id")
+    @NotEmpty(message = "企业联系人一id不能为空！")
+    @Size(max = 32,message = "企业联系人一id长度应小于32个字符")
     private java.lang.String contactsIdOne;
 	/**临时企业联系人一id*/
 	@Excel(name = "临时企业联系人一id", width = 15)
@@ -70,6 +77,7 @@ public class PayWorkingGroupSubItem implements Serializable {
     /**企业联系人二id*/
     @Excel(name = "企业联系人二id", width = 15)
     @ApiModelProperty(value = "企业联系人二id")
+    @Size(max = 32,message = "企业联系人二id长度应小于32个字符")
     private java.lang.String contactsIdTwo;
 	/**临时企业联系人二id*/
 	@Excel(name = "临时企业联系人二id", width = 15)
@@ -82,6 +90,7 @@ public class PayWorkingGroupSubItem implements Serializable {
     /**企业联系人三id*/
     @Excel(name = "企业联系人三id", width = 15)
     @ApiModelProperty(value = "企业联系人三id")
+    @Size(max = 32,message = "企业联系人三id长度应小于32个字符")
     private java.lang.String contactsIdThree;
 	/**临时企业联系人三id*/
 	@Excel(name = "临时企业联系人三id", width = 15)
@@ -94,14 +103,18 @@ public class PayWorkingGroupSubItem implements Serializable {
 	/**应收金额（元）*/
 	@Excel(name = "应收金额（元）", width = 15)
     @ApiModelProperty(value = "应收金额（元）")
+    @Max(value = 999999999,message = "应收金额（元）格式错误")
     private java.lang.Integer receivableAmount;
 	/**实收金额（元）*/
 	@Excel(name = "实收金额（元）", width = 15)
     @ApiModelProperty(value = "实收金额（元）")
+    @Max(value = 999999999,message = "实收金额（元）格式错误")
     private java.lang.Integer paidAmount;
 	/**邮寄联系人id*/
 	@Excel(name = "邮寄联系人id", width = 15)
     @ApiModelProperty(value = "邮寄联系人id")
+    @Size(max = 32,message = "邮寄联系人id长度应小于32个字符")
+    @NotEmpty(message = "邮寄联系人id不能为空！")
     private java.lang.String mailContactsId;
     /**临时邮寄联系人id*/
     @Excel(name = "临时邮寄联系人id", width = 15)
@@ -114,6 +127,7 @@ public class PayWorkingGroupSubItem implements Serializable {
 	/**来款方式（1：无，2：合同，3：收费通知）*/
 	@Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15)
     @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
+    @NotNull(message = "来款方式不能为空！")
     private java.lang.Integer chargeWay;
 	/**合同编号*/
 	@Excel(name = "合同编号", width = 15)
@@ -122,6 +136,7 @@ public class PayWorkingGroupSubItem implements Serializable {
 	/**收费通知号*/
 	@Excel(name = "收费通知号", width = 15)
     @ApiModelProperty(value = "收费通知号")
+    @NotEmpty(message = "收费通知号不能为空！")
     private java.lang.String chargeNoticeNo;
 	/**收费通知文件id*/
 	@Excel(name = "收费通知文件id", width = 15)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 92479696..fe13a211 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -30,10 +30,10 @@
                 AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
             </if>
             <if test="payWorkingGroup.principalIdA != null and payWorkingGroup.principalIdA != ''">
-                AND principal_id_a = #{principalIdA}
+                AND principal_id_a = #{payWorkingGroup.principalIdA}
             </if>
             <if test="payWorkingGroup.year != null and payWorkingGroup.year != ''">
-                AND year = #{year}
+                AND year = #{payWorkingGroup.year}
             </if>
         </where>
         ORDER BY create_time DESC