From e4428fff01b7db7911c429aaed654498eaf253c3 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 4 Nov 2022 18:56:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/job/PrehomoJob.java | 6 ++- .../modules/project/job/TaskAffirmJob.java | 37 ++++++++++++++++-- .../project/job/VerifyComplianceJob.java | 6 ++- .../project/job/designComplianceJob.java | 6 ++- .../ProjectLawsInventoryEOServiceImpl.java | 38 ++++++++++++++++--- ...ojectTaskInventoryDetailEOServiceImpl.java | 16 +++++--- .../ProjectTaskInventoryEOServiceImpl.java | 25 ++++++++++-- ...ectTaskInventoryFeedbackEOServiceImpl.java | 24 ++++++++++-- 8 files changed, 133 insertions(+), 25 deletions(-) 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 915893fa7..732262bcd 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 @@ -141,7 +141,11 @@ public class PrehomoJob implements Job { if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) { LAW_EN = LAW_CN; } else { - LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) { + LAW_EN = LAW_CN; + } else { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + } } List twoWeeksLaterUserIdList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index a865ab379..a0dc66fd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -173,6 +173,16 @@ public class TaskAffirmJob implements Job { //法规中英文 ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectById(key); BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId()); + String LAW_EN = ""; + if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle(); + } else { + if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle(); + } else { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + } + } try { FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); feishuMsgVo.setTitle(MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn()); @@ -182,7 +192,7 @@ public class TaskAffirmJob implements Job { "\n发起人: 系统通知"); feishuMsgVo.setEnContentUpper("Hello! This task will expire in 3 days. Please check and address it in a timely manner. Thank you!"); feishuMsgVo.setEnContentLower("Project:" + PRN + - "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() + + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 @@ -205,6 +215,16 @@ public class TaskAffirmJob implements Job { //法规中英文 ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectById(key); BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId()); + String LAW_EN = ""; + if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle(); + } else { + if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle(); + } else { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + } + } try { FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); feishuMsgVo.setTitle(MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn()); @@ -214,7 +234,7 @@ public class TaskAffirmJob implements Job { "\n发起人: 系统通知"); feishuMsgVo.setEnContentUpper("Hello! This task will expire today. Please check and address the task ASAP. Thank you!"); feishuMsgVo.setEnContentLower("Project:" + PRN + - "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() + + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 @@ -236,7 +256,16 @@ public class TaskAffirmJob implements Job { //法规中英文 ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectById(key); BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId()); - + String LAW_EN = ""; + if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle(); + } else { + if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle(); + } else { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + } + } String dueDate = sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()); try { FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); @@ -248,7 +277,7 @@ public class TaskAffirmJob implements Job { "\n截止时间: " + dueDate); feishuMsgVo.setEnContentUpper("Hello! This task is overdue. Please address it ASAP. Thank you!"); feishuMsgVo.setEnContentLower("Project:" + PRN + - "\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() + + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() + "\nDue Date: " + dueDate); feishuMsgVo.setUrl(hrefFeishu); 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 65b071784..483c2f80f 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 @@ -140,7 +140,11 @@ public class VerifyComplianceJob implements Job { if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) { LAW_EN = LAW_CN; } else { - LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) { + LAW_EN = LAW_CN; + } else { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + } } List twoWeeksLaterUserIdList = new ArrayList<>(); 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 129d65395..ab755ed00 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 @@ -140,7 +140,11 @@ public class designComplianceJob implements Job { if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) { LAW_EN = LAW_CN; } else { - LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) { + LAW_EN = LAW_CN; + } else { + LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规 + } } 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 658151bf5..aa83828fc 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 @@ -1638,6 +1638,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl thirdIdList = new ArrayList<>(); List sysUsers = sysUserService.listByIds(taskAffirmUserIdList); @@ -8845,7 +8873,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl