From 56ba63e6f599a8eed54e6594ab7a8e9efdbe0a20 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 18 Oct 2023 16:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96-=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=92=8C=E5=B7=A5=E7=A8=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BA=BA=E5=B8=A6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index faf11781f..1e7e3caef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -365,6 +365,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
 		wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEO.getProjectLibraryId());
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapperTemp);
+		//项目信息
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseService.getById(projectLawsInventoryEO.getProjectLibraryId());
 		//调取
 		String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId();
 		if (StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())) {
@@ -403,6 +405,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						projectLawsInventoryEOTemp.setCreateTime(new Date());
 						projectLawsInventoryEOTemp.setUpdateTime(new Date());
+						projectLawsInventoryEOTemp.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
+						projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
 						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 					}
 				} else {
@@ -414,7 +418,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						if (collect.size() != 0) {
 							for (ProjectLawsInventoryEO lawsInventoryEO : collect) {
 								//数据对比
-								ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO);
+								ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO,projectLibraryBase);
 								projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp);
 							}
 						} else {
@@ -429,6 +433,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 							projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 							projectLawsInventoryEOTemp.setCreateTime(new Date());
 							projectLawsInventoryEOTemp.setUpdateTime(new Date());
+							projectLawsInventoryEOTemp.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
+							projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
 							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 						}
 					}
@@ -3685,10 +3691,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	}
 
 
-	private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) {
+	private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO,
+											   DummyInventoryInfoEO dummyInventoryInfoEO,
+											   ProjectLibraryBase projectLibraryBase) {
 		//编号
 		if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) {
-			projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber());
+			projectLawsInventoryEO.setSerialNumber(dummyInventoryInfoEO.getSerialNumber());
 		}
 		//标题
 		if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) {
@@ -3788,6 +3796,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDuty())) {
 			projectLawsInventoryEO.setVerifyDuty(dummyInventoryInfoEO.getVerifyDuty());
 		}
+		//法规工程师
+		if(StringUtils.isBlank(projectLawsInventoryEO.getRegulationOwnerId())){
+			projectLawsInventoryEO.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
+		}
+		//工程接口人
+		if(StringUtils.isBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())){
+			projectLawsInventoryEO.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
+		}
 		return projectLawsInventoryEO;
 	}