From d7a3e26494e0c0f54df9a0fac83f7b3b4487dcef Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 16 Feb 2023 11:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9-=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=A5=E6=9C=9F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/job/PrehomoJob.java | 16 ++++++++-------- .../modules/project/job/VerifyComplianceJob.java | 4 ++-- .../impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- 3 files changed, 12 insertions(+), 12 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 732262bcd..04736c68e 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 @@ -168,15 +168,15 @@ public class PrehomoJob implements Job { } } //如果prehomo - 结束日期是一周后的日期 - if(StringUtils.equals(oneWeekLaterDaysStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ - oneWeeksLaterUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); + if(StringUtils.equals(oneWeekLaterDaysStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + oneWeeksLaterUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); } } //如果prehomo - 逾期后每天通知 - if (!StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))&&projectLawsInventoryEO.getDesignDueDate().before(currentDate)) { - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ - dueUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); + if (!StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))&&projectLawsInventoryEO.getPrehomoDueDate().before(currentDate)) { + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + dueUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); } } } @@ -202,12 +202,12 @@ public class PrehomoJob implements Job { feishuMsgVo.setCnContentLower("项目: " + projectName + "\n法规: " + LAW_CN + "\n发起人: 系统通知"+ - "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); feishuMsgVo.setEnContentUpper("Hello! Your task is overdue. Please check and address it ASAP"); feishuMsgVo.setEnContentLower("Project: " + projectName + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()+ - "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setColor(MsgColorEnum.YELLOW.getValue()); // 颜色 feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo); 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 483c2f80f..5a79ae3bb 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 @@ -201,12 +201,12 @@ public class VerifyComplianceJob implements Job { feishuMsgVo.setCnContentLower("项目: " + projectName + "\n法规: " + LAW_CN + "\n发起人: 系统通知"+ - "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getVerifyDueDate())); feishuMsgVo.setEnContentUpper("Hello! Your task is overdue. Please check and address it ASAP"); feishuMsgVo.setEnContentLower("Project: " + projectName + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()+ - "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getVerifyDueDate())); feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setColor(MsgColorEnum.YELLOW.getValue()); // 颜色 feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo); 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 1b02e6e9c..4dfb665ff 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 @@ -3206,12 +3206,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl