From 3e78b5c09dcb31d852849a4b76797e2ea3e63740 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 09:43:43 +0800
Subject: [PATCH 01/17] =?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/UserAnnouncementList.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 800be4f7e..a4115c765 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -132,6 +132,12 @@
             width: 200,
             scopedSlots: { customRender: 'msgCategory' }
           },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'initiator',
+            width: 200,
+          },
           {
             title: this.$t('NotificationTime'),
             align: 'center',

From cf190e37dc792adce2d40489de5e715da31d0d01 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 09:50:57 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E3=80=81=E6=8B=92=E7=BB=9D=E7=BB=99studio=E5=8F=91?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/enums/MsgTypeEnum.java    |  2 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 28 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
index 7adee9350..8131fde64 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
@@ -8,6 +8,8 @@ public enum MsgTypeEnum {
     TASK_AFFIRM_ISSUE_DRE_MSG("任务确认分配dre消息","taskAffirmIssueDreMsg"),
     TASK_AFFIRM_DRE_ACCEPTED("任务确认DRE通过消息","taskAffirmDreAccepted"),
     TASK_AFFIRM_DRE_REJECTED("任务确认DRE退回消息","taskAffirmDreRejected"),
+    TASK_AFFIRM_ACCEPTED_MSG("任务确认责任人通过消息","taskAffirmAcceptedMsg"),
+    TASK_AFFIRM_REJECTED_MSG("任务确认责任人拒绝消息","taskAffirmRejectedMsg"),
 
     DESIGN_ISSUE_DRE_MSG("设计符合性确认分配dre消息","designIssueDreMsg"),
     DESIGN_REMIND_MSG("设计符合性提醒办理","designRemindMsg"),
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 2b922603a..c1f516533 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
@@ -2090,6 +2090,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 
+		MessageTypeEnum messageTypeEnum = null;
+
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName()
@@ -2099,6 +2101,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2109,6 +2112,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2118,6 +2122,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2127,6 +2132,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
+			userIdList.add(projectLibraryBase.getStudioEngineer());
+			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and handle it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a regulation task confirmation to complete";
+
+			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
+
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
+			userIdList.add(projectLibraryBase.getStudioEngineer());
+			msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and handle it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a regulation task confirmation notification to check";
+
+			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
+
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
@@ -2149,7 +2175,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK);
+			sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
 		}
 	}
 

From bb72671a479a495c2b12f3b9dae1974723801c86 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 10:26:05 +0800
Subject: [PATCH 03/17] =?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=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E7=BB=99?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8F=91=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/enums/MessageTypeEnum.java       |  2 +-
 .../modules/project/enums/MsgTypeEnum.java    |  3 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 45 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 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 dd1eb2bc7..2be622546 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
