From 62a10bf005c56f322d72c2dd1c900b056d267eb5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 12 Apr 2023 14:13:46 +0800
Subject: [PATCH] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=8F=E5=8F=B734=EF=BC=8C=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E9=80=80=E5=9B=9E=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectCertificationInventoryEO.java  |  3 +++
 ...ojectCertificationInventoryEOServiceImpl.java | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
index 25c9133ff..cb656f9c6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
@@ -219,4 +219,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
 //    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
     @TableField(exist = false)
     private String endTimeStr;
+
+    @TableField(exist = false)
+    private String reasonForReturn;
 }
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 27044ddbf..40bdff7db 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
@@ -1478,6 +1478,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("至少选择一条数据进行操作！");
 		}
+		String reasonForReturn = json.getString("reasonForReturn");
+
 		List<String> idList = Arrays.asList(ids.split(","));
 
 		List<String> flowStatusList = new ArrayList<>();
@@ -1493,6 +1495,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+			projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
 		}
 
 		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue());
@@ -1846,6 +1849,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("至少选择一条数据进行操作！");
 		}
+		String reasonForReturn = json.getString("reasonForReturn");
+
 		List<String> idList = Arrays.asList(ids.split(","));
 
 		List<String> flowStatusList = new ArrayList<>();
@@ -1870,6 +1875,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+			projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
 		}
 
 		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue());
@@ -1973,6 +1979,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("至少选择一条数据进行操作！");
 		}
+		String reasonForReturn = json.getString("reasonForReturn");
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		List<String> idList = Arrays.asList(ids.split(","));
@@ -2026,6 +2033,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
 		}
 
+		for (ProjectCertificationInventoryEO pciEo : projectCertificationInventoryEOList) {
+			pciEo.setReasonForReturn(reasonForReturn);
+		}
 		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue());
 
 		Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
@@ -4456,7 +4466,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list");
 				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){
 					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回");
+					contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned");
+					contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
 				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){
 					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit");
@@ -4478,12 +4490,16 @@ 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("\"");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
+					contentEnSb.append(",Reason for return:\"").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("\"");
+					contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ")
 							.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
+					contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
 				} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){
 					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程");
 					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process");