From 66e3aa5b21774ec8b387f42af04ae0aaca340ae4 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 15:52:07 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E9=85=8D=E7=BD=AEhttps=20.JKS=E7=9A=84SS?=
 =?UTF-8?q?L=E8=AF=81=E4=B9=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/config/init/TomcatFactoryConfig.java |  44 +++++++++++++++++-
 .../src/main/resources/application-dev.yml    |   6 ++-
 .../src/main/resources/bxxt.hzwlsoft.com.jks  | Bin 0 -> 6166 bytes
 jero-boot/pom.xml                             |   1 +
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/bxxt.hzwlsoft.com.jks

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java
index 8ca4f6635..5256b528b 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java
@@ -1,7 +1,12 @@
 package com.jero.config.init;
 
 import org.apache.catalina.Context;
+import org.apache.catalina.connector.Connector;
+import org.apache.coyote.http11.Http11NioProtocol;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.apache.tomcat.util.scan.StandardJarScanner;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,10 +18,15 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class TomcatFactoryConfig {
+    @Value("${server.port-https}")
+    private String serverPortHttp;
+    @Value("${server.port}")
+    private String serverPortHttps;
+
     /**
      * tomcat-embed-jasper引用后提示jar找不到的问题
      */
-    @Bean
+    /*@Bean
     public TomcatServletWebServerFactory tomcatFactory() {
         TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() {
             @Override
@@ -29,5 +39,37 @@ public class TomcatFactoryConfig {
             connector.setProperty("relaxedQueryChars", "[]{}");
         });
         return factory;
+    }*/
+
+    @Bean
+    public TomcatServletWebServerFactory tomcatFactory() {
+        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() {
+            @Override
+            protected void postProcessContext(Context context) {
+                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
+
+                SecurityConstraint securityConstraint = new SecurityConstraint();
+                securityConstraint.setUserConstraint("CONFIDENTIAL");
+                SecurityCollection securityCollection = new SecurityCollection();
+                securityCollection.addPattern("/*");
+                securityConstraint.addCollection(securityCollection);
+                context.addConstraint(securityConstraint);
+            }
+        };
+        factory.addConnectorCustomizers(connector -> {
+            connector.setProperty("relaxedPathChars", "[]{}");
+            connector.setProperty("relaxedQueryChars", "[]{}");
+        });
+        factory.addAdditionalTomcatConnectors(redirectConnector());
+        return factory;
+    }
+
+    private Connector redirectConnector() {
+        Connector connector = new Connector(Http11NioProtocol.class.getName());
+        connector.setScheme("http");
+        connector.setPort(Integer.parseInt(serverPortHttp));
+        connector.setSecure(false);
+        connector.setRedirectPort(Integer.parseInt(serverPortHttps));
+        return connector;
     }
 }
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index cf284ac6f..391799eff 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -1,5 +1,6 @@
 server:
   port: 8080
+  port-https: 8089 #自定义https端口
   tomcat:
     max-swallow-size: -1
   error:
@@ -12,7 +13,10 @@ server:
     enabled: true
     min-response-size: 1024
     mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
