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 f492b4be3..91357f86b 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
@@ -2495,19 +2495,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			//taskType = "Regulation Task Confirmation";
 
-			initiator = studioUserInfo.getUsername();
-			initiatorLark = studioUserInfo.getUsername();
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
 
 			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
 			cnContentLower = "项目: " + PRN +
 					"\n法规: " + LAW_CN +
-					"\n发起人: " + initiatorLark +
+					"\n发起人: " + sysUser.getUsername() +
 					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
 			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
 			enContentLower = "Project: " + PRN +
 					"\nRegulation No: " + LAW_EN +
-					"\nInitiator: " + initiatorLark +
+					"\nInitiator: " + sysUser.getUsername() +
 					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
 			color = MsgColorEnum.GREEN.getValue();
 
@@ -2525,8 +2525,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			//taskType = "Regulation Task Confirmation";
 
-			initiator = studioUserInfo.getUsername();
-			initiatorLark = studioUserInfo.getUsername();
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
 
 
 			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
@@ -2554,8 +2554,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			//taskType = "Regulation Task Confirmation";
 
-			initiator = studioUserInfo.getUsername();
-			initiatorLark = studioUserInfo.getUsername();
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
 
 			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
 			cnContentUpper = "您好，该任务被"+ sysUser.getUsername() +"退回，请及时查看处理";
@@ -2582,8 +2582,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			//taskType = "Regulation Task Confirmation";
 
-			initiator = studioUserInfo.getUsername();
-			initiatorLark = studioUserInfo.getUsername();
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
 
 			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
 			cnContentUpper = "您好，"+ sysUser.getUsername() +"已向您提交回复，请及时查看处理";
@@ -2611,8 +2611,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
 			//taskType = "Regulation Task Confirmation";
 
-			initiator = studioUserInfo.getUsername();
-			initiatorLark = studioUserInfo.getUsername();
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
 
 			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
 			cnContentUpper = "您好，该任务被"+ sysUser.getUsername() +"拒绝，请及时查看处理";
@@ -2655,11 +2655,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Design Compliance Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
-					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
-			);
-			initiatorLark = initiatorLarkInfo.getUsername();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
 
 			msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
@@ -2687,22 +2687,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Pre-Homo Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 
-			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
-					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
-			);
-			initiatorLark = initiatorLarkInfo.getUsername();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
 			msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
 			cnContentLower = "项目: " + PRN +
 					"\n法规: " + LAW_CN +
-					"\n发起人: " + initiatorLark +
+					"\n发起人: " + sysUser.getUsername() +
 					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
 			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
 			enContentLower = "Project: " + PRN +
 					"\nRegulation No: " + LAW_EN +
-					"\nInitiator: " + initiatorLark +
+					"\nInitiator: " + sysUser.getUsername() +
 					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
 			color = MsgColorEnum.GREEN.getValue();
 
@@ -2719,22 +2719,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Validation Compliance Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
-					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
-			);
-			initiatorLark = initiatorLarkInfo.getUsername();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
 
 			msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
 			cnContentLower = "项目: " + PRN +
 					"\n法规: " + LAW_CN +
-					"\n发起人: " + initiatorLark +
+					"\n发起人: " + sysUser.getUsername() +
 					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
 			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
 			enContentLower = "Project: " + PRN +
 					"\nRegulation No: " + LAW_EN +
-					"\nInitiator: " + initiatorLark +
+					"\nInitiator: " + sysUser.getUsername() +
 					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
 			color = MsgColorEnum.GREEN.getValue();
 
@@ -2751,7 +2751,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Design Compliance Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+            msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+            cnContentUpper = "您好，"+ sysUser.getUsername() +"已完成任务，请审查";
+            cnContentLower = "项目: " + PRN +
+                    "\n法规: " + LAW_CN +
+                    "\n发起人: " + sysUser.getUsername() +
+                    "\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+            enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it";
+            enContentLower = "Project: " + PRN +
+                    "\nRegulation No: " + LAW_EN +
+                    "\nInitiator: " + sysUser.getUsername() +
+                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+            color = MsgColorEnum.GREEN.getValue();
+
 			//feishuMsgVo.setAssignee(sysUser.getUsername());
 //			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
 //					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
@@ -2770,7 +2784,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Pre-Homo Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+            msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+            cnContentUpper = "您好，"+ sysUser.getUsername() +"已完成任务，请审查";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+            enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it";
+            enContentLower = "Project: " + PRN +
+                    "\nRegulation No: " + LAW_EN +
+                    "\nInitiator: " + sysUser.getUsername() +
+                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+            color = MsgColorEnum.GREEN.getValue();
+
 			//feishuMsgVo.setAssignee(sysUser.getUsername());
 //			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
 //					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
