From 68c4d31fc3f0d19212b05008a3d154ca7c2a2759 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 5 Jan 2024 18:42:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83):=2079?=
 =?UTF-8?q?936?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsStandardizationServiceImpl.java  | 49 +++++++++++++++++--
 1 file changed, 44 insertions(+), 5 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 fab40f97..22ecd316 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
@@ -94,8 +94,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		lawsStandardizationService.saveOrUpdate(lawsStandardization);
 
 		// 联络人联系方式
-		standardizationLiaisonList.stream().map(v -> v.setStandardizationId(lawsStandardization.getId())).forEach(v -> log.info(lawsStandardization.getId()));
-		lawsStandardizationLiaisonService.saveOrUpdateBatch(standardizationLiaisonList);
+		saveOrUpdateLiaison(lawsStandardization, standardizationLiaisonList);
 
 		// 集团参与情况
 		saveOrUpdateGroup(lawsStandardization, standardizationGroupList);
@@ -107,6 +106,25 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		saveOrUpdateMeeting(lawsStandardization, standardizationMeetingList);
 	}
 
+	private void saveOrUpdateLiaison(LawsStandardization lawsStandardization, List<LawsStandardizationLiaison> standardizationLiaisonList) {
+		// 删除旧数据
+		List<String> idList = standardizationLiaisonList.stream().map(LawsStandardizationLiaison::getId).collect(Collectors.toList());
+		lawsStandardizationLiaisonService.remove(
+				new LambdaQueryWrapper<LawsStandardizationLiaison>()
+						.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);
+		}
+	}
+
+
 	/**
 	 * 保存或更新会议信息
 	 *
@@ -115,6 +133,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 	 */
 	private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List<LawsStandardizationMeeting> standardizationMeetingList) {
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		// 删除旧数据
+		List<String> idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList());
+		lawsStandardizationMeetingService.remove(
+				new LambdaQueryWrapper<LawsStandardizationMeeting>()
+						.eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId())
+						.notIn(LawsStandardizationMeeting::getId, idList));
+
 		for (LawsStandardizationMeeting standardizationMeeting : standardizationMeetingList) {
 			standardizationMeeting.setStandardizationId(lawsStandardization.getId());
 
@@ -157,7 +182,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			}
 		}
 
-		// 保存或更新会议列表
+		// 保存或更新参会记录
 		lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList);
 	}
 
@@ -223,6 +248,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 	 * @param standardizationPaymentList 支付信息列表
 	 */
 	private void saveOrUpdatePayment(LawsStandardization lawsStandardization, List<LawsStandardizationPayment> standardizationPaymentList) {
+		// 删除旧数据
+		List<String> idList = standardizationPaymentList.stream().map(LawsStandardizationPayment::getId).collect(Collectors.toList());
+		lawsStandardizationPaymentService.remove(
+				new LambdaQueryWrapper<LawsStandardizationPayment>()
+						.eq(LawsStandardizationPayment::getStandardizationId, lawsStandardization.getId())
+						.notIn(LawsStandardizationPayment::getId, idList));
+
 		for (LawsStandardizationPayment lawsStandardizationPayment : standardizationPaymentList) {
 			lawsStandardizationPayment.setStandardizationId(lawsStandardization.getId());
 
@@ -251,7 +283,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			}
 		}
 
-		// 保存或更新批量支付信息
+		// 保存或更新支付信息
 		lawsStandardizationPaymentService.saveOrUpdateBatch(standardizationPaymentList);
 	}
 
@@ -263,6 +295,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 	 * @param standardizationGroupList 集团参与情况列表
 	 */
 	private void saveOrUpdateGroup(LawsStandardization lawsStandardization, List<LawsStandardizationGroup> standardizationGroupList) {
+		// 删除旧数据
+		List<String> idList = standardizationGroupList.stream().map(LawsStandardizationGroup::getId).collect(Collectors.toList());
+		lawsStandardizationGroupService.remove(
+				new LambdaQueryWrapper<LawsStandardizationGroup>()
+						.eq(LawsStandardizationGroup::getStandardizationId, lawsStandardization.getId())
+						.notIn(LawsStandardizationGroup::getId, idList));
+
 		for (LawsStandardizationGroup lawsStandardizationGroup : standardizationGroupList) {
 			lawsStandardizationGroup.setStandardizationId(lawsStandardization.getId());
 
@@ -289,7 +328,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			}
 		}
 
-		// 保存或更新标准化组列表
+		// 保存或更新集团参与情况
 		lawsStandardizationGroupService.saveOrUpdateBatch(standardizationGroupList);
 	}