+  ssl: #配置https证书
+    key-store: classpath:bxxt.hzwlsoft.com.jks
+    key-store-password: w933m5y1kz0xj8w
+    key-store-type: JKS
 management:
   endpoints:
     web:
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/bxxt.hzwlsoft.com.jks b/jero-boot/jero-boot-single-startup/src/main/resources/bxxt.hzwlsoft.com.jks
new file mode 100644
index 0000000000000000000000000000000000000000..38bbfad141812c52e08a0b72ec1b7dfb67f8e34b
GIT binary patch
literal 6166
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
W>T$`E59+*tz!fNNl)4$J;Qv2YOj!2-

literal 0
HcmV?d00001

diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml
index c3f234115..6bee178cc 100644
--- a/jero-boot/pom.xml
+++ b/jero-boot/pom.xml
@@ -358,6 +358,7 @@
 						<nonFilteredFileExtension>svg</nonFilteredFileExtension>
 						<nonFilteredFileExtension>doc</nonFilteredFileExtension>
 						<nonFilteredFileExtension>docx</nonFilteredFileExtension>
+						<nonFilteredFileExtension>jks</nonFilteredFileExtension>
                     </nonFilteredFileExtensions>
                 </configuration>
             </plugin>

From 97e87ebada2201584d69b5288906c81939bbdc24 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 16:28:24 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=90=AF=E5=8A=A8=20?=
 =?UTF-8?q?=20=20=E6=B3=A8=E9=87=8A=E9=85=8D=E7=BD=AEhttps=20ssl=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=20=20=20=E9=83=A8=E7=BD=B2=E6=97=B6=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/config/init/TomcatFactoryConfig.java | 15 ++++++++-------
 .../src/main/resources/application-dev.yml        | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java
index 5256b528b..eae5a7286 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java
@@ -18,15 +18,11 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class TomcatFactoryConfig {
-    @Value("${server.port-https}")
-    private String serverPortHttp;
-    @Value("${server.port}")
-    private String serverPortHttps;
 
     /**
      * tomcat-embed-jasper引用后提示jar找不到的问题
      */
-    /*@Bean
+    @Bean
     public TomcatServletWebServerFactory tomcatFactory() {
         TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() {
             @Override
@@ -39,8 +35,13 @@ public class TomcatFactoryConfig {
             connector.setProperty("relaxedQueryChars", "[]{}");
         });
         return factory;
-    }*/
+    }
 
+    //TODO 配置https证书  部署服务器的时候解开。
+   /* @Value("${server.port-https}")
+    private String serverPortHttp;
+    @Value("${server.port}")
+    private String serverPortHttps;
     @Bean
     public TomcatServletWebServerFactory tomcatFactory() {
         TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() {
@@ -71,5 +72,5 @@ public class TomcatFactoryConfig {
         connector.setSecure(false);
         connector.setRedirectPort(Integer.parseInt(serverPortHttps));
         return connector;
-    }
+    }*/
 }
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index 391799eff..61a634c68 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -1,6 +1,5 @@
 server:
   port: 8080
-  port-https: 8089 #自定义https端口
   tomcat:
     max-swallow-size: -1
   error:
@@ -13,10 +12,12 @@ server:
     enabled: true
     min-response-size: 1024
     mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-  ssl: #配置https证书
-    key-store: classpath:bxxt.hzwlsoft.com.jks
-    key-store-password: w933m5y1kz0xj8w
-    key-store-type: JKS
+##配置https证书  部署服务器的时候解开。
+#  port-https: 8089 #自定义https端口
+#  ssl:
+#    key-store: classpath:bxxt.hzwlsoft.com.jks
+#    key-store-password: w933m5y1kz0xj8w
+#    key-store-type: JKS
 management:
   endpoints:
     web:

From 1d9bb68234e71084f05e3fc4847699b793103e27 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 16:35:24 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=20-=20=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=20=20=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/constant/enums/MessageTypeEnum.java | 13 ++++++++++++-
 .../modules/project/job/InventoryAffirmJob.java     |  4 ++--
 .../impl/ProjectLawsInventoryEOServiceImpl.java     |  8 ++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
index 4f5a85094..baa416114 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
@@ -10,7 +10,18 @@ public enum MessageTypeEnum {
     WARN("Early Warning","2"),
     PUSH("Share / Forward","3"),
     HOMO_TASK("Homo Parameter Task","4"),
-    TASK("Regulation Compliance Task", "5");
+    TASK("Regulation Compliance Task", "5"),
+    REGULATION_LIST_CONFIRMATION_TASK("Regulation List Confirmation Task", "6"), // 清单确认任务
+    REGULATION_LIST_CONFIRMATION_NOTIFICATION("Regulation List Confirmation Notification", "7"), // 清单确认通知
+    REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation Task", "8"), // 任务确认任务
+    REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "8"), // 任务确认通知
+    DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
+    PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
+    VALIDATION_TASK("Validation Task", "11"), // 验证符合性任务
+    DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
+    PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
+    VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
+    ;
 
     String name;
     String value;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
index df6a21678..5d18c50b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
@@ -168,7 +168,7 @@ public class InventoryAffirmJob implements Job {
                         sendMessageMap.put("contentInfo",contentInfo);
 
                         //发送消息
-                        projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLibraryBase.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                        projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLibraryBase.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
                     }
 
                     if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -204,7 +204,7 @@ public class InventoryAffirmJob implements Job {
                         sendMessageMap.put("hrefFeishu",hrefFeishu);
                         sendMessageMap.put("contentInfo",contentInfo);
                         //发送消息
-                        projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLibraryBase.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                        projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLibraryBase.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
                     }
                 }
             }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 87d1c6250..1cda303ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1375,7 +1375,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+					sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
 				}
 
 				result = "发起清单确认";
@@ -1507,7 +1507,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									//发送消息
 									List<String> userIdList = new ArrayList<>();
 									userIdList.add(projectLibraryBase.getStudioEngineer());
-									sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+									sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
 
 								}
 								if(isProjectRole == Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()) || isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())){
@@ -1545,7 +1545,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									//发送消息
 									List<String> userIdList = new ArrayList<>();
 									userIdList.add(projectLibraryBase.getStudioEngineer());
-									sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+									sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
 								}
 							}
 
@@ -1593,7 +1593,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								//发送消息
 								List<String> userIdList = new ArrayList<>();
 								userIdList.add(projectLibraryBase.getStudioEngineer());
-								sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+								sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION);
 							}
 						}
 					}

From 53828f7f8dde1f22bf443584170e1e8717b88c51 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 8 Jul 2022 16:57:48 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/uploadFile/file.vue   | 23 ++++++++++---------
 .../components/listOfRegulations.vue          |  8 +++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index 1bd779cc5..fab54f96b 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -191,17 +191,18 @@
         let index1 = fileName.lastIndexOf('.')
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
-        if (fileSuffix === '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
-        } else if (fileSuffix === '.docx') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else {
-          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
-        }
+        downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        // if (fileSuffix === '.pdf') {
+        //   window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+        // } else if (fileSuffix === '.docx') {
+        //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+        //   window.open(url, '_blank')
+        // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+        //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+        //   window.open(url, '_blank')
+        // } else {
+        //   downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        // }
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 9fa9c6282..e5ee987c5 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -128,10 +128,6 @@
               <a-icon type="delete"/>
               {{ $t('BatchDelete') }}
             </div>
-            <div class="operator-text-title" @click="bringInRelevantPersonnelClick">
-              <a-icon type="user"/>
-              {{ $t('bringInRelevantPersonnel') }}
-            </div>
             <div class="operator-text-title" @click="ExportReportClick">
               <a-icon type="export"/>
               {{ $t('ExportReport') }}
@@ -149,6 +145,10 @@
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
+        <div class="operator-text" @click="bringInRelevantPersonnelClick">
+          <a-icon type="user"/>
+          {{ $t('bringInRelevantPersonnel') }}
+        </div>
         <div @click="transferClick" class="operator-text">
           <a-icon type="profile"/>
           {{ $t('Transfer') }}

From 4975ae5352110e0f14a46b74c12a8d6308ec5f4f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 17:06:29 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DummyInventoryInfoEOServiceImpl.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 57067a3bf..0fb3ca0d2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -726,16 +726,16 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				explain = "填写说明\n" +
 						"1.导入数据从第四行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
-						"3.认证类型,认证级别,实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
-						"4.责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"3.实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
 						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
 						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the fourth line\n" +
 						"2.All fields marked with * must be filled in\n"+
-						"3.Certification Type,Certification Level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"3.Implementation category,Type of deliverables,Initiator,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Certification Type,Certification Level,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
 						"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
 						"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
 			}

From 5fd17f391ef09b2e5cc61ac763f56b46900dfc29 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 17:12:19 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 1cda303ff..3917a5532 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -3308,16 +3308,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				explain = "填写说明\n" +
 						"1.导入数据从第四行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
-						"3.认证类型,认证级别,实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
-						"4.责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"3.实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
 						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
 						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the fourth line\n" +
 						"2.All fields marked with * must be filled in\n"+
-						"3.Certification type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"3.Usage,Type of deliverables,Initiator,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Certification type,Certification Level,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
 						"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
 						"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
 			}

From 8b7256860dc9e735251f1241fbd52334591d568d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 17:38:08 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo?=
 =?UTF-8?q?=E3=80=81=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E3=80=81?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=20-=20=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=20=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/enums/MessageTypeEnum.java       |  2 +-
 .../project/job/InventoryAffirmJob.java       |  4 +--
 .../jero/modules/project/job/PrehomoJob.java  |  8 +++---
 .../project/job/VerifyComplianceJob.java      |  8 +++---
 .../project/job/designComplianceJob.java      |  8 +++---
 .../ProjectLawsInventoryEOServiceImpl.java    | 20 +++++++-------
 ...ojectTaskInventoryDetailEOServiceImpl.java | 10 +++++--
 .../ProjectTaskInventoryEOServiceImpl.java    | 26 +++++++++++++++----
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 24 ++++++++++++++---
 9 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
index baa416114..952c06959 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
@@ -13,7 +13,7 @@ public enum MessageTypeEnum {
     TASK("Regulation Compliance Task", "5"),
     REGULATION_LIST_CONFIRMATION_TASK("Regulation List Confirmation Task", "6"), // 清单确认任务
     REGULATION_LIST_CONFIRMATION_NOTIFICATION("Regulation List Confirmation Notification", "7"), // 清单确认通知
-    REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation Task", "8"), // 任务确认任务
+    REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation", "8"), // 任务确认任务
     REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "8"), // 任务确认通知
     DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
     PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
index 5d18c50b2..f22cb1823 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
@@ -161,7 +161,7 @@ public class InventoryAffirmJob implements Job {
                                 + "&projectName=" + projectNameInfoEO.getProjectName() + "-"
                                 + projectYearNameInfoEO.getYearName()
                                 + "&targetMarket=" + projectLibraryBase.getTargetMarket()
-                                + "'>" + "Jump link" + "</a>";
+                                + "'>" + " View details" + "</a>";
                         String contentInfo = msgContentEN + " " + href;
                         Map<String,Object> sendMessageMap = new HashMap<>();
                         sendMessageMap.put("hrefFeishu",hrefFeishu);
@@ -198,7 +198,7 @@ public class InventoryAffirmJob implements Job {
                                 + "&projectName=" + projectNameInfoEO.getProjectName() + "-"
                                 + projectYearNameInfoEO.getYearName()
                                 + "&targetMarket=" + projectLibraryBase.getTargetMarket()
-                                + "'>" + "Jump link" + "</a>";
+                                + "'>" + " View details" + "</a>";
                         String contentInfo = msgContentEN + " " + href;
                         Map<String,Object> sendMessageMap = new HashMap<>();
                         sendMessageMap.put("hrefFeishu",hrefFeishu);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
index 666963c52..7e3cc4880 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
@@ -161,14 +161,14 @@ public class PrehomoJob implements Job {
                                 String href = "<a href='"
                                         + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
                                         + "&projectName=" + projectNameInfoEO.getProjectName()
-                                        + "'>" + "Jump link" + "</a>";
+                                        + "'>" + " View details" + "</a>";
                                 String contentInfo = msgContentEN + " " + href;
                                 Map<String,Object> sendMessageMap = new HashMap<>();
                                 sendMessageMap.put("hrefFeishu",hrefFeishu);
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                                projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK);
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -196,14 +196,14 @@ public class PrehomoJob implements Job {
                                 String href = "<a href='"
                                         + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
                                         + "&projectName=" + projectNameInfoEO.getProjectName()
-                                        + "'>" + "Jump link" + "</a>";
+                                        + "'>" + " View details" + "</a>";
                                 String contentInfo = msgContentEN + " " + href;
                                 Map<String,Object> sendMessageMap = new HashMap<>();
                                 sendMessageMap.put("hrefFeishu",hrefFeishu);
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                                projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK);
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
index a36d52eef..121e399cb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
@@ -158,14 +158,14 @@ public class VerifyComplianceJob implements Job {
                                 String href = "<a href='"
                                         + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType()
                                         + "&projectName=" + projectNameInfoEO.getProjectName()
-                                        + "'>" + "Jump link" + "</a>";
+                                        + "'>" + " View details" + "</a>";
                                 String contentInfo = msgContentEN + " " + href;
                                 Map<String,Object> sendMessageMap = new HashMap<>();
                                 sendMessageMap.put("hrefFeishu",hrefFeishu);
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                                projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK);
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -193,14 +193,14 @@ public class VerifyComplianceJob implements Job {
                                 String href = "<a href='"
                                         + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType()
                                         + "&projectName=" + projectNameInfoEO.getProjectName()
-                                        + "'>" + "Jump link" + "</a>";
+                                        + "'>" + " View details" + "</a>";
                                 String contentInfo = msgContentEN + " " + href;
                                 Map<String,Object> sendMessageMap = new HashMap<>();
                                 sendMessageMap.put("hrefFeishu",hrefFeishu);
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                                projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK);
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
index 204c55a73..4938784ae 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
@@ -154,14 +154,14 @@ public class designComplianceJob implements Job {
                                 //系统内部跳转链接
                                 String href = "<a href='"
                                         + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
-                                        + "'>" + "Jump link" + "</a>";
+                                        + "'>" + " View details" + "</a>";
                                 String contentInfo = msgContentEN + " " + href;
                                 Map<String,Object> sendMessageMap = new HashMap<>();
                                 sendMessageMap.put("hrefFeishu",hrefFeishu);
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                                projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK);
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -188,14 +188,14 @@ public class designComplianceJob implements Job {
                                 String href = "<a href='"
                                         + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
                                         + "&projectName=" + projectNameInfoEO.getProjectName()
-                                        + "'>" + "Jump link" + "</a>";
+                                        + "'>" + " View details" + "</a>";
                                 String contentInfo = msgContentEN + " " + href;
                                 Map<String,Object> sendMessageMap = new HashMap<>();
                                 sendMessageMap.put("hrefFeishu",hrefFeishu);
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+                                projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK);
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 1cda303ff..0bc058032 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1368,7 +1368,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 							+ projectYearNameInfoEO.getYearName()
 							+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-							+ "'>" + "Jump link" + "</a>";
+							+ "'>" + " View details" + "</a>";
 					String contentInfo = msgContentEN + " " + href;
 					Map<String,Object> sendMessageMap = new HashMap<>();
 					sendMessageMap.put("hrefFeishu",hrefFeishu);
@@ -1498,7 +1498,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 											+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 											+ projectYearNameInfoEO.getYearName()
 											+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-											+ "'>" + "Jump link" + "</a>";
+											+ "'>" + " View details" + "</a>";
 									String contentInfo = msgContentEN + " " + href;
 									Map<String,Object> sendMessageMap = new HashMap<>();
 									sendMessageMap.put("hrefFeishu",hrefFeishu);
@@ -1536,7 +1536,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 											+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 											+ projectYearNameInfoEO.getYearName()
 											+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-											+ "'>" + "Jump link" + "</a>";
+											+ "'>" + " View details" + "</a>";
 									String contentInfo = msgContentEN + " " + href;
 									Map<String,Object> sendMessageMap = new HashMap<>();
 									sendMessageMap.put("hrefFeishu",hrefFeishu);
@@ -1584,7 +1584,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 										+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 										+ projectYearNameInfoEO.getYearName()
 										+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-										+ "'>" + "Jump link" + "</a>";
+										+ "'>" + " View details" + "</a>";
 								String contentInfo = msgContentEN + " " + href;
 								Map<String,Object> sendMessageMap = new HashMap<>();
 								sendMessageMap.put("hrefFeishu",hrefFeishu);
@@ -2121,14 +2121,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
 
 			//系统内部跳转链接
-			String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + "Jump link" + "</a>";
+			String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
 			String contentInfo = msgContentEN + " " + href;
 			Map<String,Object> sendMessageMap = new HashMap<>();
 			sendMessageMap.put("hrefFeishu",hrefFeishu);
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			sendMessage(msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+			sendMessage(msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK);
 		}
 	}
 
@@ -6407,14 +6407,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 							+ projectYearNameInfoEO.getYearName()
 							+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-							+ "'>" + "Jump link" + "</a>";
+							+ "'>" + " View details" + "</a>";
 					String contentInfo = msgContentEN + " " + href;
 					Map<String,Object> sendMessageMap = new HashMap<>();
 					sendMessageMap.put("hrefFeishu",hrefFeishu);
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+					sendMessage(msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
 				}
 			}
 
@@ -6460,7 +6460,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					//飞书跳转链接
 					String hrefFeishu = backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
 					//系统内部跳转链接
-					String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + "Jump link" + "</a>";
+					String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
 
 					String contentInfo = msgContentEN + " " + href;
 					Map<String,Object> sendMessageMap = new HashMap<>();
@@ -6468,7 +6468,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+					sendMessage(msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK);
 				}
 			}
 		});
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 1734c2ea5..1f55e7588 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -304,6 +304,8 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 
 		String id = UUID.randomUUID().toString().replace("-", "");
 
+		MessageTypeEnum messageTypeEnum = null;
+
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 		//给工程师下发消息
 		if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())){
@@ -318,6 +320,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 		}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.PREHOMO_ISSUE_DRE_MSG.getValue())){
 			//XXX has distributed the Pre-Homo confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
 			msgContentEN = currentUser.getUsername() + " has assigned the Pre-Homo confirmation process of "
@@ -330,6 +333,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 		}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.VERIFY_ISSUE_DRE_MSG.getValue())){
 			//XXX has distributed the Verify compliance confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
 			msgContentEN = currentUser.getUsername() + " has assigned the validation compliance confirmation process of "
@@ -341,6 +345,8 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 		}
 		if(CollectionUtils.isNotEmpty(userIdList) && org.apache.commons.lang3.StringUtils.isNotEmpty(msgContentEN)){
 			//飞书跳转链接
@@ -353,14 +359,14 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			String href = "<a href='"
 					+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId()  + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
 					+ "&projectName=" + projectNameInfoEO.getProjectName()
-					+ "'>" + "Jump link" + "</a>";
+					+ "'>" + " View details" + "</a>";
 			String contentInfo = msgContentEN + " " + href;
 			Map<String,Object> sendMessageMap = new HashMap<>();
 			sendMessageMap.put("hrefFeishu",hrefFeishu);
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+			SendMessageUtils.sendMessage(msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
 		}
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index 7f92ea6dd..774053a20 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -347,6 +347,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 
+		MessageTypeEnum messageTypeEnum = null;
+
 		if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_REMIND_MSG.getValue())){
 			//Please check and deal with the design compliance confirmation process of GB 7258 in XXX (project name) in time.
 			msgContentEN = "Please check and deal with the design compliance confirmation process of "
@@ -359,6 +361,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_REMIND_MSG.getValue())){
 			//Please check and deal with the Pre-Homo confirmation process of GB 7258 in XXX (project name) in time.
 			msgContentEN = "Please check and address the Pre-Homo confirmation process of "
@@ -370,6 +373,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.VERIFY_REMIND_MSG.getValue())){
 			//Please check and deal with the Verify compliance confirmation process of GB 7258 in XXX (project name) in time.
 			msgContentEN = "Please check and address the validation compliance confirmation process of "
@@ -380,6 +384,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
@@ -398,14 +404,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 					+ projectYearNameInfoEO.getYearName()
 					+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
-					+ "'>" + "Jump link" + "</a>";
+					+ "'>" + " View details" + "</a>";
 			String contentInfo = msgContentEN + " " + href;
 			Map<String,Object> sendMessageMap = new HashMap<>();
 			sendMessageMap.put("hrefFeishu",hrefFeishu);
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+			SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, messageTypeEnum);
 		}
 		return new Result<>().success("提醒办理成功！");
 	}
@@ -732,6 +738,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String dutDateStr = "";
 
+		MessageTypeEnum messageTypeEnum = null;
+
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
 			taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
 
@@ -745,6 +753,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time.");
 			feishuMsgVo.setTaskType("Design Compliance Confirmation");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_RETURN_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId");//设计符合性流程责任人id
 			userIdList.add(designDutyId);
@@ -761,6 +771,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Design Compliance Confirmation");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_RETURN_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId");//prehomo流程责任人id
 			userIdList.add(prehomoDutyId);
@@ -777,6 +789,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Pre-Homo Confirmation");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_RETURN_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId");//验证符合性流程责任人id
 			userIdList.add(verifyDutyId);
@@ -793,6 +807,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Validation Compliance Confirmation");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 		}
 		/*55360问题。
 		feishuMsgVo.setDueDate(dutDateStr);
@@ -871,7 +887,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 					+ projectYearNameInfoEO.getYearName()
 					+ projectLibraryBase.getTargetMarket()
-					+ "'>" + "Jump link" + "</a>";
+					+ "'>" + " View details" + "</a>";
 
 			//飞书跳转链接 拼接跳转至任务详情页参数
 			/*String hrefFeishu = backUrl
@@ -922,14 +938,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					+ "&projectNameId=" + projectNameId
 					+ "&primaryKeyId=" + primaryKeyId
 					+ "&PersonChargeFeedback=" + personChargeFeedback
-					+ "'>" + "Jump link" + "</a>";*/
+					+ "'>" + " View details" + "</a>";*/
 			String contentInfo = msgContentEN + " " + href;
 			Map<String,Object> sendMessageMap = new HashMap<>();
 			sendMessageMap.put("hrefFeishu",hrefFeishu);
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+			SendMessageUtils.sendMessage(msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
 		}
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index 24381ed63..656fd9e7c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -156,6 +156,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
 			feishuMsgVo.setInitiator(currentUser.getUsername());
 
+			MessageTypeEnum messageTypeEnum = null;
+
 			//消息内容
 			String msgContentEN = "";
 			String flowType = projectTaskInventoryFeedbackEO.getFlowType();
@@ -166,6 +168,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 				feishuMsgVo.setTaskType("Design Compliance Confirmation");
 				feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+
+				messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 			}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
 				msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
 						+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -173,6 +177,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 				feishuMsgVo.setTaskType("Pre-Homo Confirmation");
 				feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
+
+				messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 			}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
 				msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
 						+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -180,6 +186,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 				feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 				feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
+
+				messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 			}
 
 			//飞书跳转链接
@@ -195,14 +203,14 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 					+ projectYearNameInfoEO.getYearName()
 					+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket()
-					+ "'>" + "Jump link" + "</a>";
+					+ "'>" + " View details" + "</a>";
 			String contentInfo = msgContentEN + " " + href;
 			Map<String,Object> sendMessageMap = new HashMap<>();
 			sendMessageMap.put("hrefFeishu",hrefFeishu);
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+			SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum);
 		}
     }
 
@@ -341,6 +349,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
 				feishuMsgVo.setInitiator(currentUser.getUsername());
 
+				MessageTypeEnum messageTypeEnum = null;
+
 				//消息内容
 				String msgContentEN = "";
 				String flowType = projectTaskInventoryFeedbackEO.getFlowType();
@@ -351,6 +361,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 					feishuMsgVo.setTaskType("Design Compliance Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+
+					messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 				}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
 					msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of "
 							+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -358,6 +370,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 					feishuMsgVo.setTaskType("Pre-Homo Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
+
+					messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 				}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
 					msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of "
 							+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -365,6 +379,8 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 					feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
+
+					messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 				}
 
 				//飞书跳转链接
@@ -380,14 +396,14 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 						+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 						+ projectYearNameInfoEO.getYearName()
 						+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket()
-						+ "'>" + "Jump link" + "</a>";
+						+ "'>" + " View details" + "</a>";
 				String contentInfo = msgContentEN + " " + href;
 				Map<String,Object> sendMessageMap = new HashMap<>();
 				sendMessageMap.put("hrefFeishu",hrefFeishu);
 				sendMessageMap.put("contentInfo",contentInfo);
 
 				//发送消息
-				SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK);
+				SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum);
 			}
 		}
 	}

From d43a16fd50b3366ec6b26c8114f8bd391ec13b2c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 17:52:44 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
index 2358aa416..47d3c62c6 100644
--- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
@@ -27,5 +27,12 @@ ALTER TABLE `project_laws_inventory`
 ALTER TABLE `project_task_inventory`
     ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`;
 
