taskFinish-流程畅通_prcName完善

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java

@@ -55,9 +55,7 @@ public class AutoStartAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动会后流程";
-
-        prcName = standName + "-标准化活动会后流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java

@@ -77,9 +77,7 @@ public class DirectorVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动会后流程";
-
-        prcName = standName + "-标准化活动会后流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java

@@ -56,9 +56,7 @@ public class MemberUploadInfoAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动会后流程";
-
-        prcName = standName + "-标准化活动会后流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -76,7 +76,6 @@ public class ChargeVerifyAfter implements TaskListener {
             if("1".equals(object.getString("passFlag"))){//通过
 
                 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-
                 sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
                 if(sum.isEmpty()){
                     sum = object;
@@ -109,10 +108,7 @@ public class ChargeVerifyAfter implements TaskListener {
                 }
             }else{
                 delegateTask.setVariable("pass2",0);//排他通道
-                if(StringUtils.isNotBlank(object.getString("member"))) {
+                nextUserList.add(object.getString("member"));
-                    nextUserList.add(object.getString("member"));
-                    delegateTask.setVariable("member", nextUserList);
-                }//驳回重写
             }
         }else{
             throw new ActivitiException("审批过了");
@@ -140,9 +136,7 @@ public class ChargeVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -160,8 +154,12 @@ prcName = standName + "-标准化活动参会流程-";
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class);
+                if(delegateTask.getVariable("pass2",Integer.class).equals(0)){
-                busProcessNewNext.setMesg(hand.toJSONString());
+                    busProcessNewNext.setMesg(object.toJSONString());
+                }else{
+                    JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class);
+                    busProcessNewNext.setMesg(hand.toJSONString());
+                }
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());
@@ -170,5 +168,6 @@ prcName = standName + "-标准化活动参会流程-";
                 busBean.save(busProcessNewNext);
             }
         }
+
     }
 }

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

@@ -106,9 +106,7 @@ public class DirectorChooseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -46,9 +46,7 @@ public class EngineerReviseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -42,7 +42,6 @@ public class EngineerReviseDoneAfter implements TaskListener {
         //TODO 流程结束，汇总
 
 
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
@@ -53,7 +52,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
         delegateTask.setVariable("listName", standName);
         String prcName = "";
 
-        prcName = standName + "-标准化活动参会流程-";
+        prcName = "标准化活动参会流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -80,6 +79,16 @@ public class EngineerReviseDoneAfter implements TaskListener {
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
             }
+        }else {
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            prcName = "标准化活动参会流程" + "会议结束";
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 }

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

