车型库法规清单和平台件法规清单删除-删除同步删除流程数据

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java

@@ -690,6 +690,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 //			}
 //		}
 
+		//引用流程重置的逻辑
+		String operateType= "lawsInventoryAllResetFlow";
+		resetFlow(id,projectLibraryId,operateType);
+
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String username = sysUser.getUsername();
@@ -742,6 +746,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 //			}
 //		}
 
+		//引用流程重置的逻辑
+		String operateType= "lawsInventoryAllResetFlow";
+		resetFlow(StringUtils.join(ids,","),projectLibraryId,operateType);
+
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String username = sysUser.getUsername();
@@ -4832,6 +4840,11 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String ids = parmas.getString("ids");
 		String projectLibraryId = parmas.getString("projectLibraryId");
 		String operateType = parmas.getString("operateType");
+		resetFlow(ids, projectLibraryId, operateType);
+		return Result.OK("变更成功！");
+	}
+
+	private void resetFlow(String ids, String projectLibraryId, String operateType) {
 		if (StringUtils.isNotEmpty(ids)) {
 
 			List<String> piFlowTypeList = new ArrayList<>();
@@ -4862,7 +4875,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
 
 			// 区分重置设计、验证、全部流程
-			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
+			if(StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
@@ -4889,85 +4902,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
 
-			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
-			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
-			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
-
-			//删除流程历史
-			if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){
-				List<String> actiProcInstIdList = new ArrayList<>();
-				List<String> verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList());
-				List<String> prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList());
-				List<String> designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList());
-
-				actiProcInstIdList.addAll(verifyPIdList);
-				actiProcInstIdList.addAll(prehomoPIdList);
-				actiProcInstIdList.addAll(designPIdList);
-
-				actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());;
-				if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
-					QueryWrapper<ProcessHistoryEO> processHistoryDeleteWrapper = new QueryWrapper<>();
-					processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
-					processHistoryEOService.remove(processHistoryDeleteWrapper);
-				}
-				pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
-			}
-
-			QueryWrapper<ProjectLawsInventoryEO> queryLawsInventoryWrapper = new QueryWrapper<>();
-			queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
-
-			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
-			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
-			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
-				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-				projectTaskInventoryEO.setId(projectTaskInventoryId);
-				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
-				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
-				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
-				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});
-//			idList.forEach(id -> {
-//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-//				projectTaskInventoryEO.setId(projectTaskInventoryId);
-//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
-//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-//			});
-			//项目任务清单数据初始化。
-			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
-			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
-
-			//初始化项目状态评估
-			projectTaskInventoryEOList.forEach(taskInventory -> {
-				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
-			});
-
-			//删除该法规的任务明细数据
-			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
-			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper);
-
-			//查询反馈意见表 获取id  用于删除 反馈意见历史数据。
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> queryTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper);
-			List<String> feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
-			if(CollectionUtils.isNotEmpty(feedbackIdList)){
-				QueryWrapper<FeedbackHistory> deleteFeedbackHistoryWrapper = new QueryWrapper<>();
-				deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList);
-				feedbackHistoryService.remove(deleteFeedbackHistoryWrapper);
-			}
-
-			//删除反馈意见数据
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper);
-
-			//删除当前项目状态表
-			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
-			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
 
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
@@ -5016,7 +4950,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg);
 			}
 		}
-		return Result.OK("变更成功！");
 	}
 
 	private void importDatas(List<ProjectLawsInventoryEO> dataList,

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -639,6 +639,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				throw new JeroBootException("The user has no deletion permission");
 			}
 		}
+		//引用流程重置的逻辑
+		String operateType = "lawsInventoryAllResetFlow";
+		resetFolw(id, projectLibraryId, operateType);
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -691,6 +694,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				throw new JeroBootException("The user has no deletion permission");
 			}
 		}
+		//引用流程重置的逻辑
+		String operateType = "lawsInventoryAllResetFlow";
+		resetFolw(StringUtils.join(ids,","), projectLibraryId, operateType);
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -4781,6 +4787,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String ids = parmas.getString("ids");
 		String projectLibraryId = parmas.getString("projectLibraryId");
 		String operateType = parmas.getString("operateType");
+		resetFolw(ids, projectLibraryId, operateType);
+		return Result.OK("变更成功！");
+	}
+
+	private void resetFolw(String ids, String projectLibraryId, String operateType) {
 		if (StringUtils.isNotEmpty(ids)) {
 
 			List<String> piFlowTypeList = new ArrayList<>();
@@ -4804,14 +4815,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
 
 			// 区分重置设计、验证、全部流程
-			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
+			if(StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
@@ -4838,86 +4846,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
 
-			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
-			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
-			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
-
-			//删除流程历史
-			if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){
-				List<String> actiProcInstIdList = new ArrayList<>();
-				List<String> verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList());
-				List<String> prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList());
-				List<String> designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList());
-
-				actiProcInstIdList.addAll(verifyPIdList);
-				actiProcInstIdList.addAll(prehomoPIdList);
-				actiProcInstIdList.addAll(designPIdList);
-
-				actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());;
-				if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
-					QueryWrapper<ProcessHistoryEO> processHistoryDeleteWrapper = new QueryWrapper<>();
-					processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
-					processHistoryEOService.remove(processHistoryDeleteWrapper);
-				}
-				pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
-			}
-
-			QueryWrapper<ProjectLawsInventoryEO> queryLawsInventoryWrapper = new QueryWrapper<>();
-			queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
-
-			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
-			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
-			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
-				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-				projectTaskInventoryEO.setId(projectTaskInventoryId);
-				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
-				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
-				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
-				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});
-//			idList.forEach(id -> {
-//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-//				projectTaskInventoryEO.setId(projectTaskInventoryId);
-//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
-//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-//			});
-			//项目任务清单数据初始化。
-			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
-			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
-
-			//初始化项目状态评估
-			projectTaskInventoryEOList.forEach(taskInventory -> {
-				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
-			});
-
-			//删除该法规的任务明细数据
-			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
-			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper);
-
-			//查询反馈意见表 获取id  用于删除 反馈意见历史数据。
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> queryTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper);
-			List<String> feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
-			if(CollectionUtils.isNotEmpty(feedbackIdList)){
-				QueryWrapper<FeedbackHistory> deleteFeedbackHistoryWrapper = new QueryWrapper<>();
-				deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList);
-				feedbackHistoryService.remove(deleteFeedbackHistoryWrapper);
-			}
-
-			//删除反馈意见数据
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper);
-
-			//删除当前项目状态表
-			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
-			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
-
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
 			params.put("pIds", pIds);
@@ -4969,7 +4897,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(",")));
 		lawsInventoryPlatformEOService.remove(wrapper);
-		return Result.OK("变更成功！");
 	}
 
 	private void importDatas(List<ProjectLawsInventoryEO> dataList,