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

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -1964,7 +1964,12 @@ public class TodoTaskController extends BaseAction {
                         queryWrapper1.eq("P_ID",busProcessName.getPrcId());
                         queryWrapper1.eq("TASK_ID",task.getId());
                         BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                        busProcessName.setPrcName(busProcessNew.getPrcName());
+                        if (null!=busProcessNew.getPrcName()){
+                            busProcessName.setPrcName(busProcessNew.getPrcName());
+                        }else {
+                            busProcessNew.setPrcName("");
+                        }
+
                     }
                 }
                 if (assignee != null && !assignee.equals("")) {
@@ -2080,7 +2085,11 @@ public class TodoTaskController extends BaseAction {
                             queryWrapper1.eq("P_ID",busProcessName.getPrcId());
                             queryWrapper1.eq("TASK_ID",task.getId());
                             BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                            busProcessName.setPrcName(busProcessNew.getPrcName());
+                            if (null!=busProcessNew.getPrcName()){
+                                busProcessName.setPrcName(busProcessNew.getPrcName());
+                            }else {
+                                busProcessNew.setPrcName("");
+                            }
                         }
                     }
                     if (assignee != null && !assignee.equals("")) {

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -18,7 +18,7 @@ import java.util.Map;
 import java.util.Set;
 
 @Component
-@FeignClient(value = "FotonLAWSSystemLeo",path="/api",url="")
+@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
 @RequestMapping("/")
 public interface LawsUserInfoService {
 

src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java

@@ -47,5 +47,13 @@ public class BusProcessNewController extends BaseAction {
         return findtodotask;
     }
 
+    @ApiOperation(value = "每天十点需要启动 政策课题后续流程")
+    @GetMapping("/everyDayTenOlock")
+    public List<BusProcessNew> everyDayTenOlock() {
+        List<BusProcessNew> findtodotask = iBusProcessNewService.everyDayTenOlock();
+        return findtodotask;
+    }
+
+
 }
 

src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java

@@ -28,4 +28,6 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
 
     List<BusProcessNew> findLastworkPeople(@Param("key")String key,@Param("pId")String pId);
 
+    List<BusProcessNew> everyDayTenOlock();
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java

@@ -32,4 +32,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
     //子流程 获取 阶段数据 专用 BY yzh
     List<BusProcessNew> findLastworkPeople(@Param("key")String key, @Param("pId")String pId);
 
+    List<BusProcessNew> everyDayTenOlock();
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java

@@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
     public List<BusProcessNew> findLastworkPeople(String key, String pId) {
         return baseMapper.findLastworkPeople(key,pId);
     }
+
+    @Override
+    public List<BusProcessNew> everyDayTenOlock() {
+        return baseMapper.everyDayTenOlock();
+    }
 }

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java

@@ -2,29 +2,22 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-        import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-        import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-        import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
+import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
-        import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
+import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
-        import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
-        import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
-        import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
+import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
-        import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
-        import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
-        import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
-        import com.ydw.bat.wkflow.util.SpringContextUtil;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
-        import org.activiti.engine.ActivitiException;
+import org.activiti.engine.ActivitiException;
-        import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.DelegateTask;
-        import org.activiti.engine.delegate.TaskListener;
+import org.activiti.engine.delegate.TaskListener;
-        import org.apache.commons.lang.StringUtils;
+import java.text.SimpleDateFormat;
-
+import java.util.Date;
-        import java.text.SimpleDateFormat;
-        import java.util.ArrayList;
-        import java.util.Arrays;
-        import java.util.Date;
-        import java.util.List;
-        import java.util.regex.Matcher;
-        import java.util.regex.Pattern;
 
 public class RAApproveAfter implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java

@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
-import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -12,18 +9,12 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
-
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class RAAuditAfter implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java

@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
-import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -12,18 +9,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.lang.StringUtils;
-
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class RAModifyInformationAfter implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java

@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
-import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -12,18 +9,12 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
-
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class RASignAfter implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java

@@ -1,11 +1,7 @@
 package com.ydw.bat.wkflow.listener.RecommendedApproval;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
-import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -13,18 +9,13 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class RAValidationAfter implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java

