From b0ab12e35368a6b668d28ef6cfec26883867850c Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Sun, 16 Apr 2023 22:21:37 +0800
Subject: [PATCH 1/2] update

---
 .../jero/modules/project/enums/ComplianceFlowStatusEnum.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 7d19c4250..129363940 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
@@ -17,7 +17,8 @@ public enum ComplianceFlowStatusEnum {
     CONFORMITY("符合","Compliance","Compliance"),
     INCONFORMITY("不符合","Non-Compliance","Non-Compliance"),
     TO_TRACK("待追踪","To be tracked","To be tracked"),
-    UNINVOLVED("不涉及","NA","NA")
+    UNINVOLVED("不涉及","NA","NA"),
+    TERMINATION_OF_TASK("任务终止","Termination of task","Termination of task"),
     ;
 
 

From 62d5508017a814d53b3d3f6791a4928774303963 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Sun, 16 Apr 2023 22:29:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8C=E5=9B=9E=E6=98=BE=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=20=E6=B8=85=E5=8D=95=E6=A0=A1=E6=A0=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todoCenter/service/impl/ProcessInfoEOServiceImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 469f80723..5e0139bb8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -758,6 +758,14 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 					}
 				}
+				// 如果是清单确认流程，将任务节点设置为  清单校核：Checklist verification
+				if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.QDQR.getValue())){
+					String taskDefinitionKeyName = "清单校核";
+					if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+						taskDefinitionKeyName = "Checklist verification";
+					}
+					data.setTaskDefinitionKeyName(taskDefinitionKeyName);
+				}
 			});
 		}
 	}