@@ -17,7 +17,7 @@ public enum MessageTypeEnum {
     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"), // 验证符合性任务
+    VALIDATION_TASK("Validation ComplianceTask", "11"), // 验证符合性任务
     DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
     PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
     VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
index 8131fde64..ab51f244e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
@@ -21,6 +21,9 @@ public enum MsgTypeEnum {
     DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"),
     PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"),
     VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"),
+    DESIGN_START_MSG("设计符合性发起给责任人发送消息","designStartMsg"),
+    PREHOMO_START_MSG("prehomo发起给责任人发送消息","prehomoStartMsg"),
+    VERIFY_START_MSG("验证符合性发起给责任人发送消息","verifyStartMsg"),
     ;
 
     String name;
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 c1f516533..6369b014c 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
@@ -2091,6 +2091,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 
 		MessageTypeEnum messageTypeEnum = null;
+		String taskType = "";
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
@@ -2102,6 +2103,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2113,6 +2115,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2123,6 +2126,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2133,6 +2137,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2143,6 +2148,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2153,11 +2159,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			msgContentEN = "You recieved the design compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			taskType = MessageTypeEnum.DESIGN_COMPLIANCE_TASK.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			msgContentEN = "You recieved the Pre-Homo task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			taskType = MessageTypeEnum.PRE_HOMO_TASK.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			msgContentEN = "You recieved the validation compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			taskType = MessageTypeEnum.VALIDATION_TASK.getName();
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
 
-			feishuMsgVo.setTaskType("Regulation Task Confirmation");
+			feishuMsgVo.setTaskType(taskType);
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 			feishuMsgVo.setInitiator(sysUser.getUsername());

From cbaca6ef7332686d7e5eb18d0dcb7cb03ad0c186 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 10:52:22 +0800
Subject: [PATCH 04/17] =?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=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BB=99=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/enums/MessageTypeEnum.java       |  2 +-
 .../modules/project/enums/MsgTypeEnum.java    |  3 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 54 +++++++++++++++----
 3 files changed, 49 insertions(+), 10 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 2be622546..e9fa81854 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
@@ -17,7 +17,7 @@ public enum MessageTypeEnum {
     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 ComplianceTask", "11"), // 验证符合性任务
+    VALIDATION_TASK("Validation Compliance 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"), // 验证符合性通知
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
index ab51f244e..f84d5bd68 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
@@ -24,6 +24,9 @@ public enum MsgTypeEnum {
     DESIGN_START_MSG("设计符合性发起给责任人发送消息","designStartMsg"),
     PREHOMO_START_MSG("prehomo发起给责任人发送消息","prehomoStartMsg"),
     VERIFY_START_MSG("验证符合性发起给责任人发送消息","verifyStartMsg"),
+    DESIGN_CHARGE_PERSON_SUBMIT_MSG("设计符合性责任人提交给发起人发送消息","designChargePersonSubmitMsg"),
+    PREHOMO_CHARGE_PERSON_SUBMIT_MSG("prehomo责任人提交给发起人发送消息","prehomoChargePersonSubmitMsg"),
+    VERIFY_CHARGE_PERSON_SUBMIT_MSG("验证符合性责任人提交给发起人发送消息","verifyChargePersonSubmitMsg"),
     ;
 
     String name;
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 6369b014c..bbfe42936 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
@@ -2103,7 +2103,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
-			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
+			taskType = "Regulation Task Confirmation";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2115,7 +2115,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
-			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
+			taskType = "Regulation Task Confirmation";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2126,7 +2126,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
-			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
+			taskType = "Regulation Task Confirmation";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2137,7 +2137,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
-			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
+			taskType = "Regulation Task Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2148,7 +2148,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
-			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
+			taskType = "Regulation Task Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2159,7 +2159,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
-			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION.getName();
+			taskType = "Regulation Task Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
 			userIdList.add(designDutyId);
@@ -2171,7 +2171,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
-			taskType = MessageTypeEnum.DESIGN_COMPLIANCE_TASK.getName();
+			taskType = "Design Compliance Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
 			userIdList.add(prehomoDutyId);
@@ -2183,7 +2183,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
-			taskType = MessageTypeEnum.PRE_HOMO_TASK.getName();
+			taskType = "Pre-Homo Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
 			userIdList.add(verifyDutyId);
@@ -2195,7 +2195,43 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
-			taskType = MessageTypeEnum.VALIDATION_TASK.getName();
+			taskType = "Validation Compliance Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id
+			userIdList.add(designInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the design compliance confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			taskType = "Design Compliance Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id
+			userIdList.add(prehomoInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the Pre-Homo confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			taskType = "Pre-Homo Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id
+			userIdList.add(verifyInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the validation compliance confirmation " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			taskType = "Validation Compliance Confirmation";
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){

From d118f6263571016d94c30e8990f547adcd4b31b4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 11:06:55 +0800
Subject: [PATCH 05/17] =?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/UserAnnouncementList.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index a4115c765..73824c59d 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -125,6 +125,12 @@
             ellipsis: true,
             scopedSlots: { customRender: 'msgTitile' }
           },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'initiator',
+            width: 200,
+          },
           {
             title: this.$t('MessageType'),
             align: 'center',
@@ -132,12 +138,6 @@
             width: 200,
             scopedSlots: { customRender: 'msgCategory' }
           },
-          {
-            title: this.$t('Sponsor'),
-            align: 'center',
-            dataIndex: 'initiator',
-            width: 200,
-          },
           {
             title: this.$t('NotificationTime'),
             align: 'center',

From 5d2023038a106efec671b06318650254b2a49538 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 11:09:55 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95--=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E5=8E=BB=E6=8E=89=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectRelatedPersonnelServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index a22bc0d69..9c60e01fc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -263,7 +263,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						lawName.append(lawEngineerName).append(" , ");
+						lawName.append(lawEngineerName).append(",");
 					}
 					projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-3));
 				}
@@ -289,7 +289,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						engineeringName.append(engineeringInterfacePersonName).append(" , ");
+						engineeringName.append(engineeringInterfacePersonName).append(",");
 					}
 					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-3));
 				}
@@ -314,7 +314,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						certificationName.append(certificationEngineerName).append(" , ");
+						certificationName.append(certificationEngineerName).append(",");
 					}
 					projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-3));
 				}

