From ab37f47e77e44fbb816f4b0aeaf234cd83d0293e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 19 Jul 2022 18:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E7=B3=BB=E7=BB=9F=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/enums/MessageTypeEnum.java       | 23 +++++-----
 .../project/job/InventoryAffirmJob.java       |  4 +-
 .../jero/modules/project/job/PrehomoJob.java  |  4 +-
 .../project/job/VerifyComplianceJob.java      |  4 +-
 .../project/job/designComplianceJob.java      |  4 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 42 +++++++++----------
 ...ojectTaskInventoryDetailEOServiceImpl.java |  6 +--
 .../ProjectTaskInventoryEOServiceImpl.java    | 14 +++----
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 12 +++---
 9 files changed, 58 insertions(+), 55 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 b6a2c2aa7..ec408861a 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
@@ -11,17 +11,20 @@ public enum MessageTypeEnum {
     PUSH("Share / Forward","3"),
     HOMO_TASK("Homo Parameter Task","4"),
     TASK("Regulation Compliance Task", "5"),
-    REGULATION_LIST_CONFIRMATION_TASK("Regulation List Confirmation Task", "6"), // 清单确认任务
-    REGULATION_LIST_CONFIRMATION_NOTIFICATION("Regulation List Confirmation Notification", "7"), // 清单确认通知
-    REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation", "8"), // 任务确认任务
-    REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
-    DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
-    PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
-    VALIDATION_TASK("Validation 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"), // 验证符合性通知
+    //REGULATION_LIST_CONFIRMATION_TASK("Regulation List Confirmation Task", "6"), // 清单确认任务
+    //REGULATION_LIST_CONFIRMATION_NOTIFICATION("Regulation List Confirmation Notification", "7"), // 清单确认通知
+    //REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation", "8"), // 任务确认任务
+    //REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
+    //DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
+    //PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
+    //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"), // 验证符合性通知
     SYSTEMATIC_NOTIFICATION("Systematic Notification", "15"), // 系统通知
+    LIST_CONFIRMATION("List Confirmation", "17"), // 清单确认
+    TASK_CONFIRMATION("Task Confirmation", "18"), // 任务确认
+    COMPLIANCE_CONFIRMATION("Compliance Confirmation", "19"), // 符合性确认
     ;
 
     String name;
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 cde692da6..bd9170331 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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,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 b48b7cb28..ac17549ce 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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.COMPLIANCE_CONFIRMATION,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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.COMPLIANCE_CONFIRMATION,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 606e4baad..7acc1e185 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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.COMPLIANCE_CONFIRMATION,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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.COMPLIANCE_CONFIRMATION,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 a2714f2c6..1ea8abeb1 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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.COMPLIANCE_CONFIRMATION,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,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.COMPLIANCE_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
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 4affa4edb..372956882 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
@@ -1377,7 +1377,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,currentUser.getUsername());
+					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,currentUser.getUsername());
 				}
 
 				result = "发起清单确认";
@@ -1518,7 +1518,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,studioUserInfo.getUsername());
+									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
 
 								}
 
@@ -1559,7 +1559,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,studioUserInfo.getUsername());
+									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
 								}
 							}
 
@@ -1609,7 +1609,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,studioUserInfo.getUsername());
+								sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
 							}
 						}
 					}
@@ -2122,7 +2122,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;
+			messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			taskType = "Regulation Task Confirmation";
 
 			initiator = studioUserInfo.getUsername();
@@ -2136,7 +2136,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;
+			messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			taskType = "Regulation Task Confirmation";
 			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
@@ -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;
+			messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			taskType = "Regulation Task Confirmation";
 			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
@@ -2160,7 +2160,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;
+			messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			taskType = "Regulation Task Confirmation";
 			initiator = studioUserInfo.getUsername();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
@@ -2172,7 +2172,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;
+			messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			taskType = "Regulation Task Confirmation";
 			initiator = studioUserInfo.getUsername();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
@@ -2184,7 +2184,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;
+			messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			taskType = "Regulation Task Confirmation";
 			initiator = studioUserInfo.getUsername();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