@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
-import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -12,19 +9,11 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.lang.StringUtils;
-
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.regex.Matcher;
+//外部署名推荐批准
-import java.util.regex.Pattern;
-
 public class RAstartAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {

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/AutoStartBefore.java

@@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=22";
+        String link = "bzhhStep?prcType=22";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_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/DirectorVerifyBefore.java

@@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=22";
+        String link = "bzhhStep?prcType=22";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_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/StandardAfterMeetProcess/MemberUploadInfoBefore.java

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

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

@@ -30,74 +30,57 @@ public class ChargeVerifyAfter 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 = "标准化活动参会流程-";
-
+        JSONObject sum = new JSONObject();
+        if(null == delegateTask.getVariable("membersSumJSON")){
+            delegateTask.setVariable("membersSumJSON",sum);
+        }
         Integer count = 0;
-
         if(null == delegateTask.getVariable("chargePassCount")){
             delegateTask.setVariable("chargePassCount",count);
         }
-        JSONArray objects = new JSONArray();
+
-        if(null == delegateTask.getVariable("chargePassList")) {
+        if("1".equals(object.getString("passFlag"))){//通过
-            delegateTask.setVariable("chargePassList", objects);
+            JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-        }
+            sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
-        // 审批
+            if(sum.isEmpty()){
-        //防止重复审批同一对象
+                sum = object;
-        List<String> idList = new ArrayList<>();
+                delegateTask.setVariable("membersSumJSON",sum);
-        if(null == delegateTask.getVariable("chargeIdList")){
+            }else {
-            delegateTask.setVariable("chargeIdList", idList);
+                JSONObject o1 = sum.getJSONObject("rh_pageData");
-        }
+                JSONObject o = os.getJSONObject(0);
-        int rat = 0;
+                JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-        idList = delegateTask.getVariable("chargeIdList",List.class);
+                os1.add(o);
-        if(!idList.isEmpty()){
+                o1.put("myPartRole",os1);
-            for(String a : idList){
+                sum.put("rh_pageData",o1);
-                if(a.equals(object.getString("member"))){
+                delegateTask.setVariable("membersSumJSON",sum);
-                    rat = 1;
-                    break;
-                }
             }
-        }
+            count = delegateTask.getVariable("chargePassCount",Integer.class);
-        if(rat == 0){
+            delegateTask.setVariable("chargePassCount",count + 1);
-            if("1".equals(object.getString("passFlag"))){//通过
+            delegateTask.setVariable("pass2",1);//排他通道
-
+            System.out.println(delegateTask.getVariable("chargePassList"));
-                idList.add(object.getString("member"));
+            if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                delegateTask.setVariable("chargeIdList",idList);
+                prcName = prcName + "标准法规工程师修订";
-
+                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                delegateTask.setVariable("pass2",1);//排他通道
+                    nextUserList.add(object.getString("engineerSum"));
-                count = delegateTask.getVariable("chargePassCount",Integer.class);
+                    delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
-                delegateTask.setVariable("chargePassCount",count + 1);
-                objects = delegateTask.getVariable("chargePassList",JSONArray.class);
-                objects.add(object);
-                delegateTask.setVariable("chargePassList",objects);
-                System.out.println(delegateTask.getVariable("chargePassList"));
-                if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                        nextUserList.add(object.getString("engineerSum"));
-                        delegateTask.setVariable("engineerSum", nextUserList);
-                    }//下一节点
                 }
-            }else{
-                delegateTask.setVariable("pass2",0);//排他通道
-                if(StringUtils.isNotBlank(object.getString("member"))) {
-                    nextUserList.add(object.getString("member"));
-                    delegateTask.setVariable("member", nextUserList);
-                }//驳回重写
             }
         }else{
-            throw new ActivitiException("审批过了");
+            prcName = prcName + "参会代表填写参会信息表";
+            delegateTask.setVariable("pass2",0);//排他通道
+            nextUserList.add(object.getString("member"));
         }
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -112,8 +95,6 @@ public class ChargeVerifyAfter implements TaskListener {
             }
         }
 
-
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -121,9 +102,6 @@ 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());
@@ -141,8 +119,12 @@ prcName = standName + "-标准化活动参会流程-";
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(objects.toJSONString());
+                if(delegateTask.getVariable("pass2",Integer.class).equals(0)){
-//                busProcessNewNext.setMesg(object.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());
@@ -151,5 +133,6 @@ prcName = standName + "-标准化活动参会流程-";
                 busBean.save(busProcessNewNext);
             }
         }
+
     }
 }

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

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

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

@@ -30,59 +30,42 @@ public class DirectorChooseAfter 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();
-        System.out.println("后置搭建完成");
+
         //如果 他是通过 passFlag==1
         List<String> passMemberList = new ArrayList<>();
         if(null == delegateTask.getVariable("memberList")){
             delegateTask.setVariable("memberList", passMemberList);
         }
+        String prcName = "标准化活动参会流程-";
 
