diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index d82b3d03..d77a228b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -15,7 +15,9 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -65,9 +67,15 @@ public class DirectorChooseAfter implements TaskListener { }else { delegateTask.setVariable("memberList",nextUserList); } + delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } + if (delegateTask.getVariable("memberList",List.class).size()==0){ + delegateTask.setVariable("passFlag","1"); + prcName = prcName + "流程结束"; + } + // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -93,7 +101,11 @@ public class DirectorChooseAfter implements TaskListener { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one1 != null) { + if ("1".equals(delegateTask.getVariable("passFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index b2c3df50..b0a5235b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -14,7 +14,9 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -45,7 +47,7 @@ public class DirectorChooseAfter implements TaskListener { } //全员不通过,检测条件 directorCount - Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer allCount = delegateTask.getVariable("directorList",List.class).size(); Integer count = 0; if(null == delegateTask.getVariable("directorCount")){ delegateTask.setVariable("directorCount", count); @@ -63,9 +65,13 @@ public class DirectorChooseAfter implements TaskListener { }else { delegateTask.setVariable("memberList",nextUserList); } + delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } - + if (delegateTask.getVariable("memberList",List.class).size()==0){ + delegateTask.setVariable("passFlag","1"); + prcName = prcName + "流程结束"; + } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -88,11 +94,14 @@ public class DirectorChooseAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { + if ("1".equals(delegateTask.getVariable("passFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user);