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

修改bug#40457

Browse Source
This commit is contained in:
梁琦涛
2021-10-22 13:51:07 +08:00
parent eebd3b6ddd
commit 4a7795dc0b
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+16 -3
View File
@@ -706,6 +706,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
List<PayContactsManagement> listSigning = new ArrayList<>(); List<PayContactsManagement> listSigning = new ArrayList<>();
List<PayContactsManagement> listRemove = new ArrayList<>(); List<PayContactsManagement> listRemove = new ArrayList<>();
List<String> phoneList = new ArrayList<>(); List<String> phoneList = new ArrayList<>();
List<String> contactsList = new ArrayList<>();
List<String> companyList = new ArrayList<>(); List<String> companyList = new ArrayList<>();
list.forEach(p->{ list.forEach(p->{
if(!StringUtils.isEmpty(p.getPhone())){ if(!StringUtils.isEmpty(p.getPhone())){
@@ -714,11 +715,20 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!StringUtils.isEmpty(p.getCompanyName())){ if(!StringUtils.isEmpty(p.getCompanyName())){
companyList.add(p.getCompanyName()); companyList.add(p.getCompanyName());
} }
if(!StringUtils.isEmpty(p.getName())){
contactsList.add(p.getName());
}
}); });
List<PayContactsManagement> listContactsAll = new ArrayList<>(); List<PayContactsManagement> listContactsAll = new ArrayList<>();
if(!CollectionUtils.isEmpty(phoneList)){ if(!CollectionUtils.isEmpty(phoneList)){
listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList); listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList);
} }
List<PayContactsManagement> listContactsNameAll = new ArrayList<>();
if(!CollectionUtils.isEmpty(contactsList)){
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getName,contactsList);
listContactsNameAll = payContactsManagementService.list(queryPayContactsManagement);
}
List<PayCompanyManagement> listCompanyAll = new ArrayList<>(); List<PayCompanyManagement> listCompanyAll = new ArrayList<>();
if(!CollectionUtils.isEmpty(companyList)){ if(!CollectionUtils.isEmpty(companyList)){
listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList); listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList);
@@ -726,6 +736,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
List<PayContactsManagement> listContacts = new ArrayList<>(); List<PayContactsManagement> listContacts = new ArrayList<>();
List<PayCompanyManagement> finalListCompanyAll = listCompanyAll; List<PayCompanyManagement> finalListCompanyAll = listCompanyAll;
List<PayContactsManagement> finalListContactsAll = listContactsAll; List<PayContactsManagement> finalListContactsAll = listContactsAll;
List<PayContactsManagement> finalListContactsNameAll = listContactsNameAll;
list.forEach(p->{ list.forEach(p->{
int count = list.indexOf(p); int count = list.indexOf(p);
// 校验excel表中是否存在重复手机号 // 校验excel表中是否存在重复手机号
@@ -767,10 +778,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!CollectionUtils.isEmpty(listCompanyEquals)){ 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(finalListContactsNameAll) && !StringUtils.isEmpty(p.getCompanyId())){
List<PayContactsManagement> listContactsEquals = finalListContactsNameAll.stream().filter(p1->Objects.equals(p1.getCompanyId(),p.getCompanyId())
&& Objects.equals(p1.getName(),p.getName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsEquals)){ if(!CollectionUtils.isEmpty(listContactsEquals)){
msg.append("第").append(count + 3).append("行:姓名已经存在，请修改。<br/>"); msg.append("第").append(count + 3).append("行:").append("该企业下姓名已经存在，请修改。<br/>");
} }
} }
if (!StringUtils.isBlank(p.getPhone())){ if (!StringUtils.isBlank(p.getPhone())){