-        //防止重复审批同一对象
+        //全员不通过，检测条件 directorCount
-        List<String> idList = new ArrayList<>();
+        //TODO 1全员不通过,2会后需要多实例吗?
-        if(null == delegateTask.getVariable("memberIdList")){
+        Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
-            delegateTask.setVariable("memberIdList", idList);
+        Integer count = 0;
+        if(null == delegateTask.getVariable("directorCount")){
+            delegateTask.setVariable("directorCount", count);
         }
-        int rat = 0;
+        count = delegateTask.getVariable("directorCount",Integer.class);
-        idList = delegateTask.getVariable("memberIdList",List.class);
+        delegateTask.setVariable("directorCount",count+1);
-        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"));
-                nextUserList.add(object.getString("memberId"));
+            if (null!=delegateTask.getVariable("memberList")) {
-                if (null!=delegateTask.getVariable("memberList")) {
+                List<String> middle=delegateTask.getVariable("memberList",List.class);
-                    List<String> middle=delegateTask.getVariable("memberList",List.class);
+                middle.addAll(nextUserList);
-                    middle.addAll(nextUserList);
+                delegateTask.setVariable("memberList",middle);
-                    delegateTask.setVariable("memberList",middle);
+            }else {
-                }else {
+                delegateTask.setVariable("memberList",nextUserList);
-                    delegateTask.setVariable("memberList",nextUserList);
-                }
-                delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            }else{
-                //TODO 如果所有人未通过，则结束流程
             }
-        }else{
+            delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            throw new ActivitiException("此对象已经审批过了");
         }
 
 
@@ -106,9 +89,6 @@ 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/StandardMeetProcess/DirectorChooseBefore.java

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

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

@@ -2,7 +2,6 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -12,7 +11,6 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,23 +26,18 @@ public class EngineerReviseAfter 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();
 
-        if (StringUtils.isNotBlank(object.getString("leader"))) {
+        String prcName = "标准化活动参会流程-";
-            nextUserList.add(object.getString("leader"));
+        prcName = prcName + "技术管理中心主任审批";
-            delegateTask.setVariable("leader", nextUserList);
+        nextUserList.add(object.getString("leader"));
-        }
+        delegateTask.setVariable("leader", object.getString("leader"));
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -53,9 +46,6 @@ 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/StandardMeetProcess/EngineerReviseBefore.java

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

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

@@ -29,26 +29,21 @@ public class EngineerReviseDoneAfter 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 = "标准化活动参会流程-";
+//            prcName = "标准化活动参会流程-" + "会议结束";
+        prcName = prcName + "流程结束";
         //TODO 流程结束，汇总
 
 
-
-
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
@@ -57,9 +52,8 @@ public class EngineerReviseDoneAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动参会流程-";
+        prcName = "标准化活动参会流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -67,6 +61,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
         if (one1 != null) {
             one1.setPrcType("21");
             one1.setPrcName(prcName);
+            one1.setOverTime(OVERTIME);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
@@ -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/StandardMeetProcess/EngineerReviseDoneBefore.java

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

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

@@ -29,19 +29,15 @@ public class LeaderVerifyAfter 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"))) {//通过
             delegateTask.setVariable("pass3",1);
             if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) {
@@ -54,16 +50,12 @@ public class LeaderVerifyAfter implements TaskListener {
                 // 配置多实例
                 delegateTask.setVariable("manageDepartmentList", nextUserList);
                 delegateTask.setVariable("manageDepartmentCount",nextUserList.size());
-
+                prcName = prcName + "费用管理部门会签";
             }
         }else{
             delegateTask.setVariable("pass3",0);
-
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-            //若有通过参数重新指定代理人，则更换代理人，否则使用之前节点设定的原有代理人
+            prcName = prcName + "标准法规工程师修订";
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -87,9 +79,6 @@ 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/StandardMeetProcess/LeaderVerifyBefore.java

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

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

@@ -29,65 +29,34 @@ 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();
+
+        String prcName = "标准化活动参会流程-";
         Integer count = 0;
         if(null == delegateTask.getVariable("managePassCount")){
             delegateTask.setVariable("managePassCount",count);
         }
-
+        if("1".equals(object.getString("passFlag"))) {//通过
-        //防止重复审批同一对象
+            count = delegateTask.getVariable("managePassCount",Integer.class);
-        List<String> idList = new ArrayList<>();
+            count++;
-        if(null == delegateTask.getVariable("manageIdList")){
+            delegateTask.setVariable("managePassCount",count);
-            delegateTask.setVariable("manageIdList", idList);
+            if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-        }
+                prcName = prcName + "技术委员会常务副主任/总院院长审定";
-        int rat = 0;
+                nextUserList.add(object.getString("president"));
-        idList = delegateTask.getVariable("manageIdList",List.class);
+                delegateTask.setVariable("managePassCount",0);
-        if(!idList.isEmpty()){
+                delegateTask.setVariable("president", object.getString("president"));
-            for(String a : idList){
+                delegateTask.setVariable("pass4",1);
-                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);
-                count++;
-                delegateTask.setVariable("managePassCount",count);
-                if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("president"))) {
-                        nextUserList.add(object.getString("president"));
-                        delegateTask.setVariable("president", nextUserList);
-                    }
-                    delegateTask.setVariable("pass4",1);
-                }
-
-            }else{
-                delegateTask.setVariable("pass4",0);
-
-                delegateTask.removeVariable("manageIdList");
-                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                    nextUserList.add(object.getString("engineerSum"));
-                    delegateTask.setVariable("engineerSum", nextUserList);
-                }
             }
         }else{
-            throw new ActivitiException("此对象已经审批过了");
+            prcName = prcName + "标准法规工程师修订";
+            delegateTask.setVariable("pass4",0);
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
         }
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -102,6 +71,8 @@ public class ManageSignAfter implements TaskListener {
                 busBean.saveOrUpdate(busProcessNews);
             }
         }
