bug 61985、61981、61980、61964

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -2947,7 +2947,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 				String title = MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn();
 				String cnContentLower = "项目: " + projectInfo.getProjectName() +
-						"\n发起人: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+						"\n发起人: 系统通知";
 				String enContentLower = "Project: " + projectInfo.getProjectName() +
 						"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 				if (!seven.isEmpty()) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java

@@ -10,6 +10,8 @@ import com.jero.common.constant.enums.MessageTypeEnum;
 import com.jero.common.constant.enums.MsgColorEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.feishu.vo.FeishuMsg2Vo;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
@@ -85,6 +87,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 	private IProcessInfoEOService processInfoEOService;
 	@Autowired
 	private IFeishuService feishuService;
+	@Autowired
+	private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
 
 	/**
 	 * 保存
@@ -296,12 +300,15 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 		//String msgTitle = "";
 
 		LawsOpinionGatherEO lawsOpinionGatherEO = queryById(lawsOpinionGatherId);
-		Map<String, String> lawsOpinionGatherPrcInfo = this.workFlowFeignClient.getLawsOpinionGatherPrcInfo(lawsOpinionGatherId);
+		//英文标题
+		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(lawsOpinionGatherEO.getStandId());
+
+		//Map<String, String> lawsOpinionGatherPrcInfo = this.workFlowFeignClient.getLawsOpinionGatherPrcInfo(lawsOpinionGatherId);
 		String initiator = "";
 		String title = MessageType2Enum.REGULATION_OPINION_COLLECTION.getCn() + "/" + MessageType2Enum.REGULATION_OPINION_COLLECTION.getEn();
 		String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsOpinionGatherEO.getEndTime());//截止日期
-		String prcNum = lawsOpinionGatherPrcInfo.get("prcNum");
+		//String prcNum = lawsOpinionGatherPrcInfo.get("prcNum");
-		String prcName = lawsOpinionGatherPrcInfo.get("prcName");
+		//String prcName = lawsOpinionGatherPrcInfo.get("prcName");
 		String cnContentUpper = "";
 		String cnContentLower = "";
 		String enContentUpper = "";
@@ -317,13 +324,13 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
-			cnContentLower = "编号: " + prcNum +
+			cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\n标题: " + prcName +
+					"\n标题: " + lawsOpinionGatherEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
-			enContentLower = "Regulation No: " + prcNum +
+			enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\nTitle: " + prcName +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 
@@ -337,56 +344,55 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交反馈意见，请查看";
-			cnContentLower = "编号: " + prcNum +
+			cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\n标题: " + prcName +
+					"\n标题: " + lawsOpinionGatherEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the comments. Please check it";
-			enContentLower = "Regulation No: " + lawsOpinionGatherPrcInfo.get("prcNum") +
+			enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue())) {
 			userIdList = (List<String>) jsonObject.get("userIdList");
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 
 			cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！";
-			cnContentLower = "编号: " + prcNum +
+			cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\n标题: " + prcName +
+					"\n标题: " + lawsOpinionGatherEO.getTitle() +
-					"\n发起人: " + initiator +
+					"\n发起人: 系统通知" +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! This task will expire in 3 days. Please check and address the task in a timely manner. Thank you!";
-			enContentLower = "Regulation No: " + lawsOpinionGatherPrcInfo.get("prcNum") +
+			enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
-					"\nInitiator: " + initiator +
+					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
 					"\nDue Date: " + endTime;
 
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue())){
 			userIdList = (List<String>) jsonObject.get("userIdList");
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 
 			cnContentUpper = "您好，该任务将于今天到期，请尽快查看处理，谢谢！";
-			cnContentLower = "编号: " + prcNum +
+			cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\n标题: " + prcName +
+					"\n标题: " + lawsOpinionGatherEO.getTitle() +
-					"\n发起人: " + initiator;
+					"\n发起人: 系统通知";
 			enContentUpper = "Hello! This task will expire today. Please check and address the task ASAP. Thank you!";
-			enContentLower = "Regulation No: " + lawsOpinionGatherPrcInfo.get("prcNum") +
+			enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
-					"\nInitiator: " + initiator;
+					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_COMPLETE_MSG.getValue())) {
 			userIdList.add((String) jsonObject.get("initiatorUserId"));
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 
 			cnContentUpper = "您好，该任务已完成，请查看";
-			cnContentLower = "编号: " + prcNum +
+			cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\n标题: " + prcName +
+					"\n标题: " + lawsOpinionGatherEO.getTitle() +
-					"\n发起人: " + initiator;
+					"\n发起人: 系统通知"+
+					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! The task is completed. Please check it.";
-			enContentLower = "Regulation No: " + lawsOpinionGatherPrcInfo.get("prcNum") +
+			enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
-					"\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
-					"\nInitiator: " + initiator;
+					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
+					"\nDue Date: " + endTime;
 		}
 		/*else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_MSG.getValue())){
 			userIdList = (List<String>) jsonObject.get("userIdList");
@@ -402,7 +408,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 			thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 		}
 		//飞书跳转链接
-		String hrefFeishu =  backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
+		String hrefFeishu =  backUrl + JumpLinkEnum.FGPG_TODO_CENTER_LINK.getLink();
 		try {
 			FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
 			feishuMsgVo.setTitle(title);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.enums.FieldTypeEnum;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
 import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
@@ -628,11 +629,14 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		String initiator = "";
 		String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId");
 		LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = queryById(lawsTechnologyEvaluationId);
-		LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId);
+		//LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId);
-		String number = flowDetailEO.getPrcNum();
+		//String number = flowDetailEO.getPrcNum();
-		String name = flowDetailEO.getPrcName();
+		//String name = flowDetailEO.getPrcName();
 		String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsTechnologyEvaluationEO.getEndTime());
 
+		//英文标题
+		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(lawsTechnologyEvaluationEO.getStandId());
+
 		String title = MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getCn() + "/" + MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getEn();
 		String cnContentUpper = "";
 		String cnContentLower = "";
@@ -650,13 +654,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
-			cnContentLower = "编号：" + number +
+			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\n标题: " + name +
+					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
-			enContentLower = "Regulation No :" + number +
+			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\nTitle: " + name +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){
@@ -670,13 +674,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交评估结果，请审核";
-			cnContentLower = "编号：" + number +
+			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\n标题: " + name +
+					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the assessment result. Please review it";
-			enContentLower = "Regulation No :" + number +
+			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\nTitle: " + name +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){
@@ -688,13 +692,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，您提交的评估结果已通过";
-			cnContentLower = "编号：" + number +
+			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\n标题: " + name +
+					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! The assessment result you submitted has passed";
-			enContentLower = "Regulation No :" + number +
+			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\nTitle: " + name +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG.getValue())){
@@ -706,37 +710,35 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，您提交的评估结果被退回，请及时查看处理";
-			cnContentLower = "编号：" + number +
+			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\n标题: " + name +
+					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! The assessment result you submitted has been rejected. Please check and address it in a timely manner";
-			enContentLower = "Regulation No :" + number +
+			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\nTitle: " + name +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue())) {
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！";
-			cnContentLower = "编号：" + number +
+			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\n标题: " + name +
+					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
-					"\n发起人: " + initiator;
+					"\n发起人: 系统通知";
 			enContentUpper = "Hello! This task will expire in 3 days. Please check and address the task in a timely manner. Thank you!";
-			enContentLower = "Regulation No :" + number +
+			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\nTitle: " + name +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
-					"\nInitiator: " + initiator;
+					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			userIdList = (List<String>) jsonObject.get("userIdList");
 
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue())) {
-			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			cnContentUpper = "您好，该任务将于今天到期，请尽快查看处理，谢谢！";
-			cnContentLower = "编号：" + number +
+			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\n标题: " + name +
+					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
-					"\n发起人: " + initiator;
+					"\n发起人: 系统通知";
 			enContentUpper = "Hello! This task will expire today. Please check and address the task ASAP. Thank you!";
-			enContentLower = "Regulation No :" + number +
+			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
-					"\nTitle: " + name +
+					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
-					"\nInitiator: " + initiator;
+					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			userIdList = (List<String>) jsonObject.get("userIdList");
 
 		} /*else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())) {
@@ -754,7 +756,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 		}
 		//飞书跳转链接
-		String hrefFeishu =  backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
+		String hrefFeishu =  backUrl + JumpLinkEnum.FGPG_TODO_CENTER_LINK.getLink();
 		try {
 			FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
 			feishuMsgVo.setTitle(title);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java

@@ -18,6 +18,8 @@ public enum JumpLinkEnum {
     VERIFY_AFFIRM_LINK("验证符合性确认链接","3","/ProjectDetails?id=","&type=103"),
     DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"),
     TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""),
+    FGPG_TODO_CENTER_LINK("法规评估任务待办中心链接","88","/regulatoryAssessmentTasks",""),
+    XMCS_TODO_CENTER_LINK("项目参数任务待办中心链接","99","/projectParameterTasks",""),
     COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""),
 
     PROBLEM_KNOWLEDGE_BASE_DETAIL("问题知识库，详情页","","/problemKnowledgeBaseView",""),