From 745bb480a367c04142fab589ba6c2f207287a120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 30 Sep 2021 16:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AFbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 22 ++++++++++++++++--- .../PayContactsManagementController.java | 7 +++++- .../xml/PayContactsManagementMapper.xml | 2 +- .../controller/PayPackCompanyController.java | 2 +- .../PayPackCompanyProjectServiceImpl.java | 7 ++++++ 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index a1ec49d3..c3fe8f74 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -639,8 +639,13 @@ public class PayCompanyManagementController extends JeroController listSigning = new ArrayList<>(); List listRemove = new ArrayList<>(); List companyList = list.stream().map(PayCompanyManagement::getCompanyName).collect(Collectors.toList()); - List listAll = payCompanyManagementService.listPayCompanyManagement(companyList); + List dutyCodeList = list.stream().map(PayCompanyManagement::getDutyCode).collect(Collectors.toList()); + List listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList); + LambdaQueryWrapper queryPayCompanyManagement = new LambdaQueryWrapper<>(); + queryPayCompanyManagement.in(PayCompanyManagement::getDutyCode,dutyCodeList); + List listDutyCodeAll = payCompanyManagementService.list(queryPayCompanyManagement); List listCompany = new ArrayList<>(); + List listDutyCode = new ArrayList<>(); StringBuilder msg = new StringBuilder(); int finalDataSource = dataSource; int finalStatus = status; @@ -651,6 +656,10 @@ public class PayCompanyManagementController extends JeroController"); } listCompany.add(p.getCompanyName()); + if(listDutyCode.contains(p.getDutyCode())){ + msg.append("第 ").append(count + 3).append(" 行：信用代码在excel中重复，请修改。
"); + } + listCompany.add(p.getDutyCode()); p.setDataSource(finalDataSource); p.setStatus(finalStatus); // 校验字段值 @@ -659,12 +668,19 @@ public class PayCompanyManagementController extends JeroController listCompanyEquals = listAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listCompanyAll)){ + List listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listCompanyEquals)){ msg.append("第").append(count + 3).append("行：企业名称已经存在，请修改。
"); } } + // 校验 表中是否存在信用代码 + if(!CollectionUtils.isEmpty(listDutyCodeAll)){ + List listDutyCodeEquals = listDutyCodeAll.stream().filter(p1->Objects.equals(p1.getDutyCode(),p.getDutyCode())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listDutyCodeEquals)){ + msg.append("第").append(count + 3).append("行：信用代码已经存在，请修改。
"); + } + } if (!StringUtils.isBlank(p.getCompanyPhone())){ p.setCompanyPhone(PasswordUtil.encrypt(p.getCompanyPhone())); } 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 d9568397..1c7c6c6d 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 @@ -92,6 +92,9 @@ public class PayContactsManagementController extends JeroController 11){ return Result.error("手机号长度不能大于11个字符！"); } + if(!StringUtils.isBlank(payContactsManagement.getPhone())){ + payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone())); + } Page page = new Page<>(pageNo, pageSize); IPage pageList = payContactsManagementService.queryPageList(page, payContactsManagement); List listPayContactsManagement = pageList.getRecords(); @@ -592,9 +595,11 @@ public class PayContactsManagementController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagement, request.getParameterMap()); - // Step.2 获取导出数据 List pageList = payContactsManagementService.list(queryWrapper); List exportList = null; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index cad96439..6952ae0b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml @@ -26,7 +26,7 @@ AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name},'%')) - AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%')) + AND pcm.phone = #{payContactsManagement.phone} AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index aefaf0a4..e25dd29c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -252,7 +252,7 @@ public class PayPackCompanyController extends JeroController queryPayPackCompanyProject = new LambdaQueryWrapper<>(); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getPackId,payPackCompany.getId()); + List list = payPackCompanyProjectService.list(queryPayPackCompanyProject); + // 验证打包企业是否已存在,存在不在添加 + if(!CollectionUtils.isEmpty(list)){ + return; + } } // 添加打包企业成员 PayPackCompanyProject payPackCompanyProject = new PayPackCompanyProject();