+
+
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -109,9 +80,6 @@ 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/StandardMeetProcess/ManageSignBefore.java

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

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

@@ -28,33 +28,24 @@ 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);
-            if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) {
+            nextUserList.add(object.getString("engineerSumDone"));
-                nextUserList.add(object.getString("engineerSumDone"));
+            delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone"));
-                delegateTask.setVariable("engineerSumDone", nextUserList);
-            }
-
         }else{
+            prcName = prcName + "标准法规工程师修订";
             delegateTask.setVariable("pass5",0);
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -77,9 +68,6 @@ 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/StandardMeetProcess/PresidentVerifyBefore.java

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

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

@@ -41,7 +41,7 @@ public class WriteMaterialAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-
+        String prcName = "标准化活动参会流程-";
         // 入会申请信息重新封装
         if(StringUtils.isNotBlank(object.getString("directorList"))) {
 
@@ -52,6 +52,7 @@ public class WriteMaterialAfter implements TaskListener {
             }
             // 配置多实例
             delegateTask.setVariable("directorList", nextUserList);
+            prcName = prcName + "分委会主任/部门中心主任提名入会代表";
         }
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -60,9 +61,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());

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

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

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

@@ -29,27 +29,18 @@ public class WriteMemberInfoAfter 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 = "标准化活动参会流程-";
-        //
+        prcName = prcName + "参会人员所在部门中心主任审核";
-        if(StringUtils.isNotBlank(object.getString("charge"))) {
+        nextUserList.add(object.getString("charge"));
-            nextUserList.add(object.getString("charge"));
+        delegateTask.setVariable("charge", object.getString("charge"));
-            delegateTask.setVariable("charge", nextUserList);
-            System.out.println(delegateTask.getVariable("charge"));
-        }
-
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -58,9 +49,6 @@ 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/StandardMeetProcess/WriteMemberInfoBefore.java

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

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java

