diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java index a1942a7f..f0186a2a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java @@ -22,7 +22,12 @@ public class PCAComplianceAssessmentBefore implements TaskListener { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); - queryWrapper1.eq("TASK_ID","GO"); + if ("GO".equals(delegateTask.getVariable("GOGOGO"))) { + queryWrapper1.eq("TASK_ID", "GO"); + delegateTask.setVariable("GOGOGO","1"); + }else { + queryWrapper1.isNull("TASK_ID"); + } List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java index 37a1c914..d40ec9dd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java @@ -93,7 +93,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } - if (Integer.valueOf(delegateTask.getVariable("pass", String.class)) != + if (null==delegateTask.getVariable("pass")||Integer.valueOf(delegateTask.getVariable("pass", String.class)) != delegateTask.getVariable("workPeoples", List.class).size()) { if (nextUserList != null && !nextUserList.isEmpty()) { for (String userId : nextUserList) { @@ -103,7 +103,9 @@ public class PCAbafgManagerApproveAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskId("996"); + if (null!=delegateTask.getVariable("pass")) { + busProcessNewNext.setTaskId("996"); + } busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(userId); busProcessNewNext.setPrcName(prcName); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index 85ad4d3b..bd732ce1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -188,7 +188,7 @@ public class PCAffLiableDistributeAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } - + delegateTask.setVariable("GOGOGO","GO"); // 存储当前节点意见 if (nextUserList != null && !nextUserList.isEmpty()) { for (String userId : nextUserList) {