ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准化活动): 79936

Browse Source
This commit is contained in:
yjz
2024-01-16 10:56:42 +08:00
parent 84c394571a
commit 2c2770ce64
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+31 -27
View File
@@ -114,21 +114,23 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
.eq(LawsStandardizationLiaison::getStandardizationId, lawsStandardization.getId()));
return;
}
// 删除旧数据
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);
}
// 保存或更新联络人联系方式
lawsStandardizationLiaisonService.saveOrUpdateBatch(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));
}
@@ -147,12 +149,6 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
return;
}
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());
@@ -185,6 +181,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
// 保存或更新参会记录
lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList);
// 删除旧数据
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));
}
private void toDataCentre(LawsStandardization lawsStandardization, LoginUser loginUser, LawsStandardizationMeeting standardizationMeeting, List<String> meetingDataList) {
@@ -273,17 +276,10 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
.eq(LawsStandardizationPayment::getStandardizationId, lawsStandardization.getId()));
return;
}
// 删除旧数据
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());
// 如果支付信息ID为空，则生成一个SnowflakeID
if (StringUtils.isBlank(lawsStandardizationPayment.getId())){
lawsStandardizationPayment.setId(String.valueOf(SnowflakeUtils.snowflake()));
}
@@ -310,6 +306,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
// 保存或更新支付信息
lawsStandardizationPaymentService.saveOrUpdateBatch(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));
}
@@ -326,12 +329,6 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
.eq(LawsStandardizationGroup::getStandardizationId, lawsStandardization.getId()));
return;
}
// 删除旧数据
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());
@@ -361,6 +358,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
// 保存或更新集团参与情况
lawsStandardizationGroupService.saveOrUpdateBatch(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));
}