From 04d79c1694fe9468e20714973a8c558dbf347fcc 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:24:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 2 +- .../PayContactsManagementController.java | 6 ++--- .../company/entity/PayCompanyManagement.java | 14 ++++++------ .../company/entity/PayContactsManagement.java | 10 ++++----- .../PayCommonProjectController.java | 4 ++-- .../controller/PayWorkingGroupController.java | 2 +- .../PayWorkingGroupSubItemController.java | 4 ++++ .../jero/project/entity/PayCommonProject.java | 22 +++++++++---------- .../jero/project/entity/PayWorkingGroup.java | 22 +++++++++---------- .../entity/PayWorkingGroupSubItem.java | 20 +++++++++++------ 10 files changed, 58 insertions(+), 48 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index c58a2676..c08afa57 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -61,7 +61,7 @@ public class PayCompanyManagementController extends JeroController 50){ - return Result.error("企业名称长度应小于50个字符！"); + return Result.error("企业名称长度不能大于50个字符！"); } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 0416129a..d5c9340c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -72,13 +72,13 @@ public class PayContactsManagementController extends JeroController 20){ - return Result.error("姓名长度应小于20个字符！"); + return Result.error("姓名长度不能大于20个字符！"); } if(!StringUtils.isBlank(payContactsManagement.getCompanyName()) && payContactsManagement.getCompanyName().length() > 50){ - return Result.error("企业名称长度应小于50个字符！"); + return Result.error("企业名称长度不能大于50个字符！"); } if(!StringUtils.isBlank(payContactsManagement.getPhone()) && payContactsManagement.getPhone().length() > 11){ - return Result.error("手机号长度应小于11个字符！"); + return Result.error("手机号长度不能大于11个字符！"); } Page page = new Page(pageNo, pageSize); IPage pageList = payContactsManagementService.queryPageList(page, payContactsManagement); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java index 87b9ab9e..94826dc4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java @@ -42,12 +42,12 @@ public class PayCompanyManagement implements Serializable { /**公司地址*/ @Excel(name = "公司地址", width = 15) @ApiModelProperty(value = "公司地址") - @Size(max = 200, message = "公司地址长度应小于200个字符") + @Size(max = 200, message = "公司地址长度不能大于200个字符") private String companyAddress; /**公司电话*/ @Excel(name = "公司电话", width = 15) @ApiModelProperty(value = "公司电话") - @Size(max = 15, message = "公司电话长度应小于15个字符") + @Size(max = 15, message = "公司电话长度不能大于15个字符") @Pattern(regexp = "^(([0-9]{3,4}-)?[0-9]{7,8})|(((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8})$",message = "公司电话格式错误") private String companyPhone; /**邮编*/ @@ -59,23 +59,23 @@ public class PayCompanyManagement implements Serializable { /**银行户名*/ @Excel(name = "银行户名", width = 15) @ApiModelProperty(value = "银行户名") - @Size(max = 50,message = "银行户名长度应小于50个字符") + @Size(max = 50,message = "银行户名长度不能大于50个字符") private String bankAccountName; /**开户行*/ @Excel(name = "开户行", width = 15) @ApiModelProperty(value = "开户行") - @Size(max = 50, message = "开户行长度应小于50个字符") + @Size(max = 50, message = "开户行长度不能大于50个字符") private String openingBank; /**银行账号*/ @Excel(name = "银行账号", width = 15) @ApiModelProperty(value = "银行账号") - @Size(max = 50, message = "银行账号长度应小于50个字符") + @Size(max = 50, message = "银行账号长度不能大于50个字符") @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误") private String bankAccount; /**税号*/ @Excel(name = "税号", width = 15) @ApiModelProperty(value = "税号") - @Size(max = 50, message = "税号长度应小于50个字符") + @Size(max = 50, message = "税号长度不能大于50个字符") @Pattern(regexp = "^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$",message = "税号格式错误") private String dutyCode; /**数据来源(1：管理端，2：报名)*/ @@ -91,7 +91,7 @@ public class PayCompanyManagement implements Serializable { /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") - @Size(max = 200, message = "备注长度应小于200个字符") + @Size(max = 200, message = "备注长度不能大于200个字符") private String remarks; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 9a34e487..951b72b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -42,13 +42,13 @@ public class PayContactsManagement implements Serializable { @Excel(name = "企业名称", width = 15) @ApiModelProperty(value = "企业名称") @NotEmpty(message = "企业名称不能为空！") - @Size(max = 200, message = "企业名称长度应小于200个字符") + @Size(max = 200, message = "企业名称长度不能大于200个字符") private String companyName; /**姓名*/ @Excel(name = "姓名", width = 15) @ApiModelProperty(value = "姓名") @NotEmpty(message = "姓名不能为空！") - @Size(max = 20, message = "姓名长度应小于20个字符") + @Size(max = 20, message = "姓名长度不能大于20个字符") private String name; /**性别（1:男，2:女）*/ @Excel(name = "性别", width = 15,dicCode="sex") @@ -60,7 +60,7 @@ public class PayContactsManagement implements Serializable { /**职务*/ @Excel(name = "职务", width = 15) @ApiModelProperty(value = "职务") - @Size(max = 20, message = "职务长度应小于20个字符") + @Size(max = 20, message = "职务长度不能大于20个字符") private String post; /**手机号*/ @Excel(name = "手机号", width = 15) @@ -77,7 +77,7 @@ public class PayContactsManagement implements Serializable { /**通讯地址*/ @Excel(name = "通讯地址", width = 15) @ApiModelProperty(value = "通讯地址") - @Size(max = 50, message = "通讯地址长度应小于50个字符") + @Size(max = 50, message = "通讯地址长度不能大于50个字符") @NotEmpty(message = "通讯地址不能为空！") private String contactAddress; /**邮政编码*/ @@ -100,7 +100,7 @@ public class PayContactsManagement implements Serializable { /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") - @Size(max = 200, message = "备注长度应小于200个字符") + @Size(max = 200, message = "备注长度不能大于200个字符") private String remarks; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 8e68e9d9..8816e68d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -78,10 +78,10 @@ public class PayCommonProjectController extends JeroController 100){ - return Result.error("来款项目长度应小于100个字符"); + return Result.error("来款项目长度不能大于100个字符"); } if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName()) && payCommonProject.getChargeCompanyTemporaryName().length() > 50){ - return Result.error("来款单位长度应小于50个字符"); + return Result.error("来款单位长度不能大于50个字符"); } Page page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 3489c975..64f3b06c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -69,7 +69,7 @@ public class PayWorkingGroupController extends JeroController 50){ - return Result.error("工作组项目长度应小于50个字符"); + return Result.error("工作组项目长度不能大于50个字符"); } Page page = new Page(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 983d728e..64791c4e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -47,6 +48,9 @@ public class PayWorkingGroupSubItemController extends JeroController 50){ + return Result.error("成员单位长度不能大于50个字符"); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = payWorkingGroupSubitemService.page(page, queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index d90b0d02..bc962999 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -40,7 +40,7 @@ public class PayCommonProject implements Serializable { @Excel(name = "来款项目", width = 15) @ApiModelProperty(value = "来款项目") @NotEmpty(message = "来款项目不能为空！") - @Size(max = 100,message = "来款项目长度应小于100个字符") + @Size(max = 100,message = "来款项目长度不能大于100个字符") private String chargeProject; /**运行年份*/ @Excel(name = "运行年份", width = 15) @@ -52,7 +52,7 @@ public class PayCommonProject implements Serializable { @Excel(name = "负责人id", width = 15) @ApiModelProperty(value = "负责人id") @NotEmpty(message = "负责人id不能为空！") - @Size(max = 32,message = "来款项目长度应小于32个字符") + @Size(max = 32,message = "来款项目长度不能大于32个字符") private String principalId; /**负责人名称*/ @Excel(name = "负责人名称", width = 15) @@ -62,12 +62,12 @@ public class PayCommonProject implements Serializable { @Excel(name = "来款企业id", width = 15) @ApiModelProperty(value = "来款企业id") @NotEmpty(message = "来款企业id不能为空！") - @Size(max = 32,message = "来款企业id长度应小于32个字符") + @Size(max = 32,message = "来款企业id长度不能大于32个字符") private String chargeCompanyId; /**临时来款企业id*/ @Excel(name = "临时来款企业id", width = 15) @ApiModelProperty(value = "临时来款企业id") - @Size(max = 32,message = "临时来款企业id长度应小于32个字符") + @Size(max = 32,message = "临时来款企业id长度不能大于32个字符") private String chargeCompanyTemporaryId; /**临时来款企业*/ @Excel(name = "临时来款企业", width = 15) @@ -83,12 +83,12 @@ public class PayCommonProject implements Serializable { @Excel(name = "联系人id", width = 15) @ApiModelProperty(value = "联系人id") @NotEmpty(message = "联系人id不能为空！") - @Size(max = 32,message = "来款企业id长度应小于32个字符") + @Size(max = 32,message = "来款企业id长度不能大于32个字符") private String contactsId; /**临时联系人id*/ @Excel(name = "临时联系人id", width = 15) @ApiModelProperty(value = "临时联系人id") - @Size(max = 32,message = "临时联系人id长度应小于32个字符") + @Size(max = 32,message = "临时联系人id长度不能大于32个字符") private String contactsTemporaryId; /**临时联系人名称*/ @Excel(name = "临时联系人名称", width = 15) @@ -109,12 +109,12 @@ public class PayCommonProject implements Serializable { @Excel(name = "邮寄联系人id", width = 15) @ApiModelProperty(value = "邮寄联系人id") @NotEmpty(message = "邮寄联系人id不能为空！") - @Size(max = 32,message = "邮寄联系人id长度应小于32个字符") + @Size(max = 32,message = "邮寄联系人id长度不能大于32个字符") private String mailContactsId; /**临时邮寄联系人id*/ @Excel(name = "临时邮寄联系人id", width = 15) @ApiModelProperty(value = "临时邮寄联系人id") - @Size(max = 32,message = "临时邮寄联系人id长度应小于32个字符") + @Size(max = 32,message = "临时邮寄联系人id长度不能大于32个字符") private String mailContactsTemporaryId; /**临时邮寄联系人名称*/ @Excel(name = "临时邮寄联系人名称", width = 15) @@ -149,12 +149,12 @@ public class PayCommonProject implements Serializable { /**合同编号*/ @Excel(name = "合同编号", width = 15) @ApiModelProperty(value = "合同编号") - @Size(max = 50,message = "合同编号长度应小于50个字符") + @Size(max = 50,message = "合同编号长度不能大于50个字符") private String contractNum; /**收费通知号*/ @Excel(name = "收费通知号", width = 15) @ApiModelProperty(value = "收费通知号") - @Size(max = 50,message = "收费通知号长度应小于50个字符") + @Size(max = 50,message = "收费通知号长度不能大于50个字符") private String chargeNoticeNo; /**收费通知文件id*/ @Excel(name = "收费通知文件id", width = 15) @@ -167,7 +167,7 @@ public class PayCommonProject implements Serializable { /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") - @Size(max = 200,message = "备注长度应小于200个字符") + @Size(max = 200,message = "备注长度不能大于200个字符") private String remarks; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index e08a2a8a..921d933e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -42,7 +42,7 @@ public class PayWorkingGroup implements Serializable { @Excel(name = "工作组项目", width = 15) @ApiModelProperty(value = "工作组项目") @NotEmpty(message = "工作组项目不能为空！") - @Size(max = 50,message = "工作组项目长度应小于50个字符") + @Size(max = 50,message = "工作组项目长度不能大于50个字符") private String workingGroupProject; /**运行年份*/ @Excel(name = "运行年份", width = 15) @@ -54,7 +54,7 @@ public class PayWorkingGroup implements Serializable { @Excel(name = "负责人Aid", width = 15) @ApiModelProperty(value = "负责人Aid") @NotEmpty(message = "负责人Aid不能为空！") - @Size(max = 32,message = "负责人Aid长度应小于32个字符") + @Size(max = 32,message = "负责人Aid长度不能大于32个字符") private String principalIdA; /**负责人名称A*/ @Excel(name = "负责人名称A", width = 15) @@ -63,7 +63,7 @@ public class PayWorkingGroup implements Serializable { /**负责人Bid*/ @Excel(name = "负责人Bid", width = 15) @ApiModelProperty(value = "负责人Bid") - @Size(max = 32,message = "负责人Bid长度应小于32个字符") + @Size(max = 32,message = "负责人Bid长度不能大于32个字符") private String principalIdB; /**负责人名称B*/ @Excel(name = "负责人名称B", width = 15) @@ -72,12 +72,12 @@ public class PayWorkingGroup implements Serializable { /**每年召开次数*/ @Excel(name = "每年召开次数", width = 15) @ApiModelProperty(value = "每年召开次数") - @Size(max = 50,message = "每年召开次数长度应小于50个字符") + @Size(max = 50,message = "每年召开次数长度不能大于50个字符") private String convokeNum; /**运行周期*/ @Excel(name = "运行周期", width = 15) @ApiModelProperty(value = "运行周期") - @Size(max = 50,message = "运行周期长度应小于50个字符") + @Size(max = 50,message = "运行周期长度不能大于50个字符") private String operationCycle; /**本年应收款A（元）*/ @Excel(name = "本年应收款A（元）", width = 15) @@ -87,12 +87,12 @@ public class PayWorkingGroup implements Serializable { /**收费通知号A*/ @Excel(name = "收费通知号A", width = 15) @ApiModelProperty(value = "收费通知号A") - @Size(max = 50,message = "收费通知号A长度应小于50个字符") + @Size(max = 50,message = "收费通知号A长度不能大于50个字符") private String chargeNoticeNoA; /**收费通知文件Aid*/ @Excel(name = "收费通知文件Aid", width = 15) @ApiModelProperty(value = "收费通知文件Aid") - @Size(max = 32,message = "收费通知文件Aid长度应小于32个字符") + @Size(max = 32,message = "收费通知文件Aid长度不能大于32个字符") private String chargeNoticeAId; /**本年应收款B（元）*/ @Excel(name = "本年应收款B（元）", width = 15) @@ -102,22 +102,22 @@ public class PayWorkingGroup implements Serializable { /**收费通知号B*/ @Excel(name = "收费通知号B", width = 15) @ApiModelProperty(value = "收费通知号B") - @Size(max = 50,message = "收费通知号B长度应小于50个字符") + @Size(max = 50,message = "收费通知号B长度不能大于50个字符") private String chargeNoticeNoB; /**收费通知文件Bid*/ @Excel(name = "收费通知文件Bid", width = 15) @ApiModelProperty(value = "收费通知文件Bid") - @Size(max = 32,message = "收费通知文件Bid长度应小于32个字符") + @Size(max = 32,message = "收费通知文件Bid长度不能大于32个字符") private String chargeNoticeBId; /**任务及目标*/ @Excel(name = "任务及目标", width = 15) @ApiModelProperty(value = "任务及目标") - @Size(max = 200,message = "任务及目标长度应小于200个字符") + @Size(max = 200,message = "任务及目标长度不能大于200个字符") private String missionAndObjectives; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") - @Size(max = 200,message = "备注长度应小于200个字符") + @Size(max = 200,message = "备注长度不能大于200个字符") private String remarks; /**创建人*/ @ApiModelProperty(value = "创建人") 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 6dd476fd..c774ccba 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 @@ -39,18 +39,18 @@ public class PayWorkingGroupSubItem implements Serializable { /**来款项目*/ @Excel(name = "来款项目", width = 15) @ApiModelProperty(value = "来款项目") - @Size(max = 100,message = "来款项目长度应小于100个字符") + @Size(max = 100,message = "来款项目长度不能大于100个字符") private java.lang.String chargeProject; /**工作组id*/ @Excel(name = "工作组id", width = 15) @ApiModelProperty(value = "工作组id") - @Size(max = 32,message = "工作组id长度应小于32个字符") + @Size(max = 32,message = "工作组id长度不能大于32个字符") private java.lang.String workingGroupId; /**成员单位id*/ @Excel(name = "成员单位id", width = 15) @ApiModelProperty(value = "成员单位id") @NotEmpty(message = "成员单位id不能为空！") - @Size(max = 32,message = "成员单位id长度应小于32个字符") + @Size(max = 32,message = "成员单位id长度不能大于32个字符") private java.lang.String chargeCompanyId; /**临时成员单位id*/ @Excel(name = "临时成员单位id", width = 15) @@ -64,7 +64,7 @@ public class PayWorkingGroupSubItem implements Serializable { @Excel(name = "企业联系人一id", width = 15) @ApiModelProperty(value = "企业联系人一id") @NotEmpty(message = "企业联系人一id不能为空！") - @Size(max = 32,message = "企业联系人一id长度应小于32个字符") + @Size(max = 32,message = "企业联系人一id长度不能大于32个字符") private java.lang.String contactsIdOne; /**临时企业联系人一id*/ @Excel(name = "临时企业联系人一id", width = 15) @@ -77,7 +77,7 @@ public class PayWorkingGroupSubItem implements Serializable { /**企业联系人二id*/ @Excel(name = "企业联系人二id", width = 15) @ApiModelProperty(value = "企业联系人二id") - @Size(max = 32,message = "企业联系人二id长度应小于32个字符") + @Size(max = 32,message = "企业联系人二id长度不能大于32个字符") private java.lang.String contactsIdTwo; /**临时企业联系人二id*/ @Excel(name = "临时企业联系人二id", width = 15) @@ -90,7 +90,7 @@ public class PayWorkingGroupSubItem implements Serializable { /**企业联系人三id*/ @Excel(name = "企业联系人三id", width = 15) @ApiModelProperty(value = "企业联系人三id") - @Size(max = 32,message = "企业联系人三id长度应小于32个字符") + @Size(max = 32,message = "企业联系人三id长度不能大于32个字符") private java.lang.String contactsIdThree; /**临时企业联系人三id*/ @Excel(name = "临时企业联系人三id", width = 15) @@ -113,7 +113,7 @@ public class PayWorkingGroupSubItem implements Serializable { /**邮寄联系人id*/ @Excel(name = "邮寄联系人id", width = 15) @ApiModelProperty(value = "邮寄联系人id") - @Size(max = 32,message = "邮寄联系人id长度应小于32个字符") + @Size(max = 32,message = "邮寄联系人id长度不能大于32个字符") @NotEmpty(message = "邮寄联系人id不能为空！") private java.lang.String mailContactsId; /**临时邮寄联系人id*/ @@ -128,19 +128,23 @@ public class PayWorkingGroupSubItem implements Serializable { @Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15) @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") @NotNull(message = "来款方式不能为空！") + @Size(max = 1,message = "来款方式格式不正确") private java.lang.Integer chargeWay; /**合同编号*/ @Excel(name = "合同编号", width = 15) @ApiModelProperty(value = "合同编号") + @Size(max = 50,message = "合同编号长度不能大于50个字符") private java.lang.String contractNum; /**收费通知号*/ @Excel(name = "收费通知号", width = 15) @ApiModelProperty(value = "收费通知号") @NotEmpty(message = "收费通知号不能为空！") + @Size(max = 50,message = "收费通知号长度不能大于50个字符") private java.lang.String chargeNoticeNo; /**收费通知文件id*/ @Excel(name = "收费通知文件id", width = 15) @ApiModelProperty(value = "收费通知文件id") + @Size(max = 32,message = "收费通知文件id长度不能大于32个字符") private java.lang.String chargeNoticeId; /**打包（1：是，0：否）*/ @Excel(name = "打包（1：是，0：否）", width = 15) @@ -165,10 +169,12 @@ public class PayWorkingGroupSubItem implements Serializable { /**催款次数*/ @Excel(name = "催款次数", width = 15) @ApiModelProperty(value = "催款次数") + @Max(value = 999999999,message = "催款次数格式错误") private java.lang.Integer pressMoneyTimes; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") + @Size(max = 50,message = "备注长度不能大于100个字符") private java.lang.String remarks; /**创建人*/ @ApiModelProperty(value = "创建人") From 6564697443d28a202ef20153739ed1c47cd0d96e 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:50:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/mapper/xml/PayCommonProjectMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml index 5a2d2fd4..0f4c5b91 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml @@ -42,8 +42,8 @@ AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%')) - - AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.contactsTemporaryName},'%')) + + AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) AND pcp.principal_id = #{payCommonProject.principalId}