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-09-14 18:25:36 +08:00
parent f8baf90551
commit bb7bc28f02
5 changed files with 24 additions and 24 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
+2 -2
View File
@@ -351,7 +351,7 @@ 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());
p.setDataSource(PayCompanyManagementCommon.DATA_SOURCE1);
@@ -375,7 +375,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
listRemove.add(p);
return;
}
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
+5 -5
View File
@@ -465,13 +465,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);
p.setDataSource(PayContactsManagementCommon.DATA_SOURCE1);
@@ -487,7 +487,7 @@ 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/>");
}
}
// 校验 手机号，姓名
@@ -505,12 +505,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
listRemove.add(p);
return;
}
msg.append("第").append(count + 3).append("行：手机号已经存在，请修改。</br>");
msg.append("第").append(count + 3).append("行：手机号已经存在，请修改。<br/>");
}
List<PayContactsManagement> listContactsEquals = listContactsAll.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())){