@@ -14,7 +14,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class ApprovalAfter implements TaskListener {
@@ -26,7 +28,6 @@ public class ApprovalAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -36,7 +37,7 @@ public class ApprovalAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+
         String user = delegateTask.getVariable("createUser", String.class);
         String username = delegateTask.getVariable("createUserName", String.class);
         String prcName="";
@@ -56,17 +57,14 @@ public class ApprovalAfter implements TaskListener {
         }
 
 
-//        if(object.getString("signFlag").equals("1")) {
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-//            prcName = standName + "-标准法规清单申请-会签";
-//        }else {
-//            prcName = standName + "-标准法规清单申请-经理审批";
-//        }
-
-
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
+            if("1".equals(object.getString("shyFlag"))){
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("19");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
@@ -74,7 +72,6 @@ public class ApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -106,7 +103,7 @@ public class ApprovalAfter implements TaskListener {
             busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
             busProcessNewNext.setMesg(object.toJSONString());
             busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo("业务经理审批");
+            busProcessNewNext.setTaskInfo("政策课题组会后流程-结束");
             busProcessNewNext.setUserId(object.getString("jlUserId"));
             busProcessNewNext.setPrcName(prcName);
             busBean.save(busProcessNewNext);

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java

@@ -26,7 +26,7 @@ public class ApprovalBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=19");
+            one1.setLink("zchhStep3?prcType=19");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java

@@ -26,7 +26,6 @@ public class InputInformationAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -43,22 +42,9 @@ public class InputInformationAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-//        String user = object.getString("prcCreateUser");
-//        delegateTask.setVariable("createUser",user);
-//        String username = object.getString("prcCreateUserName");
-//        delegateTask.setVariable("createUserName",username);
-//        String standName = object.getString("listName");
-//        delegateTask.setVariable("listName",standName);
         String user = delegateTask.getVariable("createUser", String.class);
         String username = delegateTask.getVariable("createUserName", String.class);
-        String prcName="";
+        String prcName = "政策课题组会后流程-审核员批准";
-        prcName = "政策课题组会后流程-审核员批准";
-//        if(object.getString("signFlag").equals("1")) {
-//            prcName = standName + "-标准法规清单申请-会签";
-//        }else {
-//            prcName = standName + "-标准法规清单申请-经理审批";
-//        }
 
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -72,7 +58,6 @@ public class InputInformationAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -98,16 +83,6 @@ public class InputInformationAfter 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("业务经理审批");
-            busProcessNewNext.setUserId(object.getString("jlUserId"));
-            busProcessNewNext.setPrcName(prcName);
-            busBean.save(busProcessNewNext);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java

@@ -26,7 +26,7 @@ public class InputInformationBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=19");
+            one1.setLink("zchhStep2?prcType=19");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java

@@ -35,15 +35,20 @@ public class PRGAMStartAfter implements TaskListener {
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
-        if(StringUtils.isNotBlank(object.getString("applicantId"))){
-            delegateTask.setVariable("inputInformation", object.getString("applicantId"));
-            nextUserList.add(object.getString("applicantId"));
-        }
 
+        //auto 判断流程是否是自动发起的
+        if ("1".equals(object.getString("auto"))){
+            delegateTask.setVariable("inputInformation", object.getString("revisionId"));
+            nextUserList.add(object.getString("revisionId"));
+        }
+        else {
+            if (StringUtils.isNotBlank(object.getString("applicantId"))) {
+                delegateTask.setVariable("inputInformation", object.getString("applicantId"));
+                nextUserList.add(object.getString("applicantId"));
+            }
+        }
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("revisionId");
         delegateTask.setVariable("createUser",user);
         String username = object.getString("revisionIdName");

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java

@@ -26,7 +26,6 @@ public class RevisionInformationAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -43,15 +42,9 @@ public class RevisionInformationAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("createUser",String.class);
         String username = delegateTask.getVariable("createUserName",String.class);
         String prcName="政策课题组会后流程-审核员审核";
-//        if(object.getString("signFlag").equals("1")) {
-//            prcName = standName + "-标准法规清单申请-会签";
-//        }else {
-//            prcName = standName + "-标准法规清单申请-经理审批";
-//        }
 
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -65,7 +58,6 @@ public class RevisionInformationAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -91,16 +83,6 @@ public class RevisionInformationAfter 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("业务经理审批");
-            busProcessNewNext.setUserId(object.getString("jlUserId"));
-            busProcessNewNext.setPrcName(prcName);
-            busBean.save(busProcessNewNext);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java

@@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=19");
+            one1.setLink("zchhStep1?prcType=19");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java

@@ -26,8 +26,6 @@ public class MinisterApprovalAfter 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());
@@ -36,11 +34,6 @@ public class MinisterApprovalAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-//        String user = object.getString("prcCreateUser");
-//        delegateTask.setVariable("createUser",user);
-//        String username = object.getString("prcCreateUserName");
-//        delegateTask.setVariable("createUserName",username);
         String user =  delegateTask.getVariable("createUser",String.class);
         String username = delegateTask.getVariable("createUserName",String.class);
         String prcName="";
@@ -67,13 +60,6 @@ public class MinisterApprovalAfter implements TaskListener {
         }
 
 
-//        if(object.getString("signFlag").equals("1")) {
-//            prcName = standName + "-标准法规清单申请-会签";
-//        }else {
-//            prcName = standName + "-标准法规清单申请-经理审批";
-//        }
-
-
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -85,7 +71,6 @@ public class MinisterApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -111,16 +96,6 @@ public class MinisterApprovalAfter 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("业务经理审批");
-            busProcessNewNext.setUserId(object.getString("jlUserId"));
-            busProcessNewNext.setPrcName(prcName);
-            busBean.save(busProcessNewNext);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java

@@ -26,7 +26,7 @@ public class MinisterApprovalBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=18");
+            one1.setLink("zcchStep3?prcType=18");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java

@@ -26,8 +26,6 @@ public class PRGAMStartAfter 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());
@@ -50,11 +48,6 @@ public class PRGAMStartAfter implements TaskListener {
         delegateTask.setVariable("createUserName",username);
         String prcName = "";
         prcName= "政策课题组参会流程-法规认证部副部长审核";
-//        if(object.getString("signFlag").equals("1")) {
-//            prcName = standName + "-标准法规清单申请-会签";
-//        }else {
-//            prcName = standName + "标准法规清单申请-经理审批";
-//        }
 
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -68,7 +61,6 @@ public class PRGAMStartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -94,16 +86,6 @@ public class PRGAMStartAfter 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("业务经理审批");
-            busProcessNewNext.setUserId(object.getString("jlUserId"));
-            busProcessNewNext.setPrcName(prcName);
-            busBean.save(busProcessNewNext);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java

@@ -14,7 +14,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class PresidentApprovalAfter implements TaskListener {
@@ -26,8 +28,6 @@ public class PresidentApprovalAfter 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());
@@ -37,15 +37,11 @@ public class PresidentApprovalAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-//        String user = object.getString("prcCreateUser");
-//        delegateTask.setVariable("createUser",user);
         String user =  delegateTask.getVariable("createUser",String.class);
         String username = delegateTask.getVariable("createUserName",String.class);
         String prcName="";
         List<String> nextUserList = new ArrayList();
 
-
         if("1".equals(object.getString("gsfz"))){
             delegateTask.setVariable("gsfz", "1");
             prcName = "政策课题组参会流程";
@@ -59,14 +55,14 @@ public class PresidentApprovalAfter implements TaskListener {
         }
 
 
-
+        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(object.getString("gsfz"))){
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("18");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
@@ -74,7 +70,6 @@ public class PresidentApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -106,8 +101,7 @@ public class PresidentApprovalAfter implements TaskListener {
             busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
             busProcessNewNext.setMesg(object.toJSONString());
             busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo("业务经理审批");
+            busProcessNewNext.setTaskInfo("政策课题组参会流程-流程结束");
-            busProcessNewNext.setUserId(object.getString("jlUserId"));
             busProcessNewNext.setPrcName(prcName);
             busBean.save(busProcessNewNext);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java

@@ -26,7 +26,7 @@ public class PresidentApprovalBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=18");
+            one1.setLink("zcchStep2?prcType=18");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java

@@ -36,13 +36,6 @@ public class RevisionInformationAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-//        String user = object.getString("prcCreateUser");
-//        delegateTask.setVariable("createUser",user);
-//        String username = object.getString("prcCreateUserName");
-//        delegateTask.setVariable("createUserName",username);
-//        String standName = object.getString("listName");
-//        delegateTask.setVariable("listName",standName);
         String user =  delegateTask.getVariable("createUser",String.class);
         String username = delegateTask.getVariable("createUserName",String.class);
         String prcName="";
@@ -55,13 +48,6 @@ public class RevisionInformationAfter implements TaskListener {
         }
 
 
-//        if(object.getString("signFlag").equals("1")) {
-//            prcName = standName + "-标准法规清单申请-会签";
-//        }else {
-//            prcName = standName + "-标准法规清单申请-经理审批";
-//        }
-
-
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -73,7 +59,6 @@ public class RevisionInformationAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
@@ -88,16 +73,6 @@ public class RevisionInformationAfter 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("业务经理审批");
-            busProcessNewNext.setUserId(object.getString("jlUserId"));
-            busProcessNewNext.setPrcName(prcName);
-            busBean.save(busProcessNewNext);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java

@@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=18");
+            one1.setLink("zcchStep1-1?prcType=18");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java

@@ -26,7 +26,7 @@ public class PGREPresidentApprovalBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("bzqdfbStep3?prcType=17");
+            one1.setLink("zcrhStep4?prcType=17");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java

@@ -26,7 +26,7 @@ public class PRGEInspectorApprovalBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment3?prcType=17");
+            one1.setLink("zcrhStep3?prcType=17");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java

@@ -30,7 +30,7 @@ public class PRGEMinisterConfirmBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("policyResearchGroupEnrollment2?prcType=17");
+            one1.setLink("zcrhStep2?prcType=17");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-
+//政策课题组入会
 public class PRGEStartAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -52,13 +52,12 @@ public class PRGEStartAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-//        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("revisionId");
         delegateTask.setVariable("createUser",user);
         String username = object.getString("revisionIdName");
         delegateTask.setVariable("createUserName",username);
         String prcName="";
-        prcName = "标准化活动入会流程-法规认证部副部长审核";
+        prcName = "政策课题组入会流程-法规认证部副部长审核";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java

@@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("bzqdfbStep3?prcType=17");
+            one1.setLink("zcrhStep1-1?prcType=17");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,6 +15,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.activiti.engine.impl.json.JsonObjectConverter;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
@@ -30,74 +32,54 @@ public class ChargeVerifyAfter 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 = "标准化活动入会流程-";
-
+        JSONObject sum = new JSONObject();
+        if(null == delegateTask.getVariable("membersSumJSON")){
+            delegateTask.setVariable("membersSumJSON",sum);
+        }
         Integer count = 0;
-
         if(null == delegateTask.getVariable("chargePassCount")){
             delegateTask.setVariable("chargePassCount",count);
         }
-        JSONArray objects = new JSONArray();
+        if("1".equals(object.getString("passFlag"))){//通过
-        if(null == delegateTask.getVariable("chargePassList")) {
+            JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-            delegateTask.setVariable("chargePassList", objects);
+            sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
-        }
+            if(sum.isEmpty()){
-        // 审批
+                sum = object;
-        //防止重复审批同一对象
+                delegateTask.setVariable("membersSumJSON",sum);
-        List<String> idList = new ArrayList<>();
+            }else {
-        if(null == delegateTask.getVariable("chargeIdList")){
+                JSONObject o1 = sum.getJSONObject("rh_pageData");
-            delegateTask.setVariable("chargeIdList", idList);
+                JSONObject o = os.getJSONObject(0);
-        }
+                JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-        int rat = 0;
+                os1.add(o);
-        idList = delegateTask.getVariable("chargeIdList",List.class);
+                o1.put("myPartRole",os1);
-        if(!idList.isEmpty()){
+                sum.put("rh_pageData",o1);
-            for(String a : idList){
+                delegateTask.setVariable("membersSumJSON",sum);
-                if(a.equals(object.getString("member"))){
-                    rat = 1;
-                    break;
-                }
             }
-        }
+            count = delegateTask.getVariable("chargePassCount",Integer.class);
-        if(rat == 0){
+            delegateTask.setVariable("chargePassCount",count + 1);
-            if("1".equals(object.getString("passFlag"))){//通过
+            delegateTask.setVariable("pass2",1);//排他通道
-
+            if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                idList.add(object.getString("member"));
+                prcName = prcName + "标准法规工程师汇总修订";
-                delegateTask.setVariable("chargeIdList",idList);
+                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-
+                    nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("pass2",1);//排他通道
+                    delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
-                count = delegateTask.getVariable("chargePassCount",Integer.class);
-                delegateTask.setVariable("chargePassCount",count + 1);
-                objects = delegateTask.getVariable("chargePassList",JSONArray.class);
-                objects.add(object);
-                delegateTask.setVariable("chargePassList",objects);
-                System.out.println(delegateTask.getVariable("chargePassList"));
-                if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                        nextUserList.add(object.getString("engineerSum"));
-                        delegateTask.setVariable("engineerSum", nextUserList);
-                    }//下一节点
                 }
-            }else{
-                delegateTask.setVariable("pass2",0);//排他通道
-                if(StringUtils.isNotBlank(object.getString("member"))) {
-                    nextUserList.add(object.getString("member"));
-                    delegateTask.setVariable("member", nextUserList);
-                }//驳回重写
             }
         }else{
-            throw new ActivitiException("审批过了");
+                prcName = prcName + "入会代表填写入会信息表";
+                delegateTask.setVariable("pass2",0);//排他通道
+                nextUserList.add(object.getString("member"));
         }
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -113,7 +95,6 @@ public class ChargeVerifyAfter implements TaskListener {
         }
 
 
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -121,9 +102,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());
@@ -141,8 +120,12 @@ prcName = standName + "-标准化活动入会流程-";
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(objects.toJSONString());
+                if(delegateTask.getVariable("pass2",Integer.class).equals(0)){
-//                busProcessNewNext.setMesg(object.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,59 +28,42 @@ 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());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         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);
         }
 
-        //防止重复审批同一对象
+        //全员不通过，检测条件 directorCount
-        List<String> idList = new ArrayList<>();
+        Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
-        if(null == delegateTask.getVariable("memberIdList")){
+        Integer count = 0;
-            delegateTask.setVariable("memberIdList", idList);
+        if(null == delegateTask.getVariable("directorCount")){
+            delegateTask.setVariable("directorCount", count);
         }
-        int rat = 0;
+        count = delegateTask.getVariable("directorCount",Integer.class);
-        idList = delegateTask.getVariable("memberIdList",List.class);
+        delegateTask.setVariable("directorCount",count+1);
-        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"))) {
 
-                nextUserList.add(object.getString("memberId"));
+        if("1".equals(object.getString("passFlag"))) {
-                if (null!=delegateTask.getVariable("memberList")) {
+            prcName = prcName + "入会代表填写入会信息表";
-                    List<String> middle=delegateTask.getVariable("memberList",List.class);
+            nextUserList.add(object.getString("memberId"));
-                    middle.addAll(nextUserList);
+            if (null!=delegateTask.getVariable("memberList")) {
-                    delegateTask.setVariable("memberList",middle);
+                List<String> middle=delegateTask.getVariable("memberList",List.class);
-                }else {
+                middle.addAll(nextUserList);
-                    delegateTask.setVariable("memberList",nextUserList);
+                delegateTask.setVariable("memberList",middle);
-                }
+            }else {
-                delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
+                delegateTask.setVariable("memberList",nextUserList);
-            }else{
-                //TODO 如果所有人未通过，则结束流程
             }
-        }else{
+            delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            throw new ActivitiException("此对象已经审批过了");
         }
 
 
@@ -104,9 +87,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

@@ -28,23 +28,20 @@ public class EngineerReviseAfter 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();
 
-        if (StringUtils.isNotBlank(object.getString("leader"))) {
+        String prcName = "标准化活动入会流程-";
-            nextUserList.add(object.getString("leader"));
+        prcName = prcName + "标准法规部主管领导审核";
-            delegateTask.setVariable("leader", nextUserList);
+        nextUserList.add(object.getString("leader"));
-        }
+        delegateTask.setVariable("leader", object.getString("leader"));
+
+
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -53,9 +50,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());
@@ -67,6 +62,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
             one1.setPrcType("20");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
+            one1.setOverTime(OVERTIME);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
@@ -84,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

@@ -29,19 +29,15 @@ public class LeaderVerifyAfter 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"))) {//通过
             delegateTask.setVariable("pass3",1);
             if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) {
@@ -52,16 +48,14 @@ 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(delegateTask.getVariable("engineerSum",String.class));
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -85,9 +79,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,67 +30,36 @@ 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);
         }
-        //防止重复审批同一对象
+        if("1".equals(object.getString("passFlag"))) {//通过
-        List<String> idList = new ArrayList<>();
+            count = delegateTask.getVariable("managePassCount",Integer.class);
-        if(null == delegateTask.getVariable("manageIdList")){
+            count++;
-            delegateTask.setVariable("manageIdList", idList);
+            delegateTask.setVariable("managePassCount",count);
-        }
+            if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-        int rat = 0;
+                prcName = prcName + "技术委员会常务副主任/总院院长审定";
-        idList = delegateTask.getVariable("manageIdList",List.class);
+                nextUserList.add(object.getString("president"));
-        if(!idList.isEmpty()){
+                delegateTask.setVariable("president", object.getString("president"));
-            for(String a : idList){
+                delegateTask.setVariable("managePassCount",0);
-                if(a.equals(object.getString("manageDepartment"))){
+                delegateTask.setVariable("pass4",1);
-                    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);
-                count++;
-                delegateTask.setVariable("managePassCount",count);
-                if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("president"))) {
-                        nextUserList.add(object.getString("president"));
-                        delegateTask.setVariable("president", nextUserList);
-                    }
-                    delegateTask.setVariable("pass4",1);
-                }
-
-            }else{
-                delegateTask.setVariable("pass4",0);
-                delegateTask.removeVariable("manageIdList");
-
-                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                    nextUserList.add(object.getString("engineerSum"));
-                    delegateTask.setVariable("engineerSum", nextUserList);
-                }
             }
         }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();
