From 77f2f1e82b8d8ebe6ffe04a264ce695951168050 Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Thu, 23 Nov 2023 21:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=8D=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=88=E6=B3=95=E8=A7=84/=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E8=8B=A5=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=97=B6=E5=88=99=E7=BC=96=E5=8F=B7=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8D=E5=86=8D=E9=9A=8F=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 17 +++++++++++++-
 .../ProjectLawsInventoryEOServiceImpl.java    | 22 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index d88420ee8..d6e667f79 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1396,8 +1396,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			userIdList.addAll(datas.stream().map(ProjectCertificationInventoryEO::getSdt).collect(Collectors.toList()));
 			userIdList.addAll(datas.stream().map(ProjectCertificationInventoryEO::getDutyPerson).collect(Collectors.toList()));
 			List<SysUser> sysUserList = this.sysUserService.querySysUserListByIdList(userIdList);
-
+			List<String> standIdList = datas.stream().map(ProjectCertificationInventoryEO::getBussDocumentLibraryId).distinct().collect(Collectors.toList());
+			List<BussDocumentLibraryEO> docList = iBussDocumentLibraryEOService.listByIds(standIdList);
 			for (ProjectCertificationInventoryEO data : datas) {
+				//处理编号，认证清单中若状态为符合时则编号标题不再随文档库变化
+				if (!data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+						&& StringUtils.isNotBlank(data.getBussDocumentLibraryId())) {
+					BussDocumentLibraryEO docObj = null;
+					for (BussDocumentLibraryEO obj : docList) {
+						if (obj.getId().equals(data.getBussDocumentLibraryId())) {
+							docObj = obj;
+							break;
+						}
+					}
+					if(null != docObj){
+						data.setSerialNumber(docObj.getSerialNumber());
+					}
+				}
 				if(StringUtils.isNotEmpty(data.getSdt())){
 					String sdtName = sysUserList.stream().filter(sysUser -> {
 						boolean flag = false;
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 01438f915..d5d2ca6fe 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
@@ -1556,7 +1556,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				bussDocumentLibraryEOS = iBussDocumentLibraryEOService.list(lambdaQueryWrapper);
 			}
 
+			List<String> standIdList = list.stream().map(ProjectLawsInventoryEO::getStandId).distinct().collect(Collectors.toList());
+			List<BussDocumentLibraryEO> docList = bussDocumentLibraryEOService.listByIds(standIdList);
 			for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
+				//处理编号，法规清单中若状态为符合时则编号标题不再随文档库变化
+				if ((!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())
+						|| !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()))
+						&& StringUtils.isNotBlank(projectLawsInventoryEO.getStandId())) {
+					BussDocumentLibraryEO docObj = null;
+					for (BussDocumentLibraryEO obj : docList) {
+						if (obj.getId().equals(projectLawsInventoryEO.getStandId())) {
+							docObj = obj;
+							break;
+						}
+					}
+					if(null != docObj){
+						projectLawsInventoryEO.setSerialNumber(docObj.getSerialNumber());
+						if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+							projectLawsInventoryEO.setTitle(docObj.getTitle());
+						} else {
+							projectLawsInventoryEO.setTitle(docObj.getTitleEn());
+						}
+					}
+				}
 				//处理交付物类型
 				String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
 				String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();