From 58e8c32bf3195de96db6ec5904c2f1dc0777d3ab Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Sat, 28 Oct 2023 12:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql               | 2 +-
 .../modules/docTranslation/enums/ReleaseConditionEnum.java  | 2 +-
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java | 2 +-
 .../problemKnowledgeBase/enums/ReleaseStatusEnum.java       | 2 +-
 .../project/enums/CertificationInventoryFlowStatusEnum.java | 4 ++--
 .../java/com/jero/modules/project/enums/FlowStateEnum.java  | 2 +-
 .../com/jero/modules/project/enums/ProjectRoleEnum.java     | 6 +++---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 2 +-
 .../project/service/impl/ProjectStatusBoardServiceImpl.java | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index d6822f8ff..dd399d067 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -566,7 +566,7 @@ INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_v
 -- 文档翻译-发布情况数据字典  2022-7-25 已同步生产环境
 INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550314527293128705', '文档翻译-发布情况', 'release_condition', '文档翻译-发布情况', 0, 'admin', '2022-07-22 10:59:21', 'admin', '2022-07-22 11:01:07', NULL, NULL, 1, 0, '1', 2);
 
-INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314666682433537', '1550314527293128705', '已发布', 'published', '已发布', 1, 1, 'admin', '2022-07-22 10:59:55', NULL, NULL, 1, NULL, NULL, '0', 'Have published');
+INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314666682433537', '1550314527293128705', '已发布', 'Have released', '已发布', 1, 1, 'admin', '2022-07-22 10:59:55', NULL, NULL, 1, NULL, NULL, '0', 'Have published');
 INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314731320852482', '1550314527293128705', '草稿', 'draft', '草稿', 2, 1, 'admin', '2022-07-22 11:00:10', NULL, NULL, 1, NULL, NULL, '0', 'Draft');
 
 -- 文档翻译-翻译结果数据字典   2022-7-25 已同步生产环境
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java
index 1504bb042..f8645d384 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
  */
 public enum ReleaseConditionEnum {
 
-    PUBLISHED("已发布","published","Published"),
+    PUBLISHED("已发布","published","Released"),
     DRAFT("草稿","draft","Draft"),
     ;
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 1ed0ae53b..5e609c9bc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -3260,7 +3260,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					"lock," +
 					"Reject,"+
 					"Not started," +
-					"Ongoing," +
+					"In progress," +
 					"Test Passed," +
 					"Test Failed," +
 					"Component report not submitted," +
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java
index bf1ecd1f2..72ca4eed7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
  */
 public enum ReleaseStatusEnum {
 
-    HAVE_RELEASED("已发布","Have released","Have released"),
+    HAVE_RELEASED("已发布","Released","Have released"),
     DRAFT("草稿","Draft","Draft"),
     ;
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
index ec640d4ef..331276984 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
@@ -26,9 +26,9 @@ public enum CertificationInventoryFlowStatusEnum {
 
     LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
     LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
-    CERTIFICATION_RETURNED("认证退回","Certification returned","Certification returned"),
+    CERTIFICATION_RETURNED("认证退回","Homo rejects","Certification returned"),
     TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
-    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"),
+    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Rejected by the responsible person","Refusal of responsible person"),
     ACCEPTED_OF_RESPONSIBLE_PERSON("责任人接受","Accepted of responsible person","Accepted of responsible person"),
     RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
     //ENGINEER_RETURN("工程师退回","Engineer return","Engineer return"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
index a35b3aa1b..8d32a6e80 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
@@ -14,7 +14,7 @@ public enum FlowStateEnum {
     LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
     LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
     REGULATORY_ENGINEER_RETURNS("法规退回","Regulatory engineer returns","Regulatory engineer returns"),
-    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"),
+    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","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"),
     RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
index 24bfda6e3..e126952f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
@@ -8,9 +8,9 @@ import com.jero.modules.system.util.StringUtils;
  */
 public enum ProjectRoleEnum {
     STUDIO_ENGINEER("studio工程师","0","R&H Studio"),
-    REGULATI_ENGINEER("法规工程师","1","Regulatory Engineer"),
-    HOMOLOGATION_ENGINEER("认证工程师","2","Certification Engineer"),
-    ENGINEERING_INTERFACE_PERSON("工程接口人","3","Engineering interface person"),
+    REGULATI_ENGINEER("法规工程师","1","Regulation Engineer"),
+    HOMOLOGATION_ENGINEER("认证工程师","2","Homo Engineer"),
+    ENGINEERING_INTERFACE_PERSON("工程接口人","3","Eng. Interface"),
     REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4","Regulatory and certification engineer"),
     DESIGNINITIATOR("设计符合性确认-发起人","5",""),
     DESIGNDUTY("设计符合性确认-责任人","6",""),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 5cc79a024..80eb89f2f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3840,7 +3840,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					"lock," +
 					"Reject,"+
 					"Not started," +
-					"Ongoing," +
+					"In progress," +
 					"Test Passed," +
 					"Test Failed," +
 					"Component report not submitted," +
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index b9b15714c..c1c7b6514 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -1341,7 +1341,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     "lock," +
                     "Reject,"+
                     "Not started," +
-                    "Ongoing," +
+                    "In progress," +
                     "Test Passed," +
                     "Test Failed," +
                     "Component report not submitted," +