From 8dd068ac6eb6950ba5b3b94efbc4090f6532102d Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Sat, 15 Apr 2023 16:53:58 +0800
Subject: [PATCH] =?UTF-8?q?UAT=E6=B8=85=E5=8D=95=EF=BC=8C34=E3=80=8168?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/project/enums/ComplianceFlowStatusEnum.java  | 1 +
 .../impl/ProjectCertificationInventoryEOServiceImpl.java      | 4 ++--
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
index 7263beb7b..d4951c71b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
@@ -9,6 +9,7 @@ import org.apache.commons.lang.StringUtils;
 public enum ComplianceFlowStatusEnum {
     LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
     LIST_TO_BE_CHECKED("清单待校核","List to be checked","List to be checked"),
+    REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
     DUTY_PERSON_REJECTED("责任人拒绝","Rejected by the 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"),
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 59bffd7d0..69869e9d2 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
@@ -4625,9 +4625,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information");
 				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){
 					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息");
-					contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
+					contentCnSb.append("，拒绝原因:\"").append(pci.getReasonForReturn()).append("\"");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
-					contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
+					contentEnSb.append(",Reject for Reason:\"").append(pci.getReasonForReturn()).append("\"");
 				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){
 					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至")
 							.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
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 fe0f63337..22bee1dfe 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
@@ -11516,11 +11516,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
 			if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 			   		|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){
-				projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue());
 			}
 			if(StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 					|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){
-				projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue());
 			}
 		}