fix(资料中心): 81180

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);
             }
         }
     }

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";
 }

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<LawsStandardiz
 	 @PostMapping(value = "/add")
 	 @RequiresPermissions("standardActivity:add")
 	 public Result<T> 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<LawsStandardiz
 	 @RequiresPermissions("standardActivity:edit")
 	 public Result<T> edit(@Validated @RequestBody StandardizationVO standardizationVO) {
 		 log.info("");
-		 lawsStandardizationService.addOrUpdateStandardization(standardizationVO);
+		 lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_1);
 		 return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
 	 }
 

laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java

@@ -20,7 +20,7 @@ public interface ILawsStandardizationService extends IService<LawsStandardizatio
 	 * @param standardizationVO
 	 * @return
 	 */
-    void addOrUpdateStandardization(StandardizationVO standardizationVO);
+    void addOrUpdateStandardization(StandardizationVO standardizationVO, String source);
 
 	/**
 	 * 标准化活动-根据id查询

laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java

@@ -86,7 +86,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 	 * @return
 	 */
 	@Override
-    public void addOrUpdateStandardization(StandardizationVO standardizationVO) {
+    public void addOrUpdateStandardization(StandardizationVO standardizationVO, String source) {
 		LawsStandardization lawsStandardization = standardizationVO.getLawsStandardization();
 		List<LawsStandardizationLiaison> standardizationLiaisonList = standardizationVO.getStandardizationLiaisonList();
 		List<LawsStandardizationGroup> standardizationGroupList = standardizationVO.getStandardizationGroupList();
@@ -109,7 +109,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		saveOrUpdatePayment(lawsStandardization, standardizationPaymentList);
 
 		// 参会记录
-		saveOrUpdateMeeting(lawsStandardization, standardizationMeetingList);
+		saveOrUpdateMeeting(lawsStandardization, standardizationMeetingList, source);
 	}
 
 	private void saveOrUpdateLiaison(LawsStandardization lawsStandardization, List<LawsStandardizationLiaison> standardizationLiaisonList) {
@@ -143,10 +143,11 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 	/**
 	 * 保存或更新会议信息
 	 *
-	 * @param lawsStandardization 标准化活动
+	 * @param lawsStandardization        标准化活动
 	 * @param standardizationMeetingList 标准化-参会记录
+	 * @param source
 	 */
-	private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List<LawsStandardizationMeeting> standardizationMeetingList) {
+	private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List<LawsStandardizationMeeting> standardizationMeetingList, String source) {
 		if (standardizationMeetingList.isEmpty()){
 			// 删除全部数据
 			lawsStandardizationMeetingService.remove(
@@ -171,10 +172,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 						.in(OSSFile::getId, meetingDataList)
 						.set(OSSFile::getConnectId, standardizationMeeting.getId()));
 
-				// 删除旧文件
+				// 会后管理流程结束调用则不删除
-				ossFileService.remove(new LambdaQueryWrapper<OSSFile>()
+				if (!LawsStandardizationCommon.SOURCE_2.equals(source)){
-						.eq(OSSFile::getConnectId, standardizationMeeting.getId())
+					// 删除旧文件
-						.notIn(OSSFile::getId, meetingDataList));
+					ossFileService.remove(new LambdaQueryWrapper<OSSFile>()
+							.eq(OSSFile::getConnectId, standardizationMeeting.getId())
+							.notIn(OSSFile::getId, meetingDataList));
+				}
 
 				// 同步文件到资料中心
 				toDataCentre(lawsStandardization, loginUser, standardizationMeeting, meetingDataList);
@@ -188,12 +192,15 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		// 保存或更新参会记录
 		lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList);
 
-		// 删除旧数据
+		// 会后管理流程结束调用则不删除
-		List<String> idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList());
+		if (!LawsStandardizationCommon.SOURCE_2.equals(source)){
-		lawsStandardizationMeetingService.remove(
+			// 删除旧数据
-				new LambdaQueryWrapper<LawsStandardizationMeeting>()
+			List<String> idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList());
-						.eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId())
+			lawsStandardizationMeetingService.remove(
-						.notIn(LawsStandardizationMeeting::getId, idList));
+					new LambdaQueryWrapper<LawsStandardizationMeeting>()
+							.eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId())
+							.notIn(LawsStandardizationMeeting::getId, idList));
+		}
 	}
 
 	private void toDataCentre(LawsStandardization lawsStandardization, LoginUser loginUser, LawsStandardizationMeeting standardizationMeeting, List<String> meetingDataList) {