From 2c2770ce644a8839d1d00af5093624c9ec79d103 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 16 Jan 2024 10:56:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=2079936?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsStandardizationServiceImpl.java | 58 ++++++++++--------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index d8ad8599..79578c00 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -114,21 +114,23 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationLiaisonList.stream().map(LawsStandardizationLiaison::getId).collect(Collectors.toList()); - lawsStandardizationLiaisonService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationLiaison::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationLiaison::getId, idList)); for (LawsStandardizationLiaison standardizationLiaison : standardizationLiaisonList) { if (StringUtils.isBlank(standardizationLiaison.getId())){ standardizationLiaison.setId(String.valueOf(SnowflakeUtils.snowflake())); } standardizationLiaison.setStandardizationId(lawsStandardization.getId()); - // 保存或更新联络人联系方式 - lawsStandardizationLiaisonService.saveOrUpdate(standardizationLiaison); } + + // 保存或更新联络人联系方式 + lawsStandardizationLiaisonService.saveOrUpdateBatch(standardizationLiaisonList); + + // 删除旧数据 + List idList = standardizationLiaisonList.stream().map(LawsStandardizationLiaison::getId).collect(Collectors.toList()); + lawsStandardizationLiaisonService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationLiaison::getStandardizationId, lawsStandardization.getId()) + .notIn(LawsStandardizationLiaison::getId, idList)); } @@ -147,12 +149,6 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList()); - lawsStandardizationMeetingService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationMeeting::getId, idList)); for (LawsStandardizationMeeting standardizationMeeting : standardizationMeetingList) { standardizationMeeting.setStandardizationId(lawsStandardization.getId()); @@ -185,6 +181,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList()); + lawsStandardizationMeetingService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId()) + .notIn(LawsStandardizationMeeting::getId, idList)); } private void toDataCentre(LawsStandardization lawsStandardization, LoginUser loginUser, LawsStandardizationMeeting standardizationMeeting, List meetingDataList) { @@ -273,17 +276,10 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationPaymentList.stream().map(LawsStandardizationPayment::getId).collect(Collectors.toList()); - lawsStandardizationPaymentService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationPayment::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationPayment::getId, idList)); for (LawsStandardizationPayment lawsStandardizationPayment : standardizationPaymentList) { lawsStandardizationPayment.setStandardizationId(lawsStandardization.getId()); - // 如果支付信息ID为空，则生成一个SnowflakeID if (StringUtils.isBlank(lawsStandardizationPayment.getId())){ lawsStandardizationPayment.setId(String.valueOf(SnowflakeUtils.snowflake())); } @@ -310,6 +306,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationPaymentList.stream().map(LawsStandardizationPayment::getId).collect(Collectors.toList()); + lawsStandardizationPaymentService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationPayment::getStandardizationId, lawsStandardization.getId()) + .notIn(LawsStandardizationPayment::getId, idList)); } @@ -326,12 +329,6 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationGroupList.stream().map(LawsStandardizationGroup::getId).collect(Collectors.toList()); - lawsStandardizationGroupService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationGroup::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationGroup::getId, idList)); for (LawsStandardizationGroup lawsStandardizationGroup : standardizationGroupList) { lawsStandardizationGroup.setStandardizationId(lawsStandardization.getId()); @@ -361,6 +358,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl idList = standardizationGroupList.stream().map(LawsStandardizationGroup::getId).collect(Collectors.toList()); + lawsStandardizationGroupService.remove( + new LambdaQueryWrapper() + .eq(LawsStandardizationGroup::getStandardizationId, lawsStandardization.getId()) + .notIn(LawsStandardizationGroup::getId, idList)); }