From 061ef75f2a68a956b7248db65494dc1fa6e809ed Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 11:21:35 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E6=B6=88=E6=81=AF--=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/蔚来标准sql/first_bug_fix_record.sql   |  4 ++
 .../constant/enums/MessageTypeEnum.java       |  1 +
 .../system/entity/SysAnnouncement.java        |  4 ++
 .../mapper/xml/SysAnnouncementMapper.xml      |  1 +
 .../mapper/xml/SysAnnouncementSendMapper.xml  |  4 +-
 .../system/model/AnnouncementSendModel.java   |  4 ++
 .../BussDocumentLibraryEOServiceImpl.java     | 40 +++++++++++++------
 .../impl/DummyInventoryBaseEOServiceImpl.java |  4 +-
 .../modules/warn/service/LawsWarnService.java |  2 +-
 .../modules/warn/service/TimedTaskWarn.java   |  2 +-
 10 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
index e762a0d48..5af5e2560 100644
--- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
@@ -45,3 +45,7 @@ ALTER TABLE `laws_weilai`.`sys_announcement`
 INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name` )
 VALUES
 ( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'domianPreviewURL' );
+
+-- 消息表添加发起人字段
+ALTER TABLE `sys_announcement`
+ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`;
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 e9fa81854..b6a2c2aa7 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
@@ -21,6 +21,7 @@ public enum MessageTypeEnum {
     DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
     PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
     VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
+    SYSTEMATIC_NOTIFICATION("Systematic Notification", "15"), // 系统通知
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
index 779be4cd2..4da6a9046 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
@@ -153,4 +153,8 @@ public class SysAnnouncement implements Serializable {
      * 文档id
      */
     private java.lang.String documentId;
+    /**
+     * 发起人
+     */
+    private java.lang.String initiator;
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml
index 1efdc73a6..1589ef460 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml
@@ -27,6 +27,7 @@
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 		<result column="document_id" property="documentId" jdbcType="VARCHAR"/>
+		<result column="initiator" property="initiator" jdbcType="VARCHAR"/>
 	</resultMap>
 
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 790aa0b61..eeaf3e484 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -17,6 +17,7 @@
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 		<result column="document_id" property="documentId" jdbcType="VARCHAR"/>
+		<result column="initiator" property="initiator" jdbcType="VARCHAR"/>
 	</resultMap>
 
 	<select id="queryByUserId" parameterType="String"  resultType="String">
@@ -41,7 +42,8 @@
 			sa.open_type as open_type,
 			sa.open_page as open_page,
 			sa.msg_abstract,
-			sa.document_id as document_id
+			sa.document_id as document_id,
+		    sa.initiator as initiator
 	   from sys_announcement_send sas
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   where sa.del_flag = '0'
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
index 6e252d172..c06ddda74 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
@@ -82,5 +82,9 @@ public class AnnouncementSendModel implements Serializable {
 	 * 文档id
 	 */
 	private java.lang.String documentId;
+	/**
+	 * 发起人
+	 */
+	private java.lang.String initiator;
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 85a5e52d1..46302ea57 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -42,6 +42,7 @@ import com.jero.modules.domain.entity.DomainUserRel;
 import com.jero.modules.domain.service.DomainUserRelService;
 import com.jero.modules.domain.service.impl.DomainManageServiceImpl;
 import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.home.entity.HomeDocumentDynamicEO;
 import com.jero.modules.home.service.IHomeDocumentDynamicEOService;
 import com.jero.modules.log.entity.BussLogEO;
@@ -309,7 +310,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String contentInfo =content;
             String title = content;
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.READ.getValue());
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(StringUtils.join(serialNumberList, ","), contentInfo);
         }
@@ -2143,7 +2144,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     + href +" has been updated.";
             String msgTitle = "The " + technologyTerritoryName + " technical field you subscribed to has been updated";
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(idTemp, contentInfo);
             //飞书
@@ -3145,7 +3146,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 String msgTitle = "The" + technologyTerritoryNameEn + "technical field you subscribed to has been updated";
                 // 封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue());
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3167,7 +3168,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 String msgTitle = serialNumber + "you subsribed to has been updated";
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3248,7 +3249,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String contentInfo = "New numbering implemented, please note update status of alternate numbering " + sbStr;
         String msgTitle = contentInfo;
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(serialNumberListTemp, ","), contentInfo);
         //飞书
@@ -3271,8 +3272,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
     @NotNull
-    public SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo,String messageType) {
+    public SysAnnouncement getSysAnnouncement(List<String> userIdList,
+                                              String title,
+                                              String content,
+                                              String contentInfo,
+                                              String messageType,
+                                              String initiator) {
         SysAnnouncement sysAnnouncement = new SysAnnouncement();
+        sysAnnouncement.setInitiator(initiator);
         sysAnnouncement.setDelFlag("0");
         sysAnnouncement.setSendStatus("0");
         sysAnnouncement.setSendTime(new Date());
@@ -4684,10 +4691,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public String pullMessage(String departIds, String userIds, String documentIds) {
-//        departIds = "c6d7cb4deeac411cb3384b1b31278596";
-//        if(StringUtils.isBlank(documentIds)){
-//            return "请选择文档";
-//        }
         Set<String> allDepartIds = new HashSet<>();
         //查询当前部门下所有部门
         if (StringUtils.isNotEmpty(departIds)) {
@@ -4746,9 +4749,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
-        String title = StringUtils.join(serialNumberList, ",") +  "has been pushed to you, please check";
+        String title = StringUtils.join(serialNumberList, ",") +  " has been pushed to you, please check";
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue());
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书
@@ -4763,7 +4766,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     }
                 });
                 String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out.";
