From 51d32188aa199ab46457ea5b16eed0de27f8a7a9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 17:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/enums/FlowStateEnum.java  |  2 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
index 2425ed44d..10ba287e5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
@@ -14,7 +14,7 @@ public enum FlowStateEnum {
     LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
     LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
     REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
-    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"),
+    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"),
     TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
     RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
     RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
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 7275e56ff..316f33b3b 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
@@ -12222,7 +12222,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 				if (StringUtils.isNotEmpty(flowStatus)) {
 					String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
-					projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+					}else{
+						projectLawsInventoryEO.setVerifyFlowStatusName(designFlowStatusName);
+					}
 				}
 
 				//发起人.
@@ -12242,7 +12246,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String finalDutyId = dutyId;
 					String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())).
 							map(SysUser::getUsername).collect(Collectors.joining(","));
-					projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+					}else{
+						projectLawsInventoryEO.setVerifyDutyIdName(designDutyName);
+					}
 				} else {
 					projectLawsInventoryEO.setDesignDutyIdName("");
 				}
@@ -12256,8 +12264,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 				if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
 					String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate());
-					if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) {
-						projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+					if (StringUtils.isNotBlank(fileName)) {
+						if("design".equals(flowFlag)){
+							projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+						}else{
+							projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
+						}
 					}
 				}
 				//交付物类型
@@ -12270,7 +12282,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if (StringUtils.isNotBlank(deliverableType)) {
 					List<String> designDeliverableTypeList = Arrays.asList(deliverableType.split(","));
 					String name = getTreeName(cut, categoryList, designDeliverableTypeList);
-					projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+					}else{
+						projectLawsInventoryEO.setVerifyDeliverableTypeName(name);
+					}
+
 				}
 
 				//责任领域