@@ -111,9 +80,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,35 +28,26 @@ 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);
-            if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) {
+            nextUserList.add(object.getString("engineerSumDone"));
-                nextUserList.add(object.getString("engineerSumDone"));
+            delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone"));
-                delegateTask.setVariable("engineerSumDone", nextUserList);
-            }
-
         }else{
+            prcName = prcName + "标准法规工程师汇总修订";
             delegateTask.setVariable("pass5",0);
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
-        //         存储当前节点意见
+        //存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -77,9 +68,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

@@ -29,27 +29,18 @@ public class WriteMemberInfoAfter 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 = "标准化活动入会流程-";
-        //
+        prcName = prcName + "入会人员所在部门负责人审核";
-        if(StringUtils.isNotBlank(object.getString("charge"))) {
+        nextUserList.add(object.getString("charge"));
-            nextUserList.add(object.getString("charge"));
+        delegateTask.setVariable("charge",object.getString("charge"));
-            delegateTask.setVariable("charge", nextUserList);
-            System.out.println(delegateTask.getVariable("charge"));
-        }
-
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -58,9 +49,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();

src/main/resources/application.yml

@@ -18,7 +18,7 @@ eureka:
       defaultZone: http://62.234.136.153:8761/eureka/
 spring:
   application:
-    name: bat-wkflow-leo
+    name: bat-wkflow
   http:
     encoding:
       charset: UTF-8

src/main/resources/mapper/datas/BusProcessNewMapper.xml

@@ -4,24 +4,24 @@
 
     <select id="findNoExecuteBusProcessNew"
             resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
-        select BUS_PROCESS_NEW.* from  BUS_PROCESS_NEW
+        select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
         INNER JOIN ACT_HI_TASKINST on BUS_PROCESS_NEW.TASK_ID = ACT_HI_TASKINST.ID_
         where BUS_PROCESS_NEW.TASK_ID in
         <foreach collection="taskIds" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-         and ACT_HI_TASKINST.END_TIME_ is null
+        and ACT_HI_TASKINST.END_TIME_ is null
     </select>
 
     <select id="findNoExecuteBusProcessNewForEnd"
             resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
-        select BUS_PROCESS_NEW.* from  BUS_PROCESS_NEW
+        select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
         INNER JOIN ACT_HI_TASKINST on BUS_PROCESS_NEW.TASK_ID = ACT_HI_TASKINST.ID_
         where BUS_PROCESS_NEW.TASK_ID in
         <foreach collection="taskIds" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
---         and ACT_HI_TASKINST.END_TIME_ is NOT null
+        -- and ACT_HI_TASKINST.END_TIME_ is NOT null
     </select>
 
     <select id="queryTaskName" resultType="java.lang.String">
@@ -33,4 +33,16 @@
           LEFT JOIN act_hi_taskinst aht ON bpn.TASK_ID = aht.ID_
           WHERE bpn.P_ID = #{pId} and aht.TASK_DEF_KEY_ = #{key}
     </select>
+
+    <select id="everyDayTenOlock" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
+      SELECT
+            *
+        FROM
+            bus_process_new
+        WHERE
+            MESG -> '$.time2' LIKE CONCAT(
+            '%',
+	CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束'
+    </select>
+
 </mapper>