-                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
+                FeishuMsgVo feishuMsgVo = getFeishuMsgVo(MessageTypeEnum.PUSH.getName(),MessageTypeEnum.PUSH.getName(), contentTemp, encode);
+                iFeishuService.sendCardMsg(thirdIdList.toArray(new String[]{}), feishuMsgVo);
+//                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
             }
         } catch (IOException e) {
             log.error("飞书推送失败");
@@ -4772,6 +4777,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return "推送成功";
     }
 
+    private FeishuMsgVo getFeishuMsgVo(String title, String taskType, String content,String url) {
+        FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+        feishuMsgVo.setTitle(title);
+        feishuMsgVo.setContent(content);
+        feishuMsgVo.setTaskType(taskType);
+        feishuMsgVo.setUrl(url);
+        return feishuMsgVo;
+    }
+
 
     /**
      * 属性字典处理中文
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index e1b5c0850..32e772497 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -1150,7 +1150,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
                     msgTitle = "The " + baseName + " virtual list you subscribed to has been updated";
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书
@@ -1164,7 +1164,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
                     msgTitle = "The " + baseName + " virtual list you subscribed to has been withdrawn";
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
index 8e091a1da..d5961d3c1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
@@ -335,7 +335,7 @@ public class LawsWarnService {
         String title = content;
 
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue());
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
index c6b2e871c..25083ab1e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
@@ -152,7 +152,7 @@ public class TimedTaskWarn implements Job {
     private void sendMessage(String title, String content,String contentInfo,String contentFeiShu, String url, List<String> userIdList, List<String> thirdIdList) {
         //站内消息
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.WARN.getValue());
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.WARN.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content);
 

From c1f93fda037a0d921b58e3c02820782e63849f34 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 11:23:51 +0800
Subject: [PATCH 08/17] =?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=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=99=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/enums/MsgTypeEnum.java    |  3 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 36 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
index f84d5bd68..3be535686 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
@@ -27,6 +27,9 @@ public enum MsgTypeEnum {
     DESIGN_CHARGE_PERSON_SUBMIT_MSG("设计符合性责任人提交给发起人发送消息","designChargePersonSubmitMsg"),
     PREHOMO_CHARGE_PERSON_SUBMIT_MSG("prehomo责任人提交给发起人发送消息","prehomoChargePersonSubmitMsg"),
     VERIFY_CHARGE_PERSON_SUBMIT_MSG("验证符合性责任人提交给发起人发送消息","verifyChargePersonSubmitMsg"),
+    DESIGN_INITIATOR_ACCEPTED_MSG("设计符合性发起人通过发送消息","designInitiatorAcceptedMsg"),
+    PREHOMO_INITIATOR_ACCEPTED_MSG("prehomo发起人通过发送消息","prehomoInitiatorAcceptedMsg"),
+    VERIFY_INITIATOR_ACCEPTED_MSG("验证符合性发起人通过发送消息","verifyInitiatorAcceptedMsg"),
     ;
 
     String name;
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 bbfe42936..577094efb 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
@@ -2232,6 +2232,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 			taskType = "Validation Compliance Confirmation";
+		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_NOTIFICATION;
+			taskType = "Design Compliance Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			msgContentEN = "The Pre-Homo confirmation information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_NOTIFICATION;
+			taskType = "Pre-Homo Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			msgContentEN = "The validation compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ "you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_COMPLIANCE_NOTIFICATION;
+			taskType = "Validation Compliance Confirmation";
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){

From f5768b8be312eeb56e3fcc276bc3f29ebd1116e9 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 11:56:15 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E4=BA=BA=20=E4=B8=BA'=E8=AF=A5=E9=A1=B9=E7=9B=AE=E7=9A=84studi?=
 =?UTF-8?q?o'=20=E8=AE=BE=E8=AE=A1=E3=80=81prehomo=E3=80=81=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=20=E4=B8=BA'=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/job/InventoryAffirmJob.java       |  4 +-
 .../jero/modules/project/job/PrehomoJob.java  |  4 +-
 .../project/job/VerifyComplianceJob.java      |  4 +-
 .../project/job/designComplianceJob.java      |  4 +-
 .../IProjectLawsInventoryEOService.java       |  2 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 54 ++++++++++++++-----
 ...ojectTaskInventoryDetailEOServiceImpl.java |  2 +-
 .../ProjectTaskInventoryEOServiceImpl.java    |  4 +-
 ...ectTaskInventoryFeedbackEOServiceImpl.java |  4 +-
 .../project/util/SendMessageUtils.java        | 14 +++--
 10 files changed, 67 insertions(+), 29 deletions(-)

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 5df8aa915..cde692da6 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
@@ -170,7 +170,7 @@ public class InventoryAffirmJob implements Job {
                         sendMessageMap.put("contentInfo",contentInfo);
 
                         //发送消息
-                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     }
 
                     if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -208,7 +208,7 @@ public class InventoryAffirmJob implements Job {
                         sendMessageMap.put("hrefFeishu",hrefFeishu);
                         sendMessageMap.put("contentInfo",contentInfo);
                         //发送消息
-                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     }
                 }
             }
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 cfb3a6397..b48b7cb28 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
@@ -170,7 +170,7 @@ public class PrehomoJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -207,7 +207,7 @@ public class PrehomoJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
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 6e366192e..606e4baad 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
@@ -167,7 +167,7 @@ public class VerifyComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -204,7 +204,7 @@ public class VerifyComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
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 3bff75fa3..a2714f2c6 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
@@ -163,7 +163,7 @@ public class designComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -199,7 +199,7 @@ public class designComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
index a52d00052..675dda5e0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
@@ -78,7 +78,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 */
 	Result<?> updateStatusBatch(JSONObject json);
 
