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

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java

@@ -8,7 +8,9 @@ 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.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
 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;
@@ -57,27 +59,38 @@ public class DirectorAfter implements TaskListener {
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("1");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-        BusProcessNew busProcessNew = new BusProcessNew();
+            String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
-        busProcessNew.setMsgType("clause");
+            if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
-        if (object.getString("lawsProveChiefVerify")=="0"){
-            func2(delegateTask, busBean, object, "0", busProcessNameService);
-        }
 
+                BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"laws2");
+                delegateTask.setVariable("lawsProveChiefVerify",0);
+
+            } else {
+                BusProcessNew busProcessNew = new BusProcessNew();
+                busProcessNew.setMsgType("clause");
+                busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                busProcessNew.setMesg(object.toJSONString());
+                busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNew.setFinishFlag("0");
+                busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNew.setUserId(lawsProveEngineerId2);
+                busProcessNew.setPrcName(prcName);
+                busBean.save(busProcessNew);
+
+                BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2);
+                delegateTask.setVariable("lawsProveChiefVerify", 1);
+            }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
+        }
     }
 
     private String verifyObj(String str){

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java

@@ -66,14 +66,14 @@ public class DistributionAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-工程师填写意见";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
+//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java

@@ -8,7 +8,9 @@ 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.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
 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;
@@ -36,18 +38,17 @@ public class DockerReviewAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-        if("0".equals(object.getString("actionFlag"))){
+//        if("0".equals(object.getString("actionFlag"))){
-            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+//            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
-            if(StringUtils.isNotBlank(lawsProveEngineer)){
+//            if(StringUtils.isNotBlank(lawsProveEngineer)){
-                delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);
+//                delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);
-                delegateTask.setVariable("responseDockerVerify",0);
+//                delegateTask.setVariable("responseDockerVerify",0);
-
+//
-                nextUserList= Arrays.asList(lawsProveEngineer.split(","));
+//                nextUserList.add(object.getString("lawsProveEngineerId"));
-                delegateTask.addCandidateUsers(nextUserList);
+//            }
-            }
+//        }else {
-        }else {
+//            delegateTask.setVariable("responseDockerVerify",1);
-            delegateTask.setVariable("responseDockerVerify",1);
+//        }
-        }
 
 
         //截止时间 流程描述 创建人
@@ -63,37 +64,40 @@ public class DockerReviewAfter implements TaskListener {
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-        BusProcessNew busProcessNew = new BusProcessNew();
+            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
-        busProcessNew.setMsgType("clause");
+            String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+                delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);
-            for(String nextUser : nextUserList){
+                nextUserList.add(lawsProveEngineer);
 
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+                BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                busProcessNewNext.setMsgType("clause");
+                delegateTask.setVariable("responseDockerVerify", 0);
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            } else {
-                busProcessNewNext.setMesg(object.toJSONString());
+                BusProcessNew busProcessNew = new BusProcessNew();
-                busProcessNewNext.setFinishFlag("0");
+                busProcessNew.setMsgType("clause");
-                busProcessNewNext.setTaskInfo("法规工程师修订征求意见");
+                busProcessNew.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNew.setMesg(object.toJSONString());
-                busProcessNewNext.setPrcName(prcName);
+                busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busBean.save(busProcessNewNext);
+                busProcessNew.setFinishFlag("0");
+                busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNew.setUserId(commentUser);
+                busProcessNew.setPrcName(prcName);
+                busBean.save(busProcessNew);
+
+                BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                delegateTask.setVariable("commentUser",commentUser);
+                delegateTask.setVariable("responseDockerVerify", 1);
             }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java

@@ -9,7 +9,9 @@ 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.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
 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;
@@ -36,44 +38,20 @@ public class EngineerReviewAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        if ("0".equals( object.getString("actionFlag"))){
-            JSONObject form = JSONObject.parseObject(object.getString("form"));
-            String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId");
-            if(StringUtils.isNotBlank(lawsProveEngineer)){
-
-                JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
-                if (commentCollectionList==null) {
-                    commentCollectionList=new JSONArray();
-                }
-                commentCollectionList.addAll(object.getJSONArray("info"));
-                delegateTask.setVariable("commentCollectionList",commentCollectionList);
-
-
-                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
-                delegateTask.setVariable("lawsProveEngineerVerify",0);
-
-
-                nextUserList= Arrays.asList(lawsProveEngineer.split(","));
-                delegateTask.addCandidateUsers(nextUserList);
-            }
-        }
-
-
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-法规工程师汇总修订";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
@@ -103,20 +81,41 @@ public class EngineerReviewAfter implements TaskListener {
             busBean.save(busProcessNew);
         }
 
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
+            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser");
+            if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+                JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
-            for(String nextUser : nextUserList){
+                if (commentCollectionList==null) {
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+                    commentCollectionList=new JSONArray();
-                busProcessNewNext.setMsgType("clause");
+                }
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                commentCollectionList.addAll(object.getJSONArray("info"));
-                busProcessNewNext.setMesg(object.toJSONString());
+                delegateTask.setVariable("commentCollectionList",commentCollectionList);
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+
-                busProcessNewNext.setFinishFlag("0");
+                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                nextUserList.add(lawsProveEngineer);
-                busProcessNewNext.setUserId(nextUser);
+
-                busProcessNewNext.setPrcName(prcName);
+                BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                busBean.save(busProcessNewNext);
+                delegateTask.setVariable("lawsProveEngineerVerify", 0);
+            } else {
+                BusProcessNew busProcessNew = new BusProcessNew();
+                busProcessNew.setMsgType("clause");
+                busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                busProcessNew.setMesg(object.toJSONString());
+                busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNew.setFinishFlag("0");
+                busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNew.setUserId(commentUser);
+                busProcessNew.setPrcName(prcName);
+                busBean.save(busProcessNew);
+
+                BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                delegateTask.setVariable("commentUser",commentUser);
+                delegateTask.setVariable("lawsProveEngineerVerify", 1);
             }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java

