LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangqinlin
2021-09-01 16:55:54 +08:00
parent 18e39c7214 6564697443
commit 1327c27406
11 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){
return Result.error("企业名称长度应小于50个字符！");
return Result.error("企业名称长度不能大于50个字符！");
}
QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap());
Page<PayCompanyManagement> page = new Page<PayCompanyManagement>(pageNo, pageSize);
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+3 -3
View File
@@ -72,13 +72,13 @@ public class PayContactsManagementController extends JeroController<PayContactsM
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(!StringUtils.isBlank(payContactsManagement.getName()) && payContactsManagement.getName().length() > 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<PayContactsManagement> page = new Page<PayContactsManagement>(pageNo, pageSize);
IPage<PayContactsManagement> pageList = payContactsManagementService.queryPageList(page, payContactsManagement);
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+7 -7
View File
@@ -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 = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+5 -5
View File
@@ -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 = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+2 -2
View File
@@ -78,10 +78,10 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
@RequestParam(name="paymentDate",required = false) String paymentDate,
HttpServletRequest req) {
if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 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<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
IPage<PayCommonProject> pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject()) && payWorkingGroup.getWorkingGroupProject().length() > 50){
return Result.error("工作组项目长度应小于50个字符");
return Result.error("工作组项目长度不能大于50个字符");
}
Page<PayWorkingGroupVO> page = new Page<PayWorkingGroupVO>(pageNo, pageSize);
IPage<PayWorkingGroupVO> pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+4
View File
@@ -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<PayWorkingG
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(StringUtils.isBlank(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) || payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){
return Result.error("成员单位长度不能大于50个字符");
}
QueryWrapper<PayWorkingGroupSubItem> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap());
Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize);
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubitemService.page(page, queryWrapper);
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+11 -11
View File
@@ -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 = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java
+11 -11
View File
@@ -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 = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+13 -7
View File
@@ -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 = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%'))
</if>
<if test="payCommonProject.contactsTemporaryName != null and payCommonProject.contactsTemporaryName != ''">
AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.contactsTemporaryName},'%'))
<if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
</if>
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND pcp.principal_id = #{payCommonProject.principalId}