diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index cacf10de..9ba2176c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java @@ -26,6 +26,7 @@ import com.jero.modules.activiti.process.meetingmanage.vo.MeetingManageFlowVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.standardization.common.LawsStandardizationCommon; import com.jero.modules.laws.standardization.entity.LawsStandardization; import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; import com.jero.modules.laws.standardization.service.ILawsStandardizationService; @@ -319,7 +320,7 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { lawsStandardizationMeeting.setName(processMeetingManage.getName()); lawsStandardizationMeeting.setPersonnelId(meetingManagePersonnel.getPersonnelId()); lawsStandardizationMeeting.setMeetingData(meetingManagePersonnel.getFileId()); - lawsStandardizationMeeting.setSource("2"); + lawsStandardizationMeeting.setSource(LawsStandardizationCommon.SOURCE_2); SysUser sysUser = sysUserService.getById(meetingManagePersonnel.getPersonnelId()); lawsStandardizationMeeting.setCreateBy(sysUser.getUsername()); lawsStandardizationMeetingList.add(lawsStandardizationMeeting); @@ -331,7 +332,7 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { standardizationVO.setStandardizationPayments(Collections.emptyList()); standardizationVO.setStandardizationGroupList(Collections.emptyList()); standardizationVO.setStandardizationLiaisonList(Collections.emptyList()); - lawsStandardizationService.addOrUpdateStandardization(standardizationVO); + lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_2); } } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java index 8c497811..e1a478d0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java @@ -8,7 +8,7 @@ package com.jero.modules.laws.standardization.common; * @Version: 1.0 **/ public class LawsStandardizationCommon { - private void LawsStandardization(){ + private LawsStandardizationCommon(){ } @@ -45,4 +45,13 @@ public class LawsStandardizationCommon { * 层级 0,1,2,3 */ public static final Long LEVEL_3 = 3L; + + /** + * 来源 1:新增 2:会后管理流程 + */ + public static final String SOURCE_1 = "1"; + /** + * 来源 1:新增 2:会后管理流程 + */ + public static final String SOURCE_2 = "2"; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java index 409fff0b..604e6586 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java @@ -7,6 +7,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.standardization.common.LawsStandardizationCommon; import com.jero.modules.laws.standardization.entity.*; import com.jero.modules.laws.standardization.service.ILawsStandardizationService; import com.jero.modules.laws.standardization.vo.StandardizationVO; @@ -91,7 +92,7 @@ public class LawsStandardizationController extends JeroController add(@Validated @RequestBody StandardizationVO standardizationVO) { - lawsStandardizationService.addOrUpdateStandardization(standardizationVO); + lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_1); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -107,7 +108,7 @@ public class LawsStandardizationController extends JeroController edit(@Validated @RequestBody StandardizationVO standardizationVO) { log.info(""); - lawsStandardizationService.addOrUpdateStandardization(standardizationVO); + lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_1); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java index a9b0bb95..d5374b50 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java @@ -20,7 +20,7 @@ public interface ILawsStandardizationService extends IService standardizationLiaisonList = standardizationVO.getStandardizationLiaisonList(); List standardizationGroupList = standardizationVO.getStandardizationGroupList(); @@ -109,7 +109,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationLiaisonList) { @@ -143,10 +143,11 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationMeetingList) { + private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List standardizationMeetingList, String source) { if (standardizationMeetingList.isEmpty()){ // 删除全部数据 lawsStandardizationMeetingService.remove( @@ -171,10 +172,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl() - .eq(OSSFile::getConnectId, standardizationMeeting.getId()) - .notIn(OSSFile::getId, meetingDataList)); + // 会后管理流程结束调用则不删除 + if (!LawsStandardizationCommon.SOURCE_2.equals(source)){ + // 删除旧文件 + ossFileService.remove(new LambdaQueryWrapper() + .eq(OSSFile::getConnectId, standardizationMeeting.getId()) + .notIn(OSSFile::getId, meetingDataList)); + } // 同步文件到资料中心 toDataCentre(lawsStandardization, loginUser, standardizationMeeting, meetingDataList); @@ -188,12 +192,15 @@ 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)); + // 会后管理流程结束调用则不删除 + if (!LawsStandardizationCommon.SOURCE_2.equals(source)){ + // 删除旧数据 + List 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) {