@@ -2197,7 +2197,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Design Compliance Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
@@ -2210,7 +2210,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
-			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Pre-Homo Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
@@ -2223,7 +2223,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
-			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Validation Compliance Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){
@@ -2236,7 +2236,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Design Compliance Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){
@@ -2249,7 +2249,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
 
-			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Pre-Homo Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){
@@ -2262,7 +2262,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
 
-			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Validation Compliance Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){
@@ -2275,7 +2275,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_NOTIFICATION;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Design Compliance Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){
@@ -2288,7 +2288,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
 
-			messageTypeEnum = MessageTypeEnum.PRE_HOMO_NOTIFICATION;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Pre-Homo Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){
@@ -2301,7 +2301,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
 
-			messageTypeEnum = MessageTypeEnum.VALIDATION_COMPLIANCE_NOTIFICATION;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			taskType = "Validation Compliance Confirmation";
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}
@@ -6696,7 +6696,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
+					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
 				}
 			}
 
@@ -6752,7 +6752,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK,studioUserInfo.getUsername());
+					sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,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 c3e6664ba..9201fba57 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
@@ -322,7 +322,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.PREHOMO_ISSUE_DRE_MSG.getValue())){
 			//XXX has distributed the Pre-Homo confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
 			msgContentEN = currentUser.getUsername() + " has assigned the Pre-Homo confirmation process of "
@@ -337,7 +337,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
-			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.VERIFY_ISSUE_DRE_MSG.getValue())){
 			//XXX has distributed the Verify compliance confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
 			msgContentEN = currentUser.getUsername() + " has assigned the validation compliance confirmation process of "
@@ -352,7 +352,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
-			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}
 		if(CollectionUtils.isNotEmpty(userIdList) && org.apache.commons.lang3.StringUtils.isNotEmpty(msgContentEN)){
 			//飞书跳转链接
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 a8f3e12f5..4e5f4babf 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
@@ -371,7 +371,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_REMIND_MSG.getValue())){
 			//Please check and deal with the Pre-Homo confirmation process of GB 7258 in XXX (project name) in time.
 			msgContentEN = "Please check and address the Pre-Homo confirmation process of "
@@ -385,7 +385,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
-			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.VERIFY_REMIND_MSG.getValue())){
 			//Please check and deal with the Verify compliance confirmation process of GB 7258 in XXX (project name) in time.
 			msgContentEN = "Please check and address the validation compliance confirmation process of "
@@ -399,7 +399,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
-			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
@@ -795,7 +795,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time.");
 			feishuMsgVo.setTaskType("Design Compliance Confirmation");
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_RETURN_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId");//设计符合性流程责任人id
 			userIdList.add(designDutyId);
@@ -815,7 +815,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Design Compliance Confirmation");
 
-			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_RETURN_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId");//prehomo流程责任人id
 			userIdList.add(prehomoDutyId);
@@ -835,7 +835,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Pre-Homo Confirmation");
 
-			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_RETURN_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId");//验证符合性流程责任人id
 			userIdList.add(verifyDutyId);
@@ -855,7 +855,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 
-			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}
 		/*55360问题。
 		feishuMsgVo.setDueDate(dutDateStr);
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 bef2abbfe..47eecc5bc 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
@@ -174,7 +174,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					feishuMsgVo.setTaskType("Design Compliance Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
 
-					messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+					messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 				}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
 					msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
 							+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -185,7 +185,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					feishuMsgVo.setTaskType("Pre-Homo Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
 
-					messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+					messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 				}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
 					msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
 							+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -196,7 +196,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
 
-					messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+					messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 				}
 
 				//飞书跳转链接
@@ -376,7 +376,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					feishuMsgVo.setTaskType("Design Compliance Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
 
-					messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+					messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 				}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
 					msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of "
 							+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -387,7 +387,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					feishuMsgVo.setTaskType("Pre-Homo Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
 
-					messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+					messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 				}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
 					msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of "
 							+ projectLawsInventoryEO.getSerialNumber() + " in "
@@ -398,7 +398,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
 
-					messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+					messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 				}
 
 				//飞书跳转链接