@@ -2789,7 +2817,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Validation Compliance Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+            msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+            cnContentUpper = "您好，"+ sysUser.getUsername() +"已完成任务，请审查";
+            cnContentLower = "项目: " + PRN +
+                    "\n法规: " + LAW_CN +
+                    "\n发起人: " + sysUser.getUsername() +
+                    "\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+            enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it";
+            enContentLower = "Project: " + PRN +
+                    "\nRegulation No: " + LAW_EN +
+                    "\nInitiator: " + sysUser.getUsername() +
+                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+            color = MsgColorEnum.GREEN.getValue();
+
 			//feishuMsgVo.setAssignee(sysUser.getUsername());
 //			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
 //					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
@@ -2808,11 +2850,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Design Compliance Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
-					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
-			);
-			initiatorLark = initiatorLarkInfo.getUsername();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+
+			msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查通过";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " +sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! The task has been approved by initiator";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " +sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
 			userIdList.add(prehomoDutyId);
@@ -2826,11 +2882,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Pre-Homo Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
-					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
-			);
-			initiatorLark = initiatorLarkInfo.getUsername();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+			msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查通过";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " +sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! The task has been approved by initiator";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " +sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
 			userIdList.add(verifyDutyId);
@@ -2844,11 +2913,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 			//taskType = "Validation Compliance Confirmation";
 
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
-					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
-			);
-			initiatorLark = initiatorLarkInfo.getUsername();
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+
+			msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查通过";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " +sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! The task has been approved by initiator";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " +sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgTitle)){
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 535c324df..07223eb90 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
@@ -1009,7 +1009,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		String personChargeFeedback = "";
 
 
-		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+		//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String dutDateStr = "";
 
@@ -1017,90 +1017,138 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		String msgContentEN = "";
 		String msgTitle = "";
 
+		String cnContentUpper = "";//中文上部分
+		String cnContentLower = "";//中文下部分
+		String enContentUpper = "";//英文上部分
+		String enContentLower = "";//英文下部分
+
+
+		//项目名称
+		String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
+		String PRN = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion;
+
+		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
+		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+		String LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
-			taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
+			//taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
 
 			if(projectLawsInventoryEO.getDesignDueDate() != null){
 				dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
 			}
 
-			msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
-					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-					+ " to you. Please check and handle it in time.";
-			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-					+ ": You have a design compliance task to complete";
 
-			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.COMPLIANCE_CONFIRMATION;
+			//msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
+			//		+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ " to you. Please check and handle it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a design compliance task to complete";
+
+			//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.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_RETURN_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId");//设计符合性流程责任人id
 			userIdList.add(designDutyId);
 
-			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
+
+			//taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
 			if(projectLawsInventoryEO.getDesignDueDate() != null){
 				dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
 			}
+			msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查退回，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + dutDateStr;
+			enContentUpper = "Hello! The task has been rejected by initiator after review. Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + dutDateStr;
+			//msgContentEN = "The design compliance information of " + serialNumber + " in "
+			//		+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ " you sumitted has been rejected after review. Please check and address it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a design compliance task to complete";
 
-			msgContentEN = "The design compliance information of " + serialNumber + " in "
-					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-					+ " you sumitted has been rejected after review. Please check and address it in time.";
-			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 rejected after review. Please check and address it in a timely manner.");
+			//feishuMsgVo.setTaskType("Design Compliance Confirmation");
 
-			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.COMPLIANCE_CONFIRMATION;
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_RETURN_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId");//prehomo流程责任人id
 			userIdList.add(prehomoDutyId);
 
-			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
+			//taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
 			if(projectLawsInventoryEO.getPrehomoDueDate() != null){
 				dutDateStr = sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
 			}
+			msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查退回，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + dutDateStr;
+			enContentUpper = "Hello! The task has been rejected by initiator after review. Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + dutDateStr;
 
-			msgContentEN = "The Pre-Homo confirmation of " + serialNumber + " in "
-					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-					+ " you sumitted has been rejected after review. Please check and address it in time.";
-			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-					+ ": You have a Pre-Homo task to complete";
+			//msgContentEN = "The Pre-Homo confirmation of " + serialNumber + " in "
+			//		+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ " you sumitted has been rejected after review. Please check and address it in time.";
+			//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 rejected after review. Please check and address it in a timely manner.");
-			feishuMsgVo.setTaskType("Pre-Homo Confirmation");
+			//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.COMPLIANCE_CONFIRMATION;
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_RETURN_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId");//验证符合性流程责任人id
 			userIdList.add(verifyDutyId);
 
-			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
+			//taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
 			if(projectLawsInventoryEO.getVerifyDueDate() != null){
 				dutDateStr = sdf.format(projectLawsInventoryEO.getVerifyDueDate());
 			}
+			msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查退回，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + dutDateStr;
+			enContentUpper = "Hello! The task has been rejected by initiator after review. Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + dutDateStr;
+			//msgContentEN = "The validation compliance information of " + serialNumber + " in "
+			//		+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ " you sumitted has been rejected after review. Please check and address it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a validation compliance task to complete";
 
-			msgContentEN = "The validation compliance information of " + serialNumber + " in "
-					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-					+ " you sumitted has been rejected after review. Please check and address it in time.";
-			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 rejected after review. Please check and address it in a timely manner.");
+			//feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 
-			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.COMPLIANCE_CONFIRMATION;
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 		}
 		/*55360问题。
 		feishuMsgVo.setDueDate(dutDateStr);
 		feishuMsgVo.setInitiator(sysUser.getUsername());
 		*/