@@ -86,9 +86,7 @@ public class LeaderVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -29,18 +29,16 @@ public class ManageSignAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
+
+
+
         Integer count = 0;
         if(null == delegateTask.getVariable("managePassCount")){
             delegateTask.setVariable("managePassCount",count);
@@ -65,7 +63,6 @@ public class ManageSignAfter implements TaskListener {
         delegateTask.setVariable("manageIdList",idList);
         if(rat == 0){
             if("1".equals(object.getString("passFlag"))) {//通过
-
                 count = delegateTask.getVariable("managePassCount",Integer.class);
                 count++;
                 delegateTask.setVariable("managePassCount",count);
@@ -77,11 +74,6 @@ public class ManageSignAfter implements TaskListener {
 
             }else{
                 delegateTask.setVariable("pass4",0);
-                delegateTask.removeVariable("manageIdList");
-//                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-//                    nextUserList.add(object.getString("engineerSum"));
-//                    delegateTask.setVariable("engineerSum", nextUserList);
-//                }
                 nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
             }
         }else{
@@ -100,6 +92,8 @@ public class ManageSignAfter implements TaskListener {
                 busBean.saveOrUpdate(busProcessNews);
             }
         }
+
+
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -107,9 +101,7 @@ public class ManageSignAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -75,9 +75,7 @@ public class PresidentVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java

@@ -60,9 +60,7 @@ public class WriteMaterialAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -55,9 +55,7 @@ public class WriteMemberInfoAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
+        String prcName ="标准化活动参会流程";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -42,7 +42,7 @@ public class ChargeVerifyAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
-
+        String prcName = "标准化活动入会流程-";
 
         JSONObject sum = new JSONObject();
         if(null == delegateTask.getVariable("membersSumJSON")){
@@ -54,31 +54,12 @@ public class ChargeVerifyAfter implements TaskListener {
         if(null == delegateTask.getVariable("chargePassCount")){
             delegateTask.setVariable("chargePassCount",count);
         }
-        JSONArray objects = new JSONArray();
+
-        if(null == delegateTask.getVariable("chargePassList")) {
+
-            delegateTask.setVariable("chargePassList", objects);
+
-        }
-        // 审批
-        //防止重复审批同一对象
-        List<String> idList = new ArrayList<>();
-        if(null == delegateTask.getVariable("chargeIdList")){
-            delegateTask.setVariable("chargeIdList", idList);
-        }
-        int rat = 0;
-        idList = delegateTask.getVariable("chargeIdList",List.class);
-        if(!idList.isEmpty()){
-            for(String a : idList){
-                if(a.equals(object.getString("member"))){
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        if(rat == 0){
             if("1".equals(object.getString("passFlag"))){//通过
 
                 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-
                 sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
                 if(sum.isEmpty()){
                     sum = object;
@@ -93,32 +74,24 @@ public class ChargeVerifyAfter implements TaskListener {
                     delegateTask.setVariable("membersSumJSON",sum);
                 }
 
-                idList.add(object.getString("member"));
-                delegateTask.setVariable("chargeIdList",idList);
 
-                
                 count = delegateTask.getVariable("chargePassCount",Integer.class);
                 delegateTask.setVariable("chargePassCount",count + 1);
-                objects = delegateTask.getVariable("chargePassList",JSONArray.class);
-                objects.add(object);
                 delegateTask.setVariable("pass2",1);//排他通道
-                delegateTask.setVariable("chargePassList",objects);
+
                 if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
+                    prcName = prcName + "标准法规工程师汇总修订";
                     if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
                         nextUserList.add(object.getString("engineerSum"));
                         delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
                     }
                 }
             }else{
+                prcName = prcName + "入会代表填写入会信息表";
                 delegateTask.setVariable("pass2",0);//排他通道
-                if(StringUtils.isNotBlank(object.getString("member"))) {
+                nextUserList.add(object.getString("member"));
-                    nextUserList.add(object.getString("member"));
-                    delegateTask.setVariable("member", nextUserList);
-                }//驳回重写
             }
-        }else{
+
-            throw new ActivitiException("审批过了");
-        }
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -142,9 +115,7 @@ public class ChargeVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -162,8 +133,12 @@ prcName = standName + "-标准化活动入会流程-";
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class);
+                if(delegateTask.getVariable("pass2",Integer.class).equals(0)){
-                busProcessNewNext.setMesg(hand.toJSONString());
+                    busProcessNewNext.setMesg(object.toJSONString());
+                }else{
+                    JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class);
+                    busProcessNewNext.setMesg(hand.toJSONString());
+                }
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());

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

@@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep4?prcType=20";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -28,9 +28,6 @@ public class DirectorChooseAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -40,33 +37,17 @@ public class DirectorChooseAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-        System.out.println("后置搭建完成");
+        String prcName = "标准化活动入会流程-";
+
         //如果 他是通过 passFlag==1
         List<String> passMemberList = new ArrayList<>();
         if(null == delegateTask.getVariable("memberList")){
             delegateTask.setVariable("memberList", passMemberList);
         }
 
-        //防止重复审批同一对象
-        List<String> idList = new ArrayList<>();
-        if(null == delegateTask.getVariable("memberIdList")){
-            delegateTask.setVariable("memberIdList", idList);
-        }
-        int rat = 0;
-        idList = delegateTask.getVariable("memberIdList",List.class);
-        if(!idList.isEmpty()){
-            for(String a : idList){
-                if(a.equals(object.getString("memberId"))){
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        idList.add(object.getString("memberId"));
-        delegateTask.setVariable("memberIdList",idList);
-        if(rat == 0){
-            if("1".equals(object.getString("passFlag"))) {
 
+            if("1".equals(object.getString("passFlag"))) {
+                prcName = prcName + "入会代表填写入会信息表";
                 nextUserList.add(object.getString("memberId"));
                 if (null!=delegateTask.getVariable("memberList")) {
                     List<String> middle=delegateTask.getVariable("memberList",List.class);
@@ -76,12 +57,12 @@ public class DirectorChooseAfter implements TaskListener {
                     delegateTask.setVariable("memberList",nextUserList);
                 }
                 delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            }else{
-                //TODO 如果所有人未通过，则结束流程
             }
-        }else{
+
-            throw new ActivitiException("此对象已经审批过了");
+            if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){
-        }
+                throw new ActivitiException("所有人不涉及入会，流程终止");
+            }
+
 
 
         //         存储当前节点意见
@@ -104,9 +85,7 @@ public class DirectorChooseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep2?prcType=20";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -40,7 +40,8 @@ public class EngineerReviseAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-
+        String prcName = "标准化活动入会流程-";
+        prcName = prcName + "标准法规部主管领导审核";
         nextUserList.add(object.getString("leader"));
         delegateTask.setVariable("leader", object.getString("leader"));
 
@@ -53,9 +54,7 @@ public class EngineerReviseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep5?prcType=20";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -30,21 +30,18 @@ public class EngineerReviseDoneAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
+        String prcName = "标准化活动入会流程-";
+//            prcName = "标准化活动入会流程" + "会议结束";
+        prcName = prcName + "流程结束";
 
-
+        //TODO 流程结束，入库
-
-        //TODO 流程结束，汇总
 
 
 
@@ -56,9 +53,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -85,6 +80,15 @@ public class EngineerReviseDoneAfter implements TaskListener {
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
             }
+        }else {
+            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);
         }
     }
 }

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

@@ -14,8 +14,8 @@ public class EngineerReviseDoneBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
-
+//taskInfo=标准法规工程师汇总修订完毕
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -34,11 +34,11 @@ public class LeaderVerifyAfter implements TaskListener {
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
+        String prcName = "标准化活动入会流程-";
+
 
         if("1".equals(object.getString("passFlag"))) {//通过
             delegateTask.setVariable("pass3",1);
@@ -50,16 +50,13 @@ public class LeaderVerifyAfter implements TaskListener {
                     nextUserList.add(object.getString("manageDepartmentList"));
                 }
                 // 配置多实例
+                prcName = prcName + "费用管理部门会签";
                 delegateTask.setVariable("manageDepartmentList", nextUserList);
                 delegateTask.setVariable("manageDepartmentCount",nextUserList.size());
-
             }
         }else{
+            prcName = prcName + "标准法规工程师汇总修订";
             delegateTask.setVariable("pass3",0);
-//            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-//                nextUserList.add(object.getString("engineerSum"));
-//                delegateTask.setVariable("engineerSum", nextUserList);
-//            }
             nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
         }
         //         存储当前节点意见
@@ -84,9 +81,7 @@ public class LeaderVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,9 @@ public class LeaderVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
+//        taskInfo=标准法规部主管领导审核
+
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -30,62 +30,39 @@ public class ManageSignAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
+
+
         List<String> nextUserList = new ArrayList();
+        String prcName = "标准化活动入会流程-";
         Integer count = 0;
         if(null == delegateTask.getVariable("managePassCount")){
             delegateTask.setVariable("managePassCount",count);
         }
-        //防止重复审批同一对象
-        List<String> idList = new ArrayList<>();
-        if(null == delegateTask.getVariable("manageIdList")){
-            delegateTask.setVariable("manageIdList", idList);
-        }
-        int rat = 0;
-        idList = delegateTask.getVariable("manageIdList",List.class);
-        if(!idList.isEmpty()){
-            for(String a : idList){
-                if(a.equals(object.getString("manageDepartment"))){
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        idList.add(object.getString("manageDepartment"));
-        delegateTask.setVariable("manageIdList",idList);
-        if(rat == 0){
-            if("1".equals(object.getString("passFlag"))) {//通过
 
-                count = delegateTask.getVariable("managePassCount",Integer.class);
+        if("1".equals(object.getString("passFlag"))) {//通过
-                count++;
+            count = delegateTask.getVariable("managePassCount",Integer.class);
-                delegateTask.setVariable("managePassCount",count);
+            count++;
-                if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
+            delegateTask.setVariable("managePassCount",count);
-                    nextUserList.add(object.getString("president"));
+            if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-                    delegateTask.setVariable("president", object.getString("president"));
+                prcName = prcName + "技术委员会常务副主任/总院院长审定";
-                    delegateTask.setVariable("pass4",1);
+                nextUserList.add(object.getString("president"));
-                }
+                delegateTask.setVariable("president", object.getString("president"));
-
+                delegateTask.setVariable("managePassCount",0);
-            }else{
+                delegateTask.setVariable("pass4",1);
-                delegateTask.setVariable("pass4",0);
-                delegateTask.removeVariable("manageIdList");
-//                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-//                    nextUserList.add(object.getString("engineerSum"));
-//                    delegateTask.setVariable("engineerSum", nextUserList);
-//                }
-                nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
             }
         }else{
-            throw new ActivitiException("此对象已经审批过了");
+            prcName = prcName + "标准法规工程师汇总修订";
+            delegateTask.setVariable("pass4",0);
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
         }
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -106,9 +83,7 @@ public class ManageSignAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,8 +14,8 @@ public class ManageSignBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
-
+//taskInfo=费用管理部门会签
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -28,34 +28,28 @@ public class PresidentVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
         LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-
+        String prcName = "标准化活动入会流程-";
-        // 入会申请信息重新封装
         if("1".equals(object.getString("passFlag"))) {//通过
+            prcName = prcName + "标准法规工程师汇总修订完毕";
             delegateTask.setVariable("pass5",1);
             nextUserList.add(object.getString("engineerSumDone"));
             delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone"));
         }else{
+            prcName = prcName + "标准法规工程师汇总修订";
             delegateTask.setVariable("pass5",0);
-//            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-//                nextUserList.add(object.getString("engineerSum"));
-//                delegateTask.setVariable("engineerSum", nextUserList);
-//            }
             nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-
         }
-        //         存储当前节点意见
+        //存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -76,9 +70,7 @@ public class PresidentVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,8 +14,8 @@ public class PresidentVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
-
+//taskInfo=技术委员会常务副主任
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -42,6 +42,8 @@ public class WriteMaterialAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
+        String prcName = "标准化活动入会流程-";
+
         // 入会申请信息重新封装
         if(StringUtils.isNotBlank(object.getString("directorList"))) {
 
@@ -52,6 +54,7 @@ public class WriteMaterialAfter implements TaskListener {
             }
             // 配置多实例
             delegateTask.setVariable("directorList", nextUserList);
+            prcName = prcName + "技术委员会分委会主任/入会代表所在中心主任提名入会代表";
         }
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -60,9 +63,7 @@ public class WriteMaterialAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -91,6 +92,7 @@ public class WriteMaterialAfter implements TaskListener {
                 System.out.println("处理人:" + nextUser);
                 System.out.println("流程名:" + prcName);
                 System.out.println("节点信息:" + delegateTask.getName());
+                System.out.println("节点信息2:" + delegateTask.getTaskDefinitionKey());
             }
         }
     }

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

@@ -15,23 +15,5 @@ public class WriteMaterialBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
 
-        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
-        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
-        queryWrapper1.isNull("TASK_ID");
-        List<BusProcessNew> list = busBean.list(queryWrapper1);
-        if(!list.isEmpty()){
-            BusProcessNew one1 = list.get(0);
-            one1.setTaskId(delegateTask.getId());
-            busBean.saveOrUpdate(one1);
-
-            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink(link);
-            one1.setTaskInfo(delegateTask.getName());
-            oaService.sendTodoMq(one1);
-        }
     }}

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

@@ -42,7 +42,8 @@ public class WriteMemberInfoAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动入会流程-";
+        prcName = prcName + "入会人员所在部门负责人审核";
         nextUserList.add(object.getString("charge"));
         delegateTask.setVariable("charge",object.getString("charge"));
 
@@ -53,9 +54,7 @@ public class WriteMemberInfoAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep3?prcType=20";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();