@@ -54,14 +54,14 @@ public class EngineerRevisionAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-法规认证部长审核";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java

@@ -40,12 +40,8 @@ public class FillCommentAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
         if(StringUtils.isNotBlank(responseDocker)){
-
-
-
             delegateTask.setVariable("responseDockerId",responseDocker);
-            nextUserList= Arrays.asList(responseDocker.split(","));
+            nextUserList.add(object.getString("responseDockerId"));
-            delegateTask.addCandidateUsers(nextUserList);
         }
 
 
@@ -55,14 +51,14 @@ public class FillCommentAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-责任对接人审核";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java

@@ -49,7 +49,7 @@ public class LaunchAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-任务分发";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.policyCommentProcess;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -8,7 +9,9 @@ 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.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
 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;
@@ -37,65 +40,54 @@ public class MinisterReviewAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        if ("0".equals(object.getString("actionFlag"))){
-
-            JSONObject form = JSONObject.parseObject(object.getString("form"));
-            String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId");
-            if(StringUtils.isNotBlank(lawsProveViceChief)){
-
-                delegateTask.setVariable("lawsProveMinisterVerify",0);
-                delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief);
-                nextUserList= Arrays.asList(lawsProveViceChief.split(","));
-                delegateTask.addCandidateUsers(nextUserList);
-            }
-        }
-
-
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-法规认证副总监审核";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-        BusProcessNew busProcessNew = new BusProcessNew();
+            String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId");
-        busProcessNew.setMsgType("clause");
+            String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+            if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
-            for(String nextUser : nextUserList){
+
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+                delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief);
-                busProcessNewNext.setMsgType("clause");
+                nextUserList.add(lawsProveViceChief);
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+
-                busProcessNewNext.setMesg(object.toJSONString());
+                BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                delegateTask.setVariable("lawsProveMinisterVerify", 0);
-                busProcessNewNext.setFinishFlag("0");
+            } else {
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                BusProcessNew busProcessNew = new BusProcessNew();
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNew.setMsgType("clause");
-                busProcessNewNext.setPrcName(prcName);
+                busProcessNew.setPId(delegateTask.getProcessInstanceId());
-                busBean.save(busProcessNewNext);
+                busProcessNew.setMesg(object.toJSONString());
+                busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNew.setFinishFlag("0");
+                busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNew.setUserId(lawsProveEngineerId2);
+                busProcessNew.setPrcName(prcName);
+                busBean.save(busProcessNew);
+
+                BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2);
+                delegateTask.setVariable("lawsProveMinisterVerify", 1);
             }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java

@@ -8,7 +8,9 @@ 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.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
 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;
@@ -37,65 +39,55 @@ public class ViceDirectorAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        if ("0".equals(object.getString("actionFlag"))){
-
-
-            JSONObject form = JSONObject.parseObject(object.getString("form"));
-            String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId");
-            if(StringUtils.isNotBlank(lawsProveChief)){
-
-                delegateTask.setVariable("lawsProveViceChiefVerify",0);
-                delegateTask.setVariable("lawsProveChiefId",lawsProveChief);
-                nextUserList= Arrays.asList(lawsProveChief.split(","));
-                delegateTask.addCandidateUsers(nextUserList);
-            }
-        }
-
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-法规认证总监审核";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws2");
-//            one1.setPrcName(prcName);
+            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-        BusProcessNew busProcessNew = new BusProcessNew();
+            String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId");
-        busProcessNew.setMsgType("clause");
+            String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+            if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
-            for(String nextUser : nextUserList){
+
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+                nextUserList.add(lawsProveChief);
-                busProcessNewNext.setMsgType("clause");
+
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                delegateTask.setVariable("lawsProveChiefId",lawsProveChief);
-                busProcessNewNext.setMesg(object.toJSONString());
+
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                busProcessNewNext.setFinishFlag("0");
+                delegateTask.setVariable("lawsProveViceChiefVerify", 0);
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+            } else {
-                busProcessNewNext.setUserId(nextUser);
+                BusProcessNew busProcessNew = new BusProcessNew();
-                busProcessNewNext.setPrcName(prcName);
+                busProcessNew.setMsgType("clause");
-                busBean.save(busProcessNewNext);
+                busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                busProcessNew.setMesg(object.toJSONString());
+                busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNew.setFinishFlag("0");
+                busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNew.setUserId(lawsProveEngineerId2);
+                busProcessNew.setPrcName(prcName);
+                busBean.save(busProcessNew);
+
+                BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2);
+                delegateTask.setVariable("lawsProveViceChiefVerify", 1);
             }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }
     }