合并分支 'dev_2nd_LCYH' 到 'master'

Dev 2nd lcyh

查看合并请求 laws-nio/laws-weilai!307

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"),
     ;
 
 

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);
+				}
 			});
 		}
 	}