From c57888f6225a4a9009399cd42b4569832ce7c861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 27 Sep 2021 14:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/CompanyMessageEnums.java | 2 +- .../common/enums/ManagementMessageEnums.java | 2 +- .../jero/common/enums/MessageUrlEnums.java | 9 +++- .../PayContactsManagementController.java | 41 ++++++++++++++----- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java index 3128dea7..9796d485 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java @@ -3,7 +3,7 @@ package com.jero.common.enums; import org.apache.commons.lang3.StringUtils; /** - * @Description 企业端消息 + * @Description 企业端模板编码消息 * @Author lqt * @Date 2021/9/22 * @Param diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java index 999bcd55..09939cac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java @@ -2,7 +2,7 @@ package com.jero.common.enums; import org.apache.commons.lang3.StringUtils; /** - * @Description 管理端消息 + * @Description 管理端模板编码消息 * @Author lqt * @Date 2021/9/22 * @Param diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index 22f2694c..de7bb040 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -1,7 +1,14 @@ package com.jero.common.enums; import com.jero.common.util.oConvertUtils; - +/** +* @Description 消息模板，跳转路径 +* @Author lqt +* @Date 2021/9/27 +* @Param +* @Return +* @Exception +*/ public enum MessageUrlEnums { // 管理端 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 f761a0ac..0250512d 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 @@ -601,12 +601,28 @@ public class PayContactsManagementController extends JeroController listSigning = new ArrayList<>(); List listRemove = new ArrayList<>(); - List phoneList = list.stream().map(PayContactsManagement::getPhone).collect(Collectors.toList()); - List listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList); - List companyList = list.stream().map(PayContactsManagement::getCompanyName).collect(Collectors.toList()); - List listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList); + List phoneList = new ArrayList<>(); + List companyList = new ArrayList<>(); + list.forEach(p->{ + if(!StringUtils.isEmpty(p.getPhone())){ + phoneList.add(PasswordUtil.encrypt(p.getPhone())); + } + if(!StringUtils.isEmpty(p.getCompanyName())){ + companyList.add(p.getCompanyName()); + } + }); + List listContactsAll = new ArrayList<>(); + if(!CollectionUtils.isEmpty(phoneList)){ + listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList); + } + List listCompanyAll = new ArrayList<>(); + if(!CollectionUtils.isEmpty(companyList)){ + listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList); + } List listContacts = new ArrayList<>(); StringBuilder msg = new StringBuilder(); + List finalListCompanyAll = listCompanyAll; + List finalListContactsAll = listContactsAll; list.forEach(p->{ int count = list.indexOf(p); // 校验excel表中是否存在重复手机号 @@ -617,7 +633,7 @@ public class PayContactsManagementController extends JeroController listContactsName = listContacts.stream().filter(p1->Objects.equals(p1.getName(),p.getName()) && Objects.equals(p1.getCompanyId(),p.getCompanyId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listContactsName)){ + if(!CollectionUtils.isEmpty(listContactsName)){ msg.append("第 ").append(count + 3).append(" 行：联系人姓名在excel中重复，请修改。
"); } listContacts.add(p); @@ -626,23 +642,28 @@ public class PayContactsManagementController extends JeroController"); + } // 根据企业名称获取企业id - if(!CollectionUtils.isEmpty(listCompanyAll)){ - List listCompany = listCompanyAll.stream().filter(p2->Objects.equals(p2.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(finalListCompanyAll)){ + List listCompany = finalListCompanyAll.stream().filter(p2->Objects.equals(p2.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listCompany)){ p.setCompanyId(listCompany.get(0).getId()); }else{ msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。
"); } + }else{ + msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。
"); } // 校验 手机号，姓名 - if(!CollectionUtils.isEmpty(listContactsAll)){ + if(!CollectionUtils.isEmpty(finalListContactsAll)){ // 校验 表中是否存手机号 - List listCompanyEquals = listContactsAll.stream().filter(p1->Objects.equals(p1.getPhone(),p.getPhone())).collect(Collectors.toList()); + List 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("行：手机号已经存在，请修改。
"); } - List listContactsEquals = listContactsAll.stream().filter(p1->Objects.equals(p1.getCompanyId(),p.getCompanyId()) + List 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("行：联系人姓名已经存在，请修改。
");