-	void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType);
+	void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator);
 
 	/**
 	 * 匹配相关人员
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 577094efb..361b94422 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
@@ -1340,8 +1340,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if(CollectionUtils.isNotEmpty(userIdList)){
 					userIdList = userIdList.stream().distinct().collect(Collectors.toList());
 
-
-
 					//消息内容
 					String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for "
 							+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
@@ -1377,7 +1375,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,currentUser.getUsername());
 				}
 
 				result = "发起清单确认";
@@ -1465,6 +1463,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
 								}*/
 							}
+
+							SysUser studioUserInfo = this.sysUserMapper.selectOne(
+									new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+							);
+
 							//只要有一个人拒绝，就改为拒绝。
 							if(StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())){
 								inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
@@ -1513,7 +1516,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									//发送消息
 									List<String> userIdList = new ArrayList<>();
 									userIdList.add(projectLibraryBase.getStudioEngineer());
-									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
 
 								}
 
@@ -1554,7 +1557,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									//发送消息
 									List<String> userIdList = new ArrayList<>();
 									userIdList.add(projectLibraryBase.getStudioEngineer());
-									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
 								}
 							}
 
@@ -1604,7 +1607,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								//发送消息
 								List<String> userIdList = new ArrayList<>();
 								userIdList.add(projectLibraryBase.getStudioEngineer());
-								sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION);
+								sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION,studioUserInfo.getUsername());
 							}
 						}
 					}
@@ -1627,7 +1630,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	 * @param projectLibraryId
 	 */
 	@Override
-	public void sendMessage(String msgTitle, String msgContent, List<String> userIdList,String projectLibraryId,Map<String,Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType){
+	public void sendMessage(String msgTitle, String msgContent, List<String> userIdList,String projectLibraryId,Map<String,Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator){
 		String idTemp = projectLibraryId;
 
 		List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
@@ -1641,7 +1644,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String contentInfo = (String) sendMessageMap.get("contentInfo");
 
 		//系统消息
-		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo, messageType);
+		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo, messageType,initiator);
 		sysAnnouncementService.saveAnnouncement(sysAnnouncement);
 		sendWebsocket(idTemp, idTemp);
 
