WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
CD
2022-11-02 17:56:11 +08:00
parent 340bc851ea
commit cc54e5dcaa
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+2 -4
View File
@@ -360,13 +360,11 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！"; cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！";
cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() + cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
"\n标题: " + lawsOpinionGatherEO.getTitle() + "\n标题: " + lawsOpinionGatherEO.getTitle() +
"\n发起人: 系统通知" + "\n发起人: 系统通知" ;
"\n截止时间: " + endTime;
enContentUpper = "Hello! This task will expire in 3 days. Please check and address the task in a timely manner. Thank you!"; enContentUpper = "Hello! This task will expire in 3 days. Please check and address the task in a timely manner. Thank you!";
enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() + enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
"\nTitle: " + bussDocumentLibraryEO.getTitleEn() + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
"\nDue Date: " + endTime;
} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue())){ } else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue())){
userIdList = (List<String>) jsonObject.get("userIdList"); userIdList = (List<String>) jsonObject.get("userIdList");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java
+1 -1
View File
@@ -157,7 +157,7 @@ public class TaskAffirmJob implements Job {
//飞书跳转链接 //飞书跳转链接
String hrefFeishu = backUrl String hrefFeishu = backUrl
+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink(); + "/projectRegulationTasks";
//项目名称 //项目名称
String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion(); String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5 -4
View File
@@ -8675,6 +8675,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
); );
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> { projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> {
//如果清单确认状态为待确认的，进行催办 //如果清单确认状态为待确认的，进行催办
@@ -8753,11 +8754,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn()); feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！"); feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
feishuMsgVo.setCnContentLower("项目: " + PRN + feishuMsgVo.setCnContentLower("项目: " + PRN +
"\n发起人: 系统通知" + "\n发起人: " + currentUser.getUsername() +
"\n截止时间: " + dueDate); "\n截止时间: " + dueDate);
feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!"); feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
feishuMsgVo.setEnContentLower("Project: " + PRN + feishuMsgVo.setEnContentLower("Project: " + PRN +
"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() + "\nInitiator: " + currentUser.getUsername() +
"\nDue Date: "+ dueDate); "\nDue Date: "+ dueDate);
feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setUrl(hrefFeishu);
feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
@@ -8840,12 +8841,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！"); feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
feishuMsgVo.setCnContentLower("项目: " + PRN + feishuMsgVo.setCnContentLower("项目: " + PRN +
"\n法规: " + projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle() + "\n法规: " + projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle() +
"\n发起人: 系统通知" + "\n发起人: " + currentUser.getUsername() +
"\n截止时间: " + dueDate); "\n截止时间: " + dueDate);
feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!"); feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
feishuMsgVo.setEnContentLower("Project: " + PRN + feishuMsgVo.setEnContentLower("Project: " + PRN +
"\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() + "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() + "\nInitiator: " + currentUser.getUsername() +
"\nDue Date: "+ dueDate); "\nDue Date: "+ dueDate);
feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setUrl(hrefFeishu);
feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色