法规清单-流程重置，区分流程类型重置。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java

@@ -90,6 +90,9 @@ public enum OperatorTypeEnum {
     LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE("法规清单-验证-引用交付物","lawsInventoryVerifyCiteDeliverable"),
     LAWS_INVENTORY_STUDIO_COPY("法规清单-studio复制","lawsInventoryStudioCopy"),
     LAWS_INVENTORY_REGULATION_OWNER_COPY("法规清单-法规工程师复制","lawsInventoryRegulationOwnerCopy"),
+    LAWS_INVENTORY_ALL_RESET_FLOW("法规清单-设计和验证-重置流程","lawsInventoryAllResetFlow"),
+    LAWS_INVENTORY_DESIGN_RESET_FLOW("法规清单-设计-重置流程","lawsInventoryDesignResetFlow"),
+    LAWS_INVENTORY_VERIFY_RESET_FLOW("法规清单-验证-重置流程","lawsInventoryVerifyResetFlow"),
 
     /**
      * 待办中心-将法规工程师的法规清单确认待办任务转为已办

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

@@ -6704,8 +6704,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	public Result<?> change(JSONObject parmas) {
 		String ids = parmas.getString("ids");
 		String projectLibraryId = parmas.getString("projectLibraryId");
+		String operateType = parmas.getString("operateType");
 		if (StringUtils.isNotEmpty(ids)) {
 
+			List<String> piFlowTypeList = new ArrayList<>();
+
 			QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
 			queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
 			queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
@@ -6730,20 +6733,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
-			updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+
-			updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.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());
+				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){
+				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){
+				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+			}
+
 			super.update(projectLawsInventoryEO, updateWrapper);
 
 			QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
 			processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, idList);
+			processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType,piFlowTypeList);
 			List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
-			List<String> actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> {
+			List<String> actiProcInstIdList = processInfoEOList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
-				boolean flag = false;
-				if (StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) {
-					flag = true;
-				}
-				return flag;
-			}).map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
 
 			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
 
@@ -6835,6 +6846,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			//清除流程中心对应的数据
 			params.put("ids", ids);
+			params.put("operateType", operateType);
 			this.processInfoEOService.change(params);
 
 			// 删除流程历史数据

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java

@@ -359,6 +359,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 	public void change(Map<String, Object> params) {
 		//需要清除数据的法规清单ids
 		String ids = (String)params.get("ids");
+		String operateType = (String)params.get("operateType");
 		List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){
 			//清除清单确认相关数据
@@ -404,10 +405,20 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 			 * 4.清除验证符合性流程相关数据
 			 */
 			List<String> flowTypeList = new ArrayList<>();
-			flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
+
-			flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+			// 区分重置设计、验证、全部流程
-			// flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
+			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
-			flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+				flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+				flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){
+				flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){
+				flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+			}
+//			flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
+//			flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+//			// flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
+//			flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
 
 			//根据法规清单id，查询待办中心数据
 			QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();