-		feishuMsgVo.setRegulationNo(serialNumber);
-		feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+		//feishuMsgVo.setRegulationNo(serialNumber);
+		//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
 
 		/*//根据流程实例id，查询待办id
@@ -1156,7 +1204,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			personChargeFeedback = projectTaskInventoryEO.getVerifyPersonChargeFeedback();
 		}*/
 
-		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
+		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgTitle)){
 
 			//飞书跳转链接
 			String hrefFeishu = backUrl
@@ -1166,13 +1214,32 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 					+ projectYearNameInfoEO.getYearName()
 					+ projectLibraryBase.getTargetMarket();
+
+			List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
+			List<String> thirdIdList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(sysUsers)){
+				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+			}
+			try {
+				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+				feishuMsgVo.setTitle(msgTitle);
+				feishuMsgVo.setCnContentUpper(cnContentUpper);
+				feishuMsgVo.setCnContentLower(cnContentLower);
+				feishuMsgVo.setEnContentUpper(enContentUpper);
+				feishuMsgVo.setEnContentLower(enContentLower);
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+			} catch (IOException e) {
+				log.error("飞书消息推送失败");
+			}
 			//系统内部跳转链接
-			String href = "<a href='"
-					+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
-					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
-					+ projectYearNameInfoEO.getYearName()
-					+ projectLibraryBase.getTargetMarket()
-					+ "'>" + " View details" + "</a>";
+			//String href = "<a href='"
+			//		+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+			//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+			//		+ projectYearNameInfoEO.getYearName()
+			//		+ projectLibraryBase.getTargetMarket()
+			//		+ "'>" + " View details" + "</a>";
 
 			//飞书跳转链接 拼接跳转至任务详情页参数
 			/*String hrefFeishu = backUrl
@@ -1224,13 +1291,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					+ "&primaryKeyId=" + primaryKeyId
 					+ "&PersonChargeFeedback=" + personChargeFeedback
 					+ "'>" + " View details" + "</a>";*/
-			String contentInfo = msgContentEN + " " + href;
-			Map<String,Object> sendMessageMap = new HashMap<>();
-			sendMessageMap.put("hrefFeishu",hrefFeishu);
-			sendMessageMap.put("contentInfo",contentInfo);
+			//String contentInfo = msgContentEN + " " + href;
+			//Map<String,Object> sendMessageMap = new HashMap<>();
+			//sendMessageMap.put("hrefFeishu",hrefFeishu);
+			//sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+			//SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 	}
 
diff --git a/jero-web/src/views/system/QuartzJobList.vue b/jero-web/src/views/system/QuartzJobList.vue
index cd54b0701..db0d65e90 100644
--- a/jero-web/src/views/system/QuartzJobList.vue
+++ b/jero-web/src/views/system/QuartzJobList.vue
@@ -126,6 +126,13 @@
         description: '定时任务在线管理',
         // 查询条件
         queryParam: {},
+        ipagination: {
+          total: 0,
+          pageSize: 20,//每页中显示10条数据
+          showSizeChanger: true,
+          pageSizeOptions: ["10", "20", "50", "100"],//每页中显示的数据
+          showTotal: total => `共有 ${total} 条数据`,  //分页中显示总的数据
+        },
         // 表头
         columns: [
           {