From bb7bc28f02d7f924eecf3b762f6cdba1d31fa4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 14 Sep 2021 18:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectDetailServiceImpl.java | 2 +- .../PayCompanyManagementController.java | 4 +-- .../PayContactsManagementController.java | 10 +++---- .../PayMemberProjectSubitemController.java | 2 +- .../PayWorkingGroupSubItemServiceImpl.java | 30 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 724022c9..bd5ab83e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -95,7 +95,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { // 合同编号查找合同id if(!StringUtils.isBlank(payCommonProject.getContractNum())){ LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(PayIncomeContract::getContractName,payCommonProject.getContractNum()); + query.eq(PayIncomeContract::getContractNum,payCommonProject.getContractNum()); List list = payIncomeContractService.list(query); if(!CollectionUtils.isEmpty(list)){ // 查看是否有关联 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 61650d51..50959864 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 @@ -351,7 +351,7 @@ public class PayCompanyManagementController extends JeroController"); + msg.append("第 ").append(count + 3).append(" 行：企业名称在excel中重复，请修改。
"); } listCompany.add(p.getCompanyName()); p.setDataSource(PayCompanyManagementCommon.DATA_SOURCE1); @@ -375,7 +375,7 @@ public class PayCompanyManagementController extends JeroController"); + msg.append("第").append(count + 3).append("行：企业名称已经存在，请修改。
"); } } if (!StringUtils.isBlank(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 266712c2..96430c05 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 @@ -465,13 +465,13 @@ public class PayContactsManagementController extends JeroController 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中重复，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：手机号在excel中重复，请修改。
"); } // 校验excel表中是否存在重复联系人 List 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中重复，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：联系人姓名在excel中重复，请修改。
"); } listContacts.add(p); p.setDataSource(PayContactsManagementCommon.DATA_SOURCE1); @@ -487,7 +487,7 @@ public class PayContactsManagementController extends JeroController"); + msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。
"); } } // 校验 手机号，姓名 @@ -505,12 +505,12 @@ public class PayContactsManagementController extends JeroController"); + msg.append("第").append(count + 3).append("行：手机号已经存在，请修改。
"); } List 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("行：联系人姓名已经存在，请修改。
"); + msg.append("第").append(count + 3).append("行：联系人姓名已经存在，请修改。
"); } } if (!StringUtils.isBlank(p.getPhone())){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 0b565f79..f238469e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -206,7 +206,7 @@ public class PayMemberProjectSubitemController extends JeroController"+errorMessage); + throw new JeroBootException("excel导入失败，错误信息为"+errorMessage); } return Result.OK("文件导入成功！"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 9fe5cf6d..23063207 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -324,20 +324,20 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listCompany = new ArrayList<>(); if (StringUtils.isBlank(p.getChargeCompanyTemporaryName())) { - msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。
"); } else { // 通过企业名称获取企业id listCompany = listCompanyInfo.stream().filter(item -> Objects.equals(item.getCompanyName(), p.getChargeCompanyTemporaryName())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(listCompany)) { - msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。
"); } else { p.setChargeCompanyId(listCompany.get(0).getId()); } } // 校验联系人一 if (StringUtils.isBlank(p.getContactsTemporaryNameOne())) { - msg.append("第 ").append(count + 3).append(" 行：联系人不能为空，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：联系人不能为空，请修改。
"); } else { if (!CollectionUtils.isEmpty(listCompany)) { // 通过联系人获取联系人id @@ -346,7 +346,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人一，请修改。
"); } else { p.setContactsIdOne(listContacts.get(0).getId()); } @@ -356,7 +356,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listDateNew = listData.stream().filter(item -> Objects.equals(p.getChargeCompanyId(), item.getChargeCompanyId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listDateNew)) { - msg.append("第 ").append(count + 3).append(" 行：工作组成员单位已存在，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：工作组成员单位已存在，请修改。
"); } } // 校验联系人二 @@ -368,7 +368,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人二，请修改。
"); } else { p.setContactsIdTwo(listContacts.get(0).getId()); } @@ -383,7 +383,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人三，请修改。
"); } else { p.setContactsIdThree(listContacts.get(0).getId()); } @@ -391,7 +391,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第 ").append(count + 3).append(" 行：邮寄联系人不能为空，请修改。
"); } else { if (!CollectionUtils.isEmpty(listCompany)) { // 通过联系人获取联系人id @@ -400,7 +400,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该邮寄联系人，请修改。
"); } else { p.setMailContactsId(listContacts.get(0).getId()); } @@ -409,32 +409,32 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listCompanyAndContactsNew = listCompanyAndContacts.stream().filter(item -> Objects.equals(p.getChargeCompanyTemporaryName(), item.getChargeCompanyTemporaryName())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listCompanyAndContactsNew)) { - msg.append("第 ").append(count + 3).append(" 行：工作组成员单位重复出现，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：工作组成员单位重复出现，请修改。
"); } listCompanyAndContacts.add(p); // 校验 if (Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY2)) { if (Objects.isNull(p.getReceivableAmount())) { - msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。
"); } if (StringUtils.isBlank(p.getContractNum())) { - msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。
"); } } if (Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY3)) { if (Objects.isNull(p.getChargeNoticeNo())) { - msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。
"); } else { if (Objects.equals(payWorkingGroup.getChargeNoticeNoA(), p.getChargeNoticeNo())) { p.setChargeNoticeId(payWorkingGroup.getChargeNoticeAId()); } else if (Objects.equals(payWorkingGroup.getChargeNoticeNoB(), p.getChargeNoticeNo())) { p.setChargeNoticeId(payWorkingGroup.getChargeNoticeBId()); } else { - msg.append("第 ").append(count + 3).append(" 行：收费通知号不存在，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：收费通知号不存在，请修改。
"); } } if (Objects.isNull(p.getReceivableAmount())) { - msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。
"); + msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。
"); } } p.setPack(PayProjectCommon.PACKAGING0);