@@ -1661,8 +1664,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@NotNull
-	private SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType) {
+	private SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType,String initiator) {
 		SysAnnouncement sysAnnouncement = new SysAnnouncement();
+		sysAnnouncement.setInitiator(initiator);
 		sysAnnouncement.setDelFlag("0");
 		sysAnnouncement.setSendStatus("0");
 		sysAnnouncement.setSendTime(new Date());
@@ -2074,6 +2078,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
 				.lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
 
+
+		SysUser studioUserInfo = this.sysUserMapper.selectOne(
+				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+		);
+
 		QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
 		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
@@ -2092,6 +2101,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		MessageTypeEnum messageTypeEnum = null;
 		String taskType = "";
+		String initiator = "";
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
@@ -2104,6 +2114,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 			taskType = "Regulation Task Confirmation";
+
+			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2116,6 +2128,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2127,6 +2140,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2138,6 +2152,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2149,6 +2164,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
 			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2160,6 +2176,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
 			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
 			userIdList.add(designDutyId);
@@ -2172,6 +2189,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 			taskType = "Design Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
 			userIdList.add(prehomoDutyId);
@@ -2184,6 +2202,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 			taskType = "Pre-Homo Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
 			userIdList.add(verifyDutyId);
@@ -2196,6 +2215,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 			taskType = "Validation Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){
 			String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id
 			userIdList.add(designInitiatorId);
@@ -2208,6 +2228,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
 			taskType = "Design Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){
 			String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id
 			userIdList.add(prehomoInitiatorId);
@@ -2220,6 +2241,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
 			taskType = "Pre-Homo Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){
 			String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id
 			userIdList.add(verifyInitiatorId);
@@ -2232,6 +2254,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 			taskType = "Validation Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
 			userIdList.add(designDutyId);
@@ -2244,6 +2267,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_NOTIFICATION;
 			taskType = "Design Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
 			userIdList.add(prehomoDutyId);
@@ -2256,6 +2280,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.PRE_HOMO_NOTIFICATION;
 			taskType = "Pre-Homo Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
 			userIdList.add(verifyDutyId);
@@ -2268,6 +2293,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_COMPLIANCE_NOTIFICATION;
 			taskType = "Validation Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
@@ -2290,7 +2316,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,initiator);
 		}
 	}
 
@@ -6595,6 +6621,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId);
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
 
+		SysUser studioUserInfo = this.sysUserMapper.selectOne(
+				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+		);
+
 		projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> {
 
 			//如果清单确认状态为待确认的，进行催办
@@ -6656,7 +6686,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
 				}
 			}
 
@@ -6712,7 +6742,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK);
+					sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK,studioUserInfo.getUsername());
 				}
 			}
 		});
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 25a0e47ea..c3e6664ba 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
@@ -372,7 +372,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 	}
 }
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 bf70f98ce..a8f3e12f5 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
@@ -425,7 +425,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 		return new Result<>().success("提醒办理成功！");
 	}
@@ -992,7 +992,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 	}
 
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 779a2f9af..e3bc86589 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
@@ -218,7 +218,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
     }
 
@@ -419,7 +419,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				sendMessageMap.put("contentInfo",contentInfo);
 
 				//发送消息
-				SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum);
+				SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 			}
 		}
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
index 11e6f4f45..4d803cf32 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
@@ -54,7 +54,14 @@ public class SendMessageUtils {
         SendMessageUtils.webSocket = webSocket;
     }
 
-    public static void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType) {
+    public static void sendMessage(String msgTitle,
+                                   String msgContent,
+                                   List<String> userIdList,
+                                   String projectLibraryId,
+                                   Map<String,Object> sendMessageMap,
+                                   FeishuMsgVo feishuMsgVo,
+                                   MessageTypeEnum messageType,
+                                   String initiator) {
         String idTemp = projectLibraryId;
 
         List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
@@ -69,7 +76,7 @@ public class SendMessageUtils {
         String contentInfo = (String) sendMessageMap.get("contentInfo");
 
         //系统消息
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo,messageType);
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo,messageType,initiator);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(idTemp, idTemp);
 
@@ -89,8 +96,9 @@ public class SendMessageUtils {
     }
 
     @NotNull
-    private static SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType) {
+    private static SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType,String initiator) {
         SysAnnouncement sysAnnouncement = new SysAnnouncement();
+        sysAnnouncement.setInitiator(initiator);
         sysAnnouncement.setDelFlag("0");
         sysAnnouncement.setSendStatus("0");
         sysAnnouncement.setSendTime(new Date());

From 027d6cc84ee5ce837d3e887c3a98df5cfd467687 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 14:27:31 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 46302ea57..ab87459e4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -4766,9 +4766,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     }
                 });
                 String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out.";
