From 8b27242ff4ea7b5a3afd504facd8dbcbf6599558 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 16:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20-bug=2055544?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 910f78f95..0736144aa 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
@@ -1060,7 +1060,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						}
 					//如果是拒绝
 					}else if(StringUtils.equals(inventoryAffirmStatus,InventoryAffirmStatusEnum.REJECTED.getValue())){
-						if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
+						if((StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())&& StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),OperatorResultEnum.REJECTED.getValue()))
+								&& (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())&& StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(),OperatorResultEnum.REJECTED.getValue()))){
+							if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REJECTED.getName());
+							}else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REJECTED.getValue());
+							}
+						}else if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
 								&& StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),OperatorResultEnum.REJECTED.getValue())){
 							//如果认证工程师提交状态不为空，并且认证工程师提交状态为拒绝
 							if(StringUtils.equals(cut, CutEnum.CN.getValue())){