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

修改提示语

Browse Source
This commit is contained in:
梁琦涛
2021-10-22 12:02:24 +08:00
parent 3895fcab11
commit eebd3b6ddd
17 changed files with 117 additions and 111 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
+4 -4
View File
@@ -677,11 +677,11 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
int count = list.indexOf(p);
// 校验excel表中是否存在重复企业名称
if(listCompany.contains(p.getCompanyName())){
msg.append("第").append(count + 3).append("行：企业名称在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称在excel中重复，请修改。<br/>");
}
listCompany.add(p.getCompanyName());
if(listDutyCode.contains(p.getDutyCode())){
msg.append("第").append(count + 3).append("行：信用代码在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:信用代码在excel中重复，请修改。<br/>");
}
listCompany.add(p.getDutyCode());
p.setDataSource(finalDataSource);
@@ -695,14 +695,14 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(!CollectionUtils.isEmpty(listCompanyAll)){
List<PayCompanyManagement> listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompanyEquals)){
msg.append("第").append(count + 3).append("行：企业名称已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称已经存在，请修改。<br/>");
}
}
// 校验 表中是否存在信用代码
if(!CollectionUtils.isEmpty(listDutyCodeAll)){
List<PayCompanyManagement> listDutyCodeEquals = listDutyCodeAll.stream().filter(p1->Objects.equals(p1.getDutyCode(),p.getDutyCode())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listDutyCodeEquals)){
msg.append("第").append(count + 3).append("行：信用代码已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:信用代码已经存在，请修改。<br/>");
}
}
if (!StringUtils.isBlank(p.getCompanyPhone())){
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+7 -7
View File
@@ -731,13 +731,13 @@ public class PayContactsManagementController extends JeroController<PayContactsM
// 校验excel表中是否存在重复手机号
List<PayContactsManagement> listContactsPhone = listContacts.stream().filter(p1->Objects.equals(p1.getPhone(),p.getPhone())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsPhone)){
msg.append("第").append(count + 3).append("行：手机号在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:手机号在excel中重复，请修改。<br/>");
}
// 校验excel表中是否存在重复联系人
List<PayContactsManagement> listContactsName = listContacts.stream().filter(p1->Objects.equals(p1.getName(),p.getName())
&& Objects.equals(p1.getCompanyId(),p.getCompanyId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName)){
msg.append("第").append(count + 3).append("行：联系人姓名在excel中重复，请修改。<br/>");
msg.append("第").append(count + 3).append("行:联系人姓名在excel中重复，请修改。<br/>");
}
listContacts.add(p);
// 校验字段值
@@ -746,7 +746,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
msg.append(s);
}
if(StringUtils.isEmpty(p.getCompanyName())){
msg.append("第").append(count + 3).append("行：企业名称不能为空，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不能为空，请修改。<br/>");
}else{
// 根据企业名称获取企业id
if(!CollectionUtils.isEmpty(finalListCompanyAll)){
@@ -754,10 +754,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!CollectionUtils.isEmpty(listCompany)){
p.setCompanyId(listCompany.get(0).getId());
}else{
msg.append("第").append(count + 3).append("行：企业名称不存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不存在，请修改。<br/>");
}
}else{
msg.append("第").append(count + 3).append("行：企业名称不存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:企业名称不存在，请修改。<br/>");
}
}
// 校验 手机号，姓名
@@ -765,12 +765,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
// 校验 表中是否存手机号
List<PayContactsManagement> listCompanyEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getPhone(),PasswordUtil.encrypt(p.getPhone()))).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompanyEquals)){
msg.append("第").append(count + 3).append("行：手机号已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:手机号已经存在，请修改。<br/>");
}
List<PayContactsManagement> listContactsEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getCompanyId(),p.getCompanyId())
&& Objects.equals(p1.getName(),p.getName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsEquals)){
msg.append("第").append(count + 3).append("行：姓名已经存在，请修改。<br/>");
msg.append("第").append(count + 3).append("行:姓名已经存在，请修改。<br/>");
}
}
if (!StringUtils.isBlank(p.getPhone())){
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+6 -6
View File
@@ -38,20 +38,20 @@ public class PayCompanyManagement implements Serializable {
/**企业名称*/
@Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称")
@NotEmpty(message = "企业名称不能为空！")
@NotEmpty(message = "企业名称不能为空")
@Size(max = 50, message = "企业名称长度不能大于50个字符")
private String companyName;
/**信用代码*/
@Excel(name = "信用代码", width = 15)
@ApiModelProperty(value = "信用代码")
@NotEmpty(message = "信用代码不能为空！")
@NotEmpty(message = "信用代码不能为空")
@Size(max = 18, message = "信用代码长度不能大于18个字符")
@Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误")
private String dutyCode;
/**公司地址*/
@Excel(name = "公司地址", width = 15)
@ApiModelProperty(value = "公司地址")
@NotEmpty(message = "公司地址不能为空！")
@NotEmpty(message = "公司地址不能为空")
@Size(max = 50, message = "公司地址长度不能大于50个字符")
private String companyAddress;
/**公司电话*/
@@ -63,7 +63,7 @@ public class PayCompanyManagement implements Serializable {
/**邮政编码*/
@Excel(name = "邮政编码", width = 15)
@ApiModelProperty(value = "邮政编码")
@NotEmpty(message = "邮政编码不能为空！")
@NotEmpty(message = "邮政编码不能为空")
@Size(min=6,max = 6,message = "邮政编码长度必须为6个字符")
@Pattern(regexp = "^[0-9]\\d{5}$",message = "邮政编码格式错误")
private String postalCode;
@@ -75,13 +75,13 @@ public class PayCompanyManagement implements Serializable {
/**开户行*/
@Excel(name = "开户行", width = 15)
@ApiModelProperty(value = "开户行")
// @NotEmpty(message = "开户行不能为空！")
// @NotEmpty(message = "开户行不能为空")
@Size(max = 50, message = "开户行长度不能大于50个字符")
private String openingBank;
/**银行账号*/
@Excel(name = "银行账号", width = 15)
@ApiModelProperty(value = "银行账号")
// @NotEmpty(message = "银行账号不能为空！")
// @NotEmpty(message = "银行账号不能为空")
@Size(max = 50, message = "银行账号长度不能大于50个字符")
@Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误")
private String bankAccount;
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+5 -5
View File
@@ -49,7 +49,7 @@ public class PayContactsManagement implements Serializable {
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
@NotEmpty(message = "姓名不能为空！")
@NotEmpty(message = "姓名不能为空")
@Size(max = 50, message = "姓名长度不能大于50个字符")
private String name;
/**性别（1:男，2:女）*/
@@ -65,27 +65,27 @@ public class PayContactsManagement implements Serializable {
/**手机号*/
@Excel(name = "手机号", width = 15)
@ApiModelProperty(value = "手机号")
@NotEmpty(message = "手机号不能为空！")
@NotEmpty(message = "手机号不能为空")
@Pattern(regexp = "^((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 phone;
/**邮箱*/
@Excel(name = "邮箱", width = 15)
@ApiModelProperty(value = "邮箱")
@Pattern(regexp = "^\\w[-\\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\\.)+[A-Za-z]{2,14}$",message = "邮箱格式错误")
@NotEmpty(message = "邮箱不能为空！")
@NotEmpty(message = "邮箱不能为空")
private String email;
/**通讯地址*/
@Excel(name = "通讯地址", width = 15)
@ApiModelProperty(value = "通讯地址")
@Size(max = 50, message = "通讯地址长度不能大于50个字符")
@NotEmpty(message = "通讯地址不能为空！")
@NotEmpty(message = "通讯地址不能为空")
private String contactAddress;
/**邮政编码*/
@Excel(name = "邮政编码", width = 15)
@Size(min=6,max = 6,message = "邮政编码长度必须为6个字符")
@ApiModelProperty(value = "邮政编码")
@Pattern(regexp = "^[0-9]\\d{5}$",message = "邮政编码格式错误")
@NotEmpty(message = "邮政编码不能为空！")
@NotEmpty(message = "邮政编码不能为空")
private String postalCode;
/**备注*/
@Excel(name = "备注", width = 15)