From 2181b9c3211a60e4f4243c76293fb70458725396 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 20 Mar 2024 17:59:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2082901=20=E5=B7=A5=E4=BD=9C=E7=BB=84--?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E6=88=90=E5=91=98=E5=8D=95?= =?UTF-8?q?=E4=BD=8D--=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=B7=B2=E5=AD=98=E5=9C=A8--=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E6=98=8E=E7=A1=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupSubItemController.java | 14 ++++- .../PayDraftingGroupSubItemServiceImpl.java | 4 +- .../PayWorkingGroupSubItemController.java | 54 +++++++++++-------- .../PayWorkingGroupSubItemServiceImpl.java | 4 +- 4 files changed, 50 insertions(+), 26 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index d677470e..2577bfab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -251,6 +251,7 @@ public class PayDraftingGroupSubItemController extends JeroController errInfoList = new ArrayList<>(); for (String draftingGroupId : draftingGroupIdsArr) { payDraftingGroupSubItem.setId(null); List payDraftingGroupSubItemContacts = @@ -261,7 +262,18 @@ public class PayDraftingGroupSubItemController extends JeroController sb.append(e).append(",")); + sb.deleteCharAt(sb.length() - 1); + sb.append(" 中已存在！"); + throw new JeroBootException(sb.toString()); } return Result.OK("添加成功！"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index 5098ed34..083c6eb7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -155,10 +155,10 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl batchAdd(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { - String workingGroupIds = payWorkingGroupSubItem.getWorkingGroupIds(); - if (StringUtils.isBlank(workingGroupIds)) { - return Result.error("工作组ids不能为空！"); - } - String[] workingGroupIdsArr = workingGroupIds.split(","); - for (String workingGroupId : workingGroupIdsArr) { - payWorkingGroupSubItem.setId(null); - List payWorkingGroupSubItemContactsList = - payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); - payWorkingGroupSubItemContactsList.forEach(p-> p.setId(null)); - payWorkingGroupSubItem.setWorkingGroupId(workingGroupId); - payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem); - StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); - if (!StringUtils.isBlank(msg)) { - return Result.error(msg.toString()); - } - payWorkingGroupSubItemService.addPayWorkingGroupSubItem(payWorkingGroupSubItem); - } - return Result.OK("添加成功！"); - } + public Result batchAdd(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + String workingGroupIds = payWorkingGroupSubItem.getWorkingGroupIds(); + if (StringUtils.isBlank(workingGroupIds)) { + return Result.error("工作组ids不能为空！"); + } + String[] workingGroupIdsArr = workingGroupIds.split(","); + List errInfoList = new ArrayList<>(); + for (String workingGroupId : workingGroupIdsArr) { + payWorkingGroupSubItem.setId(null); + List payWorkingGroupSubItemContactsList = + payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + payWorkingGroupSubItemContactsList.forEach(p -> p.setId(null)); + payWorkingGroupSubItem.setWorkingGroupId(workingGroupId); + payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem); + StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + try { + payWorkingGroupSubItemService.addPayWorkingGroupSubItem(payWorkingGroupSubItem); + } catch (Exception e) { + errInfoList.add(e.getMessage().replace("成员单位在工作组 ", "").replace(" 中已存在！","")); + } + } + if (CollectionUtils.isNotEmpty(errInfoList)) { + StringBuilder sb = new StringBuilder("成员单位在工作组 "); + errInfoList.forEach(e -> sb.append(e).append(",")); + sb.deleteCharAt(sb.length() - 1); + sb.append(" 中已存在！"); + throw new JeroBootException(sb.toString()); + } + 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 2bba65f4..955dbc7a 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 @@ -222,11 +222,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0) { payWorkingGroupSubItem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);