From b3bc2cf59093c70a665370baabfe5f5b864bd11e Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 20 Mar 2023 14:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-studio?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 34 ++++++++++++++-----
 .../service/IProcessHistoryEOService.java     |  2 ++
 .../impl/ProcessHistoryEOServiceImpl.java     | 10 ++++++
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index bd8164590..82e60c2e5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -5731,7 +5731,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 			super.update(projectLawsInventoryEO, updateWrapper);
 
-			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+			QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
+			processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,idList);
+			List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
+			List<String> actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> {
+				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(","));
+
+			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
 			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
 			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
 
@@ -5769,13 +5782,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				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);
-			});*/
+//			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);
@@ -5809,7 +5822,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//删除当前项目状态表
 			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
 			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);
+			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
 
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds",projectLawsInventoryIds);
@@ -5820,6 +5833,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//清除流程中心对应的数据
 			params.put("ids",ids);
 			this.processInfoEOService.change(params);
+			
+			// 删除流程历史数据
+			this.processHistoryEOService.deleteBiActiProcInstIdList(actiProcInstIdList);
 		}
 		return Result.OK("变更成功！");
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java
index 0c66976ce..347b0e17f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java
@@ -68,4 +68,6 @@ public interface IProcessHistoryEOService extends IService<ProcessHistoryEO> {
 	 * @return
 	 */
     Result<?> processCall(JSONObject jsonObject);
+
+	void deleteBiActiProcInstIdList(List<String> actiProcInstIdList);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
index 900ed9ee9..1ffbcbec0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
@@ -182,4 +182,14 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 		}
 		return new Result<>().success("调用成功！");
 	}
+
+	@Override
+	public void deleteBiActiProcInstIdList(List<String> actiProcInstIdList) {
+		if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
+			QueryWrapper<ProcessHistoryEO> removeWrap = new QueryWrapper<>();
+			removeWrap.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
+			this.remove(removeWrap);
+
+		}
+	}
 }