From d8583c4d7d498675c83c3764053deb8f64440143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 7 Jul 2023 22:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ComplianceResultEnum.java | 2 +- .../enums/ComplianceFlowStatusEnum.java | 2 +- .../enums/DesignComplianceFlowNodeKeyEnum.java | 18 +++++++++--------- .../service/impl/ProcessInfoEOServiceImpl.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java index 04942f12b..eadef68f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java @@ -8,7 +8,7 @@ import com.jero.common.constant.enums.CutEnum; */ public enum ComplianceResultEnum { CONFORMITY("符合","Compliance","Compliance"), - INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), + INCONFORMITY("不符合","Non-compliance","Non-Compliance"), ; String name; 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 129363940..1eb7e76cf 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 @@ -15,7 +15,7 @@ public enum ComplianceFlowStatusEnum { RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), CONFORMITY("符合","Compliance","Compliance"), - INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), + INCONFORMITY("不符合","Non-compliance","Non-Compliance"), TO_TRACK("待追踪","To be tracked","To be tracked"), UNINVOLVED("不涉及","NA","NA"), TERMINATION_OF_TASK("任务终止","Termination of task","Termination of task"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java index 571f5e4fb..8d06fe50c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java @@ -7,17 +7,17 @@ import org.apache.commons.lang3.StringUtils; * 待办中心-设计符合性流程节点key枚举类 */ public enum DesignComplianceFlowNodeKeyEnum { - FQLC("发起流程","Task initiation","fqlc"), - ZRRQR("任务责任确认","Responsibility confirm","zrrqr"), // 责任人确认 - DEZRRQR("任务责任确认","Responsibility confirm","dezrrqr"),// 第二责任人确认 - ZRRTJJFW("符合性确认","Compliance confirm","zrrtjjfw"),// "责任人提交交付物" - DEZRRTJJFW("符合性确认","Compliance confirm","dezrrtjjfw"),// 第二责任人提交交付物 - FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核 + FQLC("发起流程","Task Initiation","fqlc"), + ZRRQR("任务责任确认","Responsibilty Confirmation","zrrqr"), // 责任人确认 + DEZRRQR("任务责任确认","Responsibilty Confirmation","dezrrqr"),// 第二责任人确认 + ZRRTJJFW("符合性确认","Compliance Confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("符合性确认","Compliance Confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("符合性审查","Compliance Review","fggcssh"), // 法规工程师审核 // 修改交付物流程 - BCTJ_ZRRBCTJFQ("补充提交","Supplementary submission","zrrbctjfq"), // 责任人补充提交发起 - BCTJ_ZRRBCTJXG("补充提交","Supplementary submission","zrrbctjxg"), // 责任人补充提交修改 - BCTJ_FGGCSBCSH("补充审查","Supplementary review","fggcsbcsh"), // 法规工程师补充审核 + BCTJ_ZRRBCTJFQ("补充提交","Supplementary Submission","zrrbctjfq"), // 责任人补充提交发起 + BCTJ_ZRRBCTJXG("补充提交","Supplementary Submission","zrrbctjxg"), // 责任人补充提交修改 + BCTJ_FGGCSBCSH("补充审查","Supplementary Review","fggcsbcsh"), // 法规工程师补充审核 ; String cnName; 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 d7a52229f..9403ec827 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 @@ -782,7 +782,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl