|
@@ -141,16 +141,16 @@ public class TuiCalendarUtil {
|
|
scheduleInfo.setCalendarId("5");
|
|
scheduleInfo.setCalendarId("5");
|
|
} else {
|
|
} else {
|
|
if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue())) {
|
|
if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue())) {
|
|
- if(checkJobVO.getReceiveOvertime()){
|
|
|
|
- scheduleInfo.setCalendarId("2");
|
|
|
|
- }else{
|
|
|
|
|
|
+ if(checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime()){
|
|
scheduleInfo.setCalendarId("1");
|
|
scheduleInfo.setCalendarId("1");
|
|
|
|
+ }else{
|
|
|
|
+ scheduleInfo.setCalendarId("2");
|
|
}
|
|
}
|
|
}else if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue())) {
|
|
}else if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue())) {
|
|
- if (checkJobVO.getReceiveOvertime()) {
|
|
|
|
- scheduleInfo.setCalendarId("4");
|
|
|
|
- } else {
|
|
|
|
|
|
+ if (checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime()) {
|
|
scheduleInfo.setCalendarId("3");
|
|
scheduleInfo.setCalendarId("3");
|
|
|
|
+ } else {
|
|
|
|
+ scheduleInfo.setCalendarId("4");
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
System.out.println("状态:" + checkJobVO.getStatus() );
|
|
System.out.println("状态:" + checkJobVO.getStatus() );
|