Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java

@@ -88,6 +88,7 @@ public class ChargeVerifyAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java

@@ -77,6 +77,35 @@ public class DirectorChooseAfter implements TaskListener {
         if (delegateTask.getVariable("memberList",List.class).size()==0){
             delegateTask.setVariable("passFlag","1");
             prcName = prcName + "流程结束";
+            int i=1;
+            if (null!=delegateTask.getVariable("directorListCount")){
+                i=delegateTask.getVariable("directorListCount",Integer.class)+1;
+                delegateTask.setVariable("directorListCount",i);
+            }else {
+                delegateTask.setVariable("directorListCount",i);
+            }
+            if (i>=delegateTask.getVariable("directorList",List.class).size()){
+                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) {
+                    one1.setPrcType("20");
+                    one1.setOverTime(OVERTIME);
+                    busProcessNameService.saveOrUpdate(one1);
+                }
+
+
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+
         }
 
         //         存储当前节点意见
@@ -87,6 +116,7 @@ public class DirectorChooseAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java

@@ -71,6 +71,7 @@ public class EngineerReviseAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java

@@ -135,6 +135,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java

@@ -65,6 +65,7 @@ public class LeaderVerifyAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java

@@ -68,6 +68,7 @@ public class ManageSignAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java

@@ -55,6 +55,7 @@ public class PresidentVerifyAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java

@@ -70,6 +70,7 @@ public class WriteMemberInfoAfter implements TaskListener {
             List<BusProcessNew> list = busBean.list(queryWrapper3);
             if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);