diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index ff006d637a28a4ee9ba21e257875ad6f3e310e43..e45bed95538aa1eb40eda3d947e7f31664a007a6 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -436,35 +436,30 @@ public class ProcessTaskSlaThread extends NeatLogicThread { ProcessTaskSlaVo processTaskSlaVo = new ProcessTaskSlaVo(); List allSlaIdList = processTaskSlaMapper.getSlaIdListByProcessTaskId(processTaskId); for (Long slaId : allSlaIdList) { -// System.out.println("slaId=" + slaId); processTaskSlaVo.setId(slaId); - boolean invalid = true; + boolean isActive = false; List processTaskStepIdList = processTaskSlaMapper.getProcessTaskStepIdListBySlaId(slaId); for (Long processTaskStepId : processTaskStepIdList) { - invalid = true; -// ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId); List processTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(processTaskStepId); for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) { -// ProcessTaskStepVo fromProcessTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepRelVo.getFromProcessTaskStepId()); if (processTaskStepRelVo.getType().equals(ProcessFlowDirection.FORWARD.getValue())) { -// System.out.println(fromProcessTaskStepVo.getName() + "-->" + processTaskStepVo.getName() + "=" + processTaskStepRelVo.getIsHit()); if (!Objects.equals(processTaskStepRelVo.getIsHit(), -1)) { - invalid = false; + isActive = true; break; } } } - if (invalid) { + if (isActive) { break; } } - if (invalid) { + if (isActive) { + resultList.add(slaId); + processTaskSlaVo.setIsActive(1); + } else { //该时效失效 processTaskSlaVo.setIsActive(0); deleteSlaById(slaId); - } else { - resultList.add(slaId); - processTaskSlaVo.setIsActive(1); } processTaskSlaMapper.updateProcessTaskSlaIsActiveBySlaId(processTaskSlaVo); }