|
@@ -231,7 +231,8 @@ public class EarlyWarningInstanceNotStartTask { |
|
|
List<Integer> noticeTypes = noticeMap.get(needToWaringProject.getProjectCode()); |
|
|
List<Integer> noticeTypes = noticeMap.get(needToWaringProject.getProjectCode()); |
|
|
for(Integer noticeType : noticeTypes) { |
|
|
for(Integer noticeType : noticeTypes) { |
|
|
for (String employeeCode : batchEmployees) { |
|
|
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, |
|
|
needToWaringProject.getUpdateOn(),employeeCode, needToWaringProject, |
|
|
WarningRuleTypeEnum.DECLARED_WARNING.getCode(), noticeType, path, batchEmployeesStr,null); |
|
|
WarningRuleTypeEnum.DECLARED_WARNING.getCode(), noticeType, path, batchEmployeesStr,null); |
|
|
} |
|
|
} |
|
@@ -383,7 +384,8 @@ public class EarlyWarningInstanceNotStartTask { |
|
|
if(noticeMap.containsKey(needToWaringProject.getProjectCode())){ |
|
|
if(noticeMap.containsKey(needToWaringProject.getProjectCode())){ |
|
|
List<Integer> noticeTypes = noticeMap.get(needToWaringProject.getProjectCode()); |
|
|
List<Integer> noticeTypes = noticeMap.get(needToWaringProject.getProjectCode()); |
|
|
for(Integer noticeType : noticeTypes){ |
|
|
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, |
|
|
needToWaringProject.getUpdateOn(),employeeCode,needToWaringProject, |
|
|
WarningRuleTypeEnum.OPERATION_WARNING.getCode(),noticeType,path,employeeCode,null); |
|
|
WarningRuleTypeEnum.OPERATION_WARNING.getCode(),noticeType,path,employeeCode,null); |
|
|
} |
|
|
} |
|
@@ -498,7 +500,8 @@ public class EarlyWarningInstanceNotStartTask { |
|
|
if(noticeTypeMap.containsKey(needToWaringProject.getProjectCode())){ |
|
|
if(noticeTypeMap.containsKey(needToWaringProject.getProjectCode())){ |
|
|
List<Integer> noticeTypes = noticeTypeMap.get(needToWaringProject.getProjectCode()); |
|
|
List<Integer> noticeTypes = noticeTypeMap.get(needToWaringProject.getProjectCode()); |
|
|
for(Integer noticeType : noticeTypes){ |
|
|
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, |
|
|
needToWaringProject.getUpdateOn(),user.getEmployeeCode(),project, |
|
|
WarningRuleTypeEnum.RENEWAL_FUND.getCode(),noticeType,path,employeesStr,needToWaringProject.getId().toString()); |
|
|
WarningRuleTypeEnum.RENEWAL_FUND.getCode(),noticeType,path,employeesStr,needToWaringProject.getId().toString()); |
|
|
} |
|
|
} |
|
|