From 6c2e4a0c9cc994a80b936bd01f973cc5b5763e61 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 22 Nov 2023 14:40:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java index 274310c..08a9242 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java @@ -231,7 +231,8 @@ public class EarlyWarningInstanceNotStartTask { List noticeTypes = noticeMap.get(needToWaringProject.getProjectCode()); for(Integer noticeType : noticeTypes) { for (String employeeCode : batchEmployees) { - earlyWarningManage.doEarlyWarning(noticeMethod, Objects.nonNull(noticeType) && noticeType.equals(1) ? noticeContent : adventContent, time, biz, + earlyWarningManage.doEarlyWarning(noticeMethod, Objects.nonNull(noticeType) && noticeType.equals(1) ? noticeContent : adventContent, + Objects.nonNull(noticeType) && noticeType.equals(1) ? time : adventTime, biz, needToWaringProject.getUpdateOn(),employeeCode, needToWaringProject, WarningRuleTypeEnum.DECLARED_WARNING.getCode(), noticeType, path, batchEmployeesStr,null); } @@ -383,7 +384,8 @@ public class EarlyWarningInstanceNotStartTask { if(noticeMap.containsKey(needToWaringProject.getProjectCode())){ List noticeTypes = noticeMap.get(needToWaringProject.getProjectCode()); for(Integer noticeType : noticeTypes){ - earlyWarningManage.doEarlyWarning(noticeMethod,Objects.nonNull(noticeType)&¬iceType.equals(1) ? noticeContent : adventContent,time,biz, + earlyWarningManage.doEarlyWarning(noticeMethod,Objects.nonNull(noticeType)&¬iceType.equals(1) ? noticeContent : adventContent, + Objects.nonNull(noticeType) && noticeType.equals(1) ? time : adventTime,biz, needToWaringProject.getUpdateOn(),employeeCode,needToWaringProject, WarningRuleTypeEnum.OPERATION_WARNING.getCode(),noticeType,path,employeeCode,null); } @@ -498,7 +500,8 @@ public class EarlyWarningInstanceNotStartTask { if(noticeTypeMap.containsKey(needToWaringProject.getProjectCode())){ List noticeTypes = noticeTypeMap.get(needToWaringProject.getProjectCode()); for(Integer noticeType : noticeTypes){ - earlyWarningManage.doEarlyWarning(noticeMethod,Objects.nonNull(noticeType)&¬iceType.equals(1) ? noticeContent : adventContent,time,null, + earlyWarningManage.doEarlyWarning(noticeMethod,Objects.nonNull(noticeType)&¬iceType.equals(1) ? noticeContent : adventContent, + Objects.nonNull(noticeType) && noticeType.equals(1) ? time : adventTime,null, needToWaringProject.getUpdateOn(),user.getEmployeeCode(),project, WarningRuleTypeEnum.RENEWAL_FUND.getCode(),noticeType,path,employeesStr,needToWaringProject.getId().toString()); }