From ae76a8983a56a93e3424bc34b41a26b324dd6381 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 29 Mar 2023 15:57:39 +0800
Subject: [PATCH] =?UTF-8?q?67329=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCertificationInventoryEOServiceImpl.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 9266877f8..f003acfa6 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
@@ -3854,6 +3854,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				// 没有引用的数据 检验项目集合，给到前端进行展示。
 				List<String> noCiteInspectionItem = new ArrayList<>();
 				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+					String deliveryResult = "";
 					for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) {
 						// 匹配数据  类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成
 						boolean flag = (
@@ -3863,13 +3864,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 								&& StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(),citeProjectCertificationInventoryEO.getSerialNumber())
 								&& StringUtils.equals(projectCertificationInventoryEO.getDeliverableType(),citeProjectCertificationInventoryEO.getDeliverableType())
 						);
+
 						if(flag){
-							projectCertificationInventoryEO.setDeliveryResult(citeProjectCertificationInventoryEO.getDeliveryResult());
+							deliveryResult = citeProjectCertificationInventoryEO.getDeliveryResult();
 							break;
-						}else {
-							noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem());
 						}
 					}
+					if(StringUtils.isNotBlank(deliveryResult)){
+						projectCertificationInventoryEO.setDeliveryResult(deliveryResult);
+					}else {
+						noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem());
+					}
 				}
 
 				this.updateBatchById(projectCertificationInventoryEOList);