diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 5669af1fd..0338e0810 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/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 lawsOpinionGatherPrcInfo = this.workFlowFeignClient.getLawsOpinionGatherPrcInfo(lawsOpinionGatherId); + //英文标题 + BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(lawsOpinionGatherEO.getStandId()); + + //Map 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 prcName = lawsOpinionGatherPrcInfo.get("prcName"); + //String prcNum = lawsOpinionGatherPrcInfo.get("prcNum"); + //String prcName = lawsOpinionGatherPrcInfo.get("prcName"); String cnContentUpper = ""; String cnContentLower = ""; String enContentUpper = ""; @@ -317,13 +324,13 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl) jsonObject.get("userIdList"); - initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); cnContentUpper = "您好,该任务将于3天后到期,请及时查看处理,谢谢!"; - cnContentLower = "编号: " + prcNum + - "\n标题: " + prcName + - "\n发起人: " + initiator + + cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() + + "\n标题: " + lawsOpinionGatherEO.getTitle() + + "\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") + - "\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") + - "\nInitiator: " + initiator + + enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() + + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() + + "\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) jsonObject.get("userIdList"); - initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); cnContentUpper = "您好,该任务将于今天到期,请尽快查看处理,谢谢!"; - cnContentLower = "编号: " + prcNum + - "\n标题: " + prcName + - "\n发起人: " + initiator; + cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() + + "\n标题: " + lawsOpinionGatherEO.getTitle() + + "\n发起人: 系统通知"; enContentUpper = "Hello! This task will expire today. Please check and address the task ASAP. Thank you!"; - enContentLower = "Regulation No: " + lawsOpinionGatherPrcInfo.get("prcNum") + - "\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") + - "\nInitiator: " + initiator; + enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() + + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() + + "\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 + - "\n标题: " + prcName + - "\n发起人: " + initiator; + cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() + + "\n标题: " + lawsOpinionGatherEO.getTitle() + + "\n发起人: 系统通知"+ + "\n截止时间: " + endTime; enContentUpper = "Hello! The task is completed. Please check it."; - enContentLower = "Regulation No: " + lawsOpinionGatherPrcInfo.get("prcNum") + - "\nTitle: " + lawsOpinionGatherPrcInfo.get("prcName") + - "\nInitiator: " + initiator; + enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() + + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() + + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() + + "\nDue Date: " + endTime; } /*else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_MSG.getValue())){ userIdList = (List) jsonObject.get("userIdList"); @@ -402,7 +408,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, currentUserId)); initiator = currentUser.getUsername(); cnContentUpper = "您好,您提交的评估结果已通过"; - cnContentLower = "编号:" + number + - "\n标题: " + name + + cnContentLower = "编号:" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\n标题: " + lawsTechnologyEvaluationEO.getTitle() + "\n发起人: " + initiator + "\n截止时间: " + endTime; enContentUpper = "Hello! The assessment result you submitted has passed"; - enContentLower = "Regulation No :" + number + - "\nTitle: " + name + + enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\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().lambda().eq(SysUser::getId, currentUserId)); initiator = currentUser.getUsername(); cnContentUpper = "您好,您提交的评估结果被退回,请及时查看处理"; - cnContentLower = "编号:" + number + - "\n标题: " + name + + cnContentLower = "编号:" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\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 + - "\nTitle: " + name + + enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\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 + - "\n标题: " + name + - "\n发起人: " + initiator; + cnContentLower = "编号:" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\n标题: " + lawsTechnologyEvaluationEO.getTitle() + + "\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 + - "\nTitle: " + name + - "\nInitiator: " + initiator; + enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() + + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); userIdList = (List) 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 + - "\n标题: " + name + - "\n发起人: " + initiator; + cnContentLower = "编号:" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\n标题: " + lawsTechnologyEvaluationEO.getTitle() + + "\n发起人: 系统通知"; enContentUpper = "Hello! This task will expire today. Please check and address the task ASAP. Thank you!"; - enContentLower = "Regulation No :" + number + - "\nTitle: " + name + - "\nInitiator: " + initiator; + enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() + + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() + + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); userIdList = (List) 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