+-- 2022年7月8日增加字段
 ALTER TABLE `dummy_inventory_info`
 ADD COLUMN `buss_document_library_id` varchar(32) NULL COMMENT '文档库id' AFTER `design_remark`;
+
+-- 2022年7月8日法规清单交付物类型字段长度
+ALTER TABLE `project_laws_inventory`
+MODIFY COLUMN `design_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计符合性确认-交付物类型' AFTER `remark`,
+MODIFY COLUMN `prehomo_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'prehomo确认-交付物类型' AFTER `design_due_date`,
+MODIFY COLUMN `verify_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '验证符合性确认-交付物类型' AFTER `prehomo_due_date`;

From f879261d7545c59076d00df195914eaec04a336b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 8 Jul 2022 18:02:13 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/MessageDetails.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/system/MessageDetails.vue b/jero-web/src/views/system/MessageDetails.vue
index a9b866dfe..309fe3c4a 100644
--- a/jero-web/src/views/system/MessageDetails.vue
+++ b/jero-web/src/views/system/MessageDetails.vue
@@ -75,11 +75,11 @@
   }
 
   .box-content {
-    padding: 40px 120px;
+    padding: 40px 70px;
     box-sizing: border-box;
     color: #040B29;
     font-size: 16px;
-    text-indent: 30px;
-    letter-spacing: 3px
+    text-indent: 24px;
+    /*letter-spacing: 1px*/
   }
 </style>
\ No newline at end of file

From ed5c273bc1da30c68528843790142033cce111c3 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 18:29:19 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91-=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 370 +++++++++++-------
 1 file changed, 224 insertions(+), 146 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 3917a5532..f9e144bbc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -5010,12 +5010,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-                    List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("subtitle"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
                 }
 				//WVTA ID
 				if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
@@ -5025,12 +5027,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 						}
-                    List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
                 }
 
 				//实施类别
@@ -5041,12 +5045,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 						}
-                    List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("implementType"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
                 }
 
 				//在产车实施日期
@@ -5057,382 +5063,454 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
                         String infoDiffNew = list.get(1);
                         contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
                     }
-
-					List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("implementTimeString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
 				}
 
 				//新车型实施日期
 				if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
 					List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-
+					if(StringUtils.isNotBlank(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//认证类型
 				if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
 					List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("attestationType"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//认证级别
 				if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
 					List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("attestationRank"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//责任领域
 				if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
 					List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//regulationOwnerName;//法规工程师名称
 				if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("regulationOwnerName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("regulationOwnerName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//homologationEngineerName;//认证工程师名称
 				if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("homologationEngineerName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("homologationEngineerName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//engineeringInterfacePersonName;//工程接口人名称
 				if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("engineeringInterfacePersonName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//适用地区region 多选
 				if (StringUtils.isNotBlank(infoDiff.get("region"))) {
 					List<String> list = Arrays.asList(infoDiff.get("region").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("region"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//备注
 				if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
 					List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("remark"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//设计符合性确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTypeName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTemplateName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designInitiatorName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designInitiatorName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDutyName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDutyName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-截止时间designDueDateString;
 				if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDueDateString").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDueDateString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTypeName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTemplateName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoInitiatorName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDutyName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDutyName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-截止时间prehomoDueDateString;
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDueDateString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//验证符合性确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTypeName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTemplateName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyInitiatorName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDutyName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDutyName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-截止时间verifyDueDateString
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDueDateString").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
+
 					if (list.size() > 1) {
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDueDateString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 

From 3e740529c821df72a9a7deb31f76db3c5f978ca5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 18:38:12 +0800
Subject: [PATCH 11/14] update

---
 .../java/com/jero/common/constant/enums/MessageTypeEnum.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
index 952c06959..dd1eb2bc7 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
@@ -14,7 +14,7 @@ public enum MessageTypeEnum {
     REGULATION_LIST_CONFIRMATION_TASK("Regulation List Confirmation Task", "6"), // 清单确认任务
     REGULATION_LIST_CONFIRMATION_NOTIFICATION("Regulation List Confirmation Notification", "7"), // 清单确认通知
     REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation", "8"), // 任务确认任务
-    REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "8"), // 任务确认通知
+    REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
     DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
     PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
     VALIDATION_TASK("Validation Task", "11"), // 验证符合性任务

From 593c7bf8b66567b5283fddf9c8cd01d8fb1e0382 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 18:42:46 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF--=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=B1=95=E7=A4=BA=E4=BB=A5=E9=80=97?=
 =?UTF-8?q?=E5=8F=B7=E6=8B=BC=E6=8E=A5=E7=9A=84=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryBaseServiceImpl.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 c445270a2..6a2e0cf55 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
@@ -361,9 +361,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 							certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						certificationName.append(certificationEngineerName).append(" ");
+						certificationName.append(certificationEngineerName).append(",");
+					}
+					if(StringUtils.isNotBlank(certificationName)){
+						String substring = certificationName.substring(0, certificationName.length() - 1);
+						projectLibraryBase.setCertificationEngineerName(substring);
 					}
-					projectLibraryBase.setCertificationEngineerName(certificationName.toString());
 				}
 			}
 		}

From 45b04290448d1d11cb8441814a4ddc0e6faad892 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 19:00:59 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=20=2055638=20=20-=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=20=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectTaskInventoryEO.java        |  22 ++
 .../ProjectTaskInventoryEOServiceImpl.java    | 191 ++++++++++--------
 2 files changed, 133 insertions(+), 80 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
index 70de0d84a..37aef3e07 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
@@ -315,4 +315,26 @@ public class ProjectTaskInventoryEO implements Serializable {
     /**法规清单id数组  查询使用**/
     @TableField(exist = false)
     private List<String> projectLawsInventoryIdList;
+
+
+    //设计符合性确认-发起人id
+    @TableField(exist = false)
+    private String designInitiatorId;
+    //验证符合性确认-发起人id
+    @TableField(exist = false)
+    private String verifyInitiatorId;
+    //prehomo确认-发起人id
+    @TableField(exist = false)
+    private String prehomoInitiatorId;
+
+    //设计符合性 - 责任人id
+    @TableField(exist = false)
+    private String designDutyId;
+    //验证符合性确认-责任人id
+    @TableField(exist = false)
+    private String verifyDutyId;
+    //prehomo确认-责任人id
+    @TableField(exist = false)
+    private String prehomoDutyId;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index 774053a20..87c747dfb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -209,6 +209,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 							projectTaskInventory.setVerifyDueDate(projectLawsInventory.getVerifyDueDate());
 							projectTaskInventory.setPrehomoDueDate(projectLawsInventory.getPrehomoDueDate());
 							projectTaskInventory.setLawsInventoryCreateTime(projectLawsInventory.getCreateTime());
+
+							projectTaskInventory.setDesignInitiatorId(projectLawsInventory.getDesignInitiatorId());
+							projectTaskInventory.setVerifyInitiatorId(projectLawsInventory.getVerifyInitiatorId());
+							projectTaskInventory.setPrehomoInitiatorId(projectLawsInventory.getPrehomoInitiatorId());
+							projectTaskInventory.setDesignDutyId(projectLawsInventory.getDesignDutyId());
+							projectTaskInventory.setVerifyDutyId(projectLawsInventory.getVerifyDutyId());
+							projectTaskInventory.setPrehomoDutyId(projectLawsInventory.getPrehomoDutyId());
 						}
 					});
 				});
@@ -462,6 +469,21 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				roleCode = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue();
 			}
 
+			//如果用户是验证符合性流程中的发起人或责任人
+			boolean showVerify = (StringUtils.equals(projectTaskInventoryEO.getVerifyInitiatorId(),currentUser.getId())
+					|| StringUtils.equals(projectTaskInventoryEO.getVerifyDutyId(),currentUser.getId())
+			);
+
+			//如果用户是prehomo流程中的发起人或责任人
+			boolean showPrehomo = (StringUtils.equals(projectTaskInventoryEO.getPrehomoInitiatorId(),currentUser.getId())
+					|| StringUtils.equals(projectTaskInventoryEO.getPrehomoDutyId(),currentUser.getId())
+			);
+
+			//如果用户是设计符合性流程中的发起人或责任人
+			boolean showDesign = (StringUtils.equals(projectTaskInventoryEO.getDesignInitiatorId(),currentUser.getId())
+					|| StringUtils.equals(projectTaskInventoryEO.getDesignDutyId(),currentUser.getId())
+			);
+
 			ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser,projectTaskInventory);
 			if(projectStatusAssess != null){
 				projectTaskInventoryEO.setProjectStatusAssess(projectStatusAssess.getConditionAssessment());
@@ -501,93 +523,102 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					 * 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
 					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
 					 */
-					if(isStudio){
+					if(isStudio || (showVerify || showDesign || showPrehomo)){
 						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
-						if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
-							designPid = actiProcInstId;
-							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								designTaskId = projectTaskInventoryDetailEO.getTaskId();
-								designTaskStatus = projectTaskInventoryDetailEO.getStatus();
-								designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
-								designTaskDetailId = projectTaskInventoryDetailEO.getId();
-							}else {
-								if(StringUtils.isEmpty(designTaskId)){
+						if(isStudio || showDesign){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
+								designPid = actiProcInstId;
+								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
 									designTaskId = projectTaskInventoryDetailEO.getTaskId();
-								}
-								if(StringUtils.isEmpty(designTaskStatus)){
-									designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
-								}
-								if(StringUtils.isEmpty(designTaskDefinitionKey)){
-									designTaskDefinitionKey = "";
-								}
-								if(StringUtils.isEmpty(designTaskDetailId)){
+									designTaskStatus = projectTaskInventoryDetailEO.getStatus();
+									designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
 									designTaskDetailId = projectTaskInventoryDetailEO.getId();
+								}else {
+									if(StringUtils.isEmpty(designTaskId)){
+										designTaskId = projectTaskInventoryDetailEO.getTaskId();
+									}
+									if(StringUtils.isEmpty(designTaskStatus)){
+										designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+									}
+									if(StringUtils.isEmpty(designTaskDefinitionKey)){
+										designTaskDefinitionKey = "";
+									}
+									if(StringUtils.isEmpty(designTaskDetailId)){
+										designTaskDetailId = projectTaskInventoryDetailEO.getId();
+									}
 								}
-							}
 
-							projectTaskInventoryEO.setDesignPId(designPid);
-							projectTaskInventoryEO.setDesignTaskId(designTaskId);
-							projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
-							projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
-							projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId);
-						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
-							prehomoPid = actiProcInstId;
-							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
-								prehomoTaskStatus = projectTaskInventoryDetailEO.getStatus();
-								prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
-								prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
-							}else {
-								if(StringUtils.isEmpty(prehomoTaskId)){
-									prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
-								}
-								if(StringUtils.isEmpty(prehomoTaskStatus)){
-									prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
-								}
-								if(StringUtils.isEmpty(prehomoTaskDefinitionKey)){
-									prehomoTaskDefinitionKey = "";
-								}
-								if(StringUtils.isEmpty(prehomoTaskDetailId)){
-									prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
-								}
+								projectTaskInventoryEO.setDesignPId(designPid);
+								projectTaskInventoryEO.setDesignTaskId(designTaskId);
+								projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
+								projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
+								projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId);
 							}
-
-							projectTaskInventoryEO.setPrehomoPId(prehomoPid);
-							projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
-							projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
-							projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
-							projectTaskInventoryEO.setPrehomoTaskDetailId(prehomoTaskDetailId);
-						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
-							verifyPid = actiProcInstId;
-							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
-								verifyTaskStatus = projectTaskInventoryDetailEO.getStatus();
-								verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
-								verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
-							}else {
-								if(StringUtils.isEmpty(verifyTaskId)){
-									verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
-								}
-								if(StringUtils.isEmpty(verifyTaskStatus)){
-									verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
-								}
-								if(StringUtils.isEmpty(verifyTaskDefinitionKey)){
-									verifyTaskDefinitionKey = "";
-								}
-								if(StringUtils.isEmpty(verifyTaskDetailId)){
-									verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
-								}
-							}
-
-							projectTaskInventoryEO.setVerifyPId(verifyPid);
-							projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
-							projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
-							projectTaskInventoryEO.setVerifyTaskDefinitionKey(verifyTaskDefinitionKey);
-							projectTaskInventoryEO.setVerifyTaskDetailId(verifyTaskDetailId);
 						}
+						if(isStudio || showPrehomo){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
+								prehomoPid = actiProcInstId;
+								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+									prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
+									prehomoTaskStatus = projectTaskInventoryDetailEO.getStatus();
+									prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+									prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
+								}else {
+									if(StringUtils.isEmpty(prehomoTaskId)){
+										prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
+									}
+									if(StringUtils.isEmpty(prehomoTaskStatus)){
+										prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+									}
+									if(StringUtils.isEmpty(prehomoTaskDefinitionKey)){
+										prehomoTaskDefinitionKey = "";
+									}
+									if(StringUtils.isEmpty(prehomoTaskDetailId)){
+										prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
+									}
+								}
 
-						projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
-						projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
+								projectTaskInventoryEO.setPrehomoPId(prehomoPid);
+								projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
+								projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
+								projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
+								projectTaskInventoryEO.setPrehomoTaskDetailId(prehomoTaskDetailId);
+							}
+						}
+						if(isStudio || showVerify){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
+								verifyPid = actiProcInstId;
+								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+									verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
+									verifyTaskStatus = projectTaskInventoryDetailEO.getStatus();
+									verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+									verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
+								}else {
+									if(StringUtils.isEmpty(verifyTaskId)){
+										verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
+									}
+									if(StringUtils.isEmpty(verifyTaskStatus)){
+										verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+									}
+									if(StringUtils.isEmpty(verifyTaskDefinitionKey)){
+										verifyTaskDefinitionKey = "";
+									}
+									if(StringUtils.isEmpty(verifyTaskDetailId)){
+										verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
+									}
+								}
+
+								projectTaskInventoryEO.setVerifyPId(verifyPid);
+								projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
+								projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
+								projectTaskInventoryEO.setVerifyTaskDefinitionKey(verifyTaskDefinitionKey);
+								projectTaskInventoryEO.setVerifyTaskDetailId(verifyTaskDetailId);
+							}
+						}
+						if(isStudio){
+							projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
+							projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
+						}
 					}else {
 						if((isRegulationOwner || isHomologationEngineer)){
 							projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
@@ -625,7 +656,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			}
 
 			/*if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
-			if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio)){
+			if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio || (showVerify || showDesign || showPrehomo))){
 				projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
 			}
 

From 54ed6ab74863f413cdf072cc98eafd5d11fb4502 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Sat, 9 Jul 2022 09:23:15 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             | 10 +++++
 jero-web/src/common/lang/zh-cn.js             | 10 +++++
 .../components/PersonnelSelection/index.vue   | 43 ++++++++++++++++---
 .../src/views/system/UserAnnouncementList.vue | 12 +++++-
 4 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 00330c781..fee53c4dc 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1095,4 +1095,14 @@ module.exports = {
   theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty',
   For:'For',
   markedRejection:'Marked rejection',
+  RegulationListConfirmationTask:'Regulation List Confirmation Task',
+  RegulationListConfirmationNotification:'Regulation List Confirmation Notification',
+  RegulationTaskConfirmation:'Regulation Task Confirmation',
+  DesignComplianceTask:'Design Compliance Task',
+  PreHomoTask:'Pre-Homo Task',
+  ValidationTask:'Validation Task',
+  DesignComplianceNotification:'Design Compliance Notification',
+  PreHomoNotification:'Pre-Homo Notification',
+  ValidationComplianceNotification:'Validation Compliance Notification',
+  RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 763b21f87..cc78f27b5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1099,4 +1099,14 @@ module.exports = {
   theDeliveryTypeCannotBeEmpty:'的交付物类型不能为空',
   For:'针对于',
   markedRejection:'标注的驳回意见',
+  RegulationListConfirmationTask:'清单确认任务',
+  RegulationListConfirmationNotification:'清单确认通知',
+  RegulationTaskConfirmation:'任务确认任务',
+  DesignComplianceTask:'设计符合性任务',
+  PreHomoTask:'Pre-Homo任务',
+  ValidationTask:'验证符合性任务',
+  DesignComplianceNotification:'设计符合性通知',
+  PreHomoNotification:'Pre-Homo通知',
+  ValidationComplianceNotification:'验证符合性通知',
+  RegulationTaskConfirmationNotification:'任务确认通知',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 086fff7ac..efb9283b6 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -58,7 +58,7 @@
 
   export default {
     name: 'index',
-    props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass','isDelete'],
+    props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete'],
     data() {
       return {
         loading: true,
@@ -74,6 +74,7 @@
         searchModel: '',
         defaultExpandedKeys: [],
         defaultCheckedKeys: [],
+        defaultCheckedKeysName: [],
         content: []
       }
     },
@@ -90,10 +91,10 @@
         this.queryDepartUserTreeList()
         this.visible = true
       },
-      standardDelete(){
+      standardDelete() {
         this.$emit('input', null)
         this.$forceUpdate()
-        this.$emit('deleteData',this.query.db_field_name)
+        this.$emit('deleteData', this.query.db_field_name)
       },
       // onSelect(selectedKeys, info) {
       //   console.log(selectedKeys)
@@ -101,9 +102,17 @@
       // },
 
       onCheck(checkedKeys, info) {
-        console.log(checkedKeys)
         this.userIds = checkedKeys.checked
         this.userName = []
+        if (this.userIds.length > 0) {
+          for (let i = 0; i < this.userIds.length; i++) {
+            for (let j = 0; j < this.defaultCheckedKeysName.length; j++) {
+              if (this.userIds[i] == this.defaultCheckedKeysName[j].id) {
+                this.userName.push(this.defaultCheckedKeysName[j].name)
+              }
+            }
+          }
+        }
         if (info.checkedNodes && info.checkedNodes.length > 0) {
           info.checkedNodes.forEach(res => {
             if (res.data.props.dataRef.key) {
@@ -136,6 +145,16 @@
             })
           })
         }
+        if (this.userName.length > 0){
+          for (let i = 0; i < this.userName.length; i++) {
+            for (let j = i + 1; j < this.userName.length; j++) {
+              if (this.userName[i] == this.userName[j]) {
+                this.userName.splice(j, 1)
+                j--
+              }
+            }
+          }
+        }
       },
       handleCancel() {
         this.visible = false
@@ -151,8 +170,9 @@
         }
         let userIds = JSON.parse(JSON.stringify(this.userIds))
         let userName = JSON.parse(JSON.stringify(this.userName))
+        console.log(userName)
         this.$emit('input', userName.join(','))
-        this.$emit('change', this.query.db_field_name, userIds.join(','),this.query.subscript)
+        this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
         this.visible = false
         this.treeVisible = false
         // } else {
@@ -179,8 +199,8 @@
       },
       getUserAndDepart() {
         getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          if (res){
-            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          if (res) {
+            this.gData = res.filter(ele => ele.flag === 'DEPART')
           } else {
             this.gData = []
           }
@@ -234,6 +254,15 @@
               }
             }
             this.defaultCheckedKeys = this.userIds
+            this.defaultCheckedKeysName = []
+            if (this.defaultCheckedKeys.length > 0) {
+              for (let i = 0; i < this.defaultCheckedKeys.length; i++) {
+                this.defaultCheckedKeysName.push({
+                  id: this.defaultCheckedKeys[i],
+                  name: this.userName[i]
+                })
+              }
+            }
             this.treeVisible = true
           } else {
             this.gData = []
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 1bde0bd10..c06aa9dcf 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -105,7 +105,17 @@
           '2': this.$t('warningInformation'),
           '3': this.$t('ForwardPush'),
           '4': this.$t('authenticationMessage'),
-          '5': this.$t('taskRegulationComplianceTask')
+          '5': this.$t('taskRegulationComplianceTask'),
+          '6':this.$t('RegulationListConfirmationTask'),
+          '7':this.$t('RegulationListConfirmationNotification'),
+          '8':this.$t('RegulationTaskConfirmation'),
+          '9':this.$t('DesignComplianceTask'),
+          '10':this.$t('PreHomoTask'),
+          '11':this.$t('ValidationTask'),
+          '12':this.$t('DesignComplianceNotification'),
+          '13':this.$t('PreHomoNotification'),
+          '14':this.$t('ValidationComplianceNotification'),
+          '15':this.$t('RegulationTaskConfirmationNotification'),
         },
         columns: [
           {