-                FeishuMsgVo feishuMsgVo = getFeishuMsgVo(MessageTypeEnum.PUSH.getName(),MessageTypeEnum.PUSH.getName(), contentTemp, encode);
-                iFeishuService.sendCardMsg(thirdIdList.toArray(new String[]{}), feishuMsgVo);
-//                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
+//                FeishuMsgVo feishuMsgVo = getFeishuMsgVo(MessageTypeEnum.PUSH.getName(),null, contentTemp, encode);
+//                iFeishuService.sendCardMsg(thirdIdList.toArray(new String[]{}), feishuMsgVo);
+                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
             }
         } catch (IOException e) {
             log.error("飞书推送失败");

From 4214e1241c66510a0d08a12dd16ff8a464586711 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 14:45:44 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index ab87459e4..763530ab2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3144,7 +3144,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 sbStr = sbStr.replaceAll("<text class='highlight-class'>", "").replaceAll("</text>", "");
                 //您订阅的XXX已被修改
                 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
-                String msgTitle = "The" + technologyTerritoryNameEn + "technical field you subscribed to has been updated";
+                String msgTitle = "The " + technologyTerritoryNameEn + " technical field you subscribed to has been updated";
                 // 封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -3166,7 +3166,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //您订阅的XXX已被修改
                 content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
-                String msgTitle = serialNumber + "you subsribed to has been updated";
+                String msgTitle = serialNumber + " you subsribed to has been updated";
                 //封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);

From 077d81da5db86d0183a842f7fba6fab0b3d5abb9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 17:16:45 +0800
Subject: [PATCH 12/17] =?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

---
 .../components/virtualListDetails.vue           | 17 ++++++++++++++++-
 .../processForm/handshakeProcess/index.vue      |  3 ++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 6a178e9a5..7ae3c6526 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -162,6 +162,12 @@
                     {{text}}
                   </span>
               </span>
+
+              <span slot="standard" slot-scope="text,record" :title="text">
+              <a class="textName" @click="standardClick(record)">
+                 {{text}}
+              </a>
+              </span>
               <span slot="designDeliverableTemplateName" slot-scope="text,record">
           <span>{{record.designDeliverableTypeName}}</span><br v-if="record.designDeliverableTypeName">
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
@@ -306,7 +312,7 @@
             dataIndex: 'serialNumber',
             width: 180,
             fixed: 'left',
-            scopedSlots: { customRender: 'titleName' }
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('title'),
@@ -840,6 +846,15 @@
             this.loading = false
           }
         })
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index f486e8b1c..c5390aa79 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -84,7 +84,8 @@
           {},
           {
             title: this.$t('standard'),
-            value: 'serialNumber'
+            value: 'serialNumber',
+            type: '4'
           },
           {
             title: this.$t('title'),

From 5e741db8bc0555850564345ad9ee019814ec00a8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 18:02:32 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5--=E7=BC=96=E5=8F=B7=E9=AA=8C=E9=87=8D=E4=B8=94?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 763530ab2..3e8e82250 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1571,13 +1571,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String serialNumber = StringUtils.valueOf(map.get("serial_number"));
             //String serialNumber = StringUtils.valueOf(map.get("serial_number"));
             //编码验重
-            List<BussDocumentLibraryEO> list = this.list();
-            if(list.size() != 0){
-                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
-                if(serialNumberList.contains(serialNumber)){
-                    throw new JeroBootException("编号已存在不能重复添加");
-                }
-            }
+//            List<BussDocumentLibraryEO> list = this.list();
+//            if(list.size() != 0){
+//                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+//                if(serialNumberList.contains(serialNumber)){
+//                    throw new JeroBootException("编号已存在不能重复添加");
+//                }
+//            }
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) (map.get("issue_time"));
@@ -5453,6 +5453,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             FileUnZip.deleteDir(saveDirectory);
             throw new JeroBootException(html);
         } else {
+            //验证重复的标准号
+            List<String> serialNumberList = new ArrayList<>();
+            if (mapList.size() != 0) {
+                for (Map<String, Object> map : mapList) {
+                    serialNumberList.add(StringUtils.valueOf(map.get("serial_number")));
+                }
+            }
+            List<BussDocumentLibraryEO> list = this.list();
+            if(list.size() != 0){
+                List<BussDocumentLibraryEO> serialNumberListTemp = list.stream()
+                        .filter(e -> serialNumberList.contains(e.getSerialNumber())).collect(Collectors.toList());
+                if(serialNumberListTemp.size() != 0){
+                    List<String> collect = serialNumberListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        throw new JeroBootException(StringUtils.join(collect,",")+" 编号已存在不能重复添加");
+                    }else{
+                        throw new JeroBootException(StringUtils.join(collect,",")+" already exists and cannot be added again");
+                    }
+                }
+            }
+
             if (mapList.size() != 0) {
                 for (Map<String, Object> map : mapList) {
                     this.addInfo(map);

From 28abd5bd4c25dcd76d553eb9e7eb901ed8c9652c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 18:05:56 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95--=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectRelatedPersonnelServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 9c60e01fc..66e03ed80 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -265,7 +265,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}
 						lawName.append(lawEngineerName).append(",");
 					}
-					projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-3));
+					projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-1));
 				}
 			}
 
@@ -291,7 +291,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}
 						engineeringName.append(engineeringInterfacePersonName).append(",");
 					}
-					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-3));
+					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-1));
 				}
 			}
 
@@ -316,7 +316,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}
 						certificationName.append(certificationEngineerName).append(",");
 					}
-					projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-3));
+					projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-1));
 				}
 			}
 

