From b48d210bc7d78a355544227c51f066b4edf2b68b Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 25 Jul 2022 18:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BB=A3=E7=A0=81=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 372956882..bbe1040b2 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
@@ -4029,13 +4029,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String projectLawsInventoryIds = ids;
 			String pIds = "";
 
-			QueryWrapper<ProjectLawsInventoryEO> updateLawsInventoryWrapper = new QueryWrapper<>();
-			updateLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
 			ProjectLawsInventoryEO projectLawsInventoryEO = new ProjectLawsInventoryEO();
 			projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 			projectLawsInventoryEO.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 			//清单、任务确认初始化。
-			this.baseMapper.update(projectLawsInventoryEO,updateLawsInventoryWrapper);
+			LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.in(ProjectLawsInventoryEO::getId,idList);
+			updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
+			super.update(projectLawsInventoryEO, updateWrapper);
 
 			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
 			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
@@ -4061,8 +4063,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				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(updateLawsInventoryWrapper);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
 			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
 				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
 				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");