From ee4bdbcdb9b3fffaabc6582250aff6c75459d966 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 18:17:50 +0800
Subject: [PATCH 15/17] =?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/OcrUpload/index.vue   |  2 +-
 jero-web/src/components/SplitImport/index.vue |  2 +-
 jero-web/src/components/SplitUpload/index.vue |  2 +-
 .../components/importSplitUpload/index.vue    |  2 +-
 .../src/components/uploadFileChange/file.vue  | 22 +++++++++----------
 .../components/uploadFileChangeDown/file.vue  | 22 +++++++++----------
 .../searchCenter/components/whole.vue         |  1 +
 7 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue
index 67ba5063f..4dec33c23 100644
--- a/jero-web/src/components/OcrUpload/index.vue
+++ b/jero-web/src/components/OcrUpload/index.vue
@@ -32,7 +32,7 @@
       return{
         visible:false,
         uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
-        downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static',
+        downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static',
         myfileList:[],
         fileList:[],
         fileTypeSatus:false,
diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue
index f616626eb..85a0fe05f 100644
--- a/jero-web/src/components/SplitImport/index.vue
+++ b/jero-web/src/components/SplitImport/index.vue
@@ -50,7 +50,7 @@
         visible:false,
         // uploadAction:"http://10.0.1.25:8080/split/sarFileSplitItems/importSplitItems",
         uploadAction:window._CONFIG['domianURL']+"/split/sarFileSplitItems/importSplitItems",
-        downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static',
+        downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static',
         myfileList:[],
         fileList:[],
         fileTypeSatus:false,
diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue
index 6c7a80208..15c818409 100644
--- a/jero-web/src/components/SplitUpload/index.vue
+++ b/jero-web/src/components/SplitUpload/index.vue
@@ -37,7 +37,7 @@
         visible: false,
         uploadAction: window._CONFIG['domianURL'] + '/split/sarFileSplitItems/upload',
         upDataList: [],
-        downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static',
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static',
         fileList: [],
         myfileList: [],
         isLoding: false,
diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue
index 8b17e8f92..1225b1edc 100644
--- a/jero-web/src/components/importSplitUpload/index.vue
+++ b/jero-web/src/components/importSplitUpload/index.vue
@@ -34,7 +34,7 @@
       return {
         visible: false,
         uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
-        downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static',
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static',
         myfileList: [],
         fileList: [],
         fileTypeSatus: false,
diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue
index 5b7c3c846..60d65ec72 100644
--- a/jero-web/src/components/uploadFileChange/file.vue
+++ b/jero-web/src/components/uploadFileChange/file.vue
@@ -106,7 +106,7 @@ export default {
       this.fileTypeSatus = true
     },
     mypreview(item) {
-      let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
+      let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
       window.open(url, '_blank')
     },
     handleChange(info) {
@@ -188,17 +188,17 @@ export default {
       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 {
+      // 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/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue
index 09ba46494..df598bc41 100644
--- a/jero-web/src/components/uploadFileChangeDown/file.vue
+++ b/jero-web/src/components/uploadFileChangeDown/file.vue
@@ -129,7 +129,7 @@ import { mapGetters } from 'vuex'
       this.fileTypeSatus = true
     },
     mypreview(item) {
-      let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
+      let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
       window.open(url, '_blank')
     },
     handleChange(info) {
@@ -211,17 +211,17 @@ import { mapGetters } from 'vuex'
       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))
-      } 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 {
+      // if (fileSuffix === '.pdf') {
+      //   window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
+      // } 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/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 43aaff7fb..e74325c77 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -107,6 +107,7 @@
         conList: [],
         total: 0,
         pageSize: 10,
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         pageNo: 1,
         queryParam: {}
       }

From de16f6920ccf54a9ae3656ecb3afa834a23b4cbf Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 18:23:20 +0800
Subject: [PATCH 16/17] =?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

---
 .../views/projectManagement/components/listOfRegulations.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index e5ee987c5..fa31b4536 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1503,7 +1503,7 @@
             }
           }
           for (let i = 0; i < dataList.length; i++) {
-            if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') &&
+            if ((dataList[i].taskAffirmStatus == 'Not started' || dataList[i].taskAffirmStatus == 'Rejected') &&
               dataList[i].inventoryAffirmStatus == 'Accepted') {
               if (dataList[i].engineeringInterfacePerson) {
                 if (dataList[i].verifyDeliverableType) {

From f9399216374b59a544019bd065d0e45502a02f5b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 20:08:08 +0800
Subject: [PATCH 17/17] =?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/viewFileModel/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue
index 945838eee..6dafa860e 100644
--- a/jero-web/src/components/viewFileModel/index.vue
+++ b/jero-web/src/components/viewFileModel/index.vue
@@ -2,6 +2,7 @@
   <a-modal
     :title="$t('viewFile')"
     :width="600"
+    style="z-index: 1007"
     :visible="visibleFile"
     :maskClosable="false"
     @cancel="visibleFile = false"