Merge branch 'develop' into FOTON

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

@@ -1909,7 +1909,15 @@ public class TodoTaskController extends BaseAction {
                     return "0";
                 }
             }else {
-                return "0";
+                QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("PRC_ID", pId);
+                queryWrapper2.isNotNull("OVER_TIME");
+                BusProcessName one = iBusProcessNameService.getOne(queryWrapper2);
+                if (null!=one){
+                    return "1";
+                }else {
+                    return "0";
+                }
             }
         } else {
             return "1";

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

@@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.business_auth;
 
 
 import com.ydw.bat.wkflow.business_main.datas.dto.*;
+import com.ydw.bat.wkflow.business_main.datas.dto.WG.BusinessDeptIssue;
+import com.ydw.bat.wkflow.business_main.datas.dto.WG.ProductDeptIssue;
 import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO;
 import com.ydw.bat.wkflow.business_main.datas.entity.*;
 import com.ydw.bat.wkflow.business_slrs.dao.*;
@@ -176,5 +178,12 @@ public interface LawsUserInfoService {
     @GetMapping("/slrs/sar-public-idea/deletePublicIdea")
     public ResponseMessage<Object> deletePublicIdea(@RequestParam("id") String id);
 
+    @PostMapping("/sarStandUnqualified/businessDeptIssue/saveBatch")
+    public ResponseMessage<Object> businessDeptIssueSaveBatch(@RequestBody List<BusinessDeptIssue> issue);
+
+
+    @RequestMapping(value = "/sarStandUnqualified/productDeptIssue/saveBatch",method = RequestMethod.POST)
+    public ResponseMessage productDeptIssue(@RequestBody List<ProductDeptIssue> issue);
+
 
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/BusinessDeptIssue.java

@@ -0,0 +1,88 @@
+package com.ydw.bat.wkflow.business_main.datas.dto.WG;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class BusinessDeptIssue implements Serializable {
+
+    @TableId(value = "id", type = IdType.UUID)
+    private String id;
+
+
+    @TableField("law_id")
+    private String lawId;
+
+
+    @TableField(exist = false)
+    private String lawNumber;
+
+
+    @TableField(exist = false)
+    private String lawName;
+
+
+    @TableField("product_type")
+    private String productType;
+
+
+    @TableField("impl_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
+    private Date implTime;
+
+
+    @TableField("impl_require")
+    private String implRequire;
+
+
+    @TableField("conform_situation")
+    private String conformSituation;
+
+
+    @TableField("dev_scheme")
+    private String devScheme;
+
+
+    @TableField("sop_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
+    private Date sopTime;
+
+
+    @TableField("complete_situation")
+    private String completeSituation;
+
+
+    @TableField("timeout_situation")
+    private String timeoutSituation;
+
+
+    @TableLogic(value = "0", delval = "1")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+    @TableField("response_dept")
+    private String responseDept;
+
+
+    @TableField("response_people")
+    private String responsePeople;
+
+
+    @TableField("is_close")
+    private String isClose;
+
+
+    @TableField("is_risk")
+    private String isRisk;
+
+
+}

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/ProductDeptIssue.java

@@ -0,0 +1,76 @@
+package com.ydw.bat.wkflow.business_main.datas.dto.WG;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("product_dept_issue")
+public class ProductDeptIssue implements Serializable {
+
+  @TableId
+  private String id;
+
+  @TableField("law_id")
+  private String lawId;
+
+  @TableField(exist = false)
+  private String lawsNumber;
+
+  @TableField(exist = false)
+  private String lawsName;
+
+  @TableField("product_business")
+  private String productBusiness;
+
+  @TableField("platform")
+  private String platform;
+
+  @TableField("poj_name")
+  private String pojName;
+
+  @TableField("poj_description")
+  private String pojDescription;
+
+  @TableField("current_node")
+  private String currentNode;
+
+//  概念状态
+  @TableField("conceptual_state")
+  private String conceptualState;
+//  概念时间
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
+  @TableField("scheduled_issuance_time")
+  private Date scheduledIssuanceTime;
+//概念修订计划
+  @TableField("revised_plan")
+  private String revisedPlan;
+
+//  其他说明
+  @TableField("explanation")
+  private String explanation;
+
+  @TableField("response_dept")
+  private String responseDept;
+
+  @TableLogic(value = "0",delval = "1")
+  @TableField("del_flag")
+  private String delFlag;
+
+  @TableField("is_close")
+  private String isClose;
+
+  @TableField(exist = false)
+  private Integer page;
+
+  @TableField(exist = false)
+  private Integer pageSize;
+
+}

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/AdminReviewAfter.java

@@ -59,7 +59,6 @@ public class AdminReviewAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        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")
@@ -69,7 +68,6 @@ public class AdminReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DeptLeaderReviewAfter.java

@@ -58,7 +58,6 @@ public class DeptLeaderReviewAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        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")
@@ -68,7 +67,6 @@ public class DeptLeaderReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

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

@@ -57,7 +57,6 @@ public class DistributionAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        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")
@@ -67,7 +66,6 @@ public class DistributionAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/FeedBackAfter.java

@@ -51,7 +51,6 @@ public class FeedBackAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        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")
@@ -61,7 +60,6 @@ public class FeedBackAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

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

@@ -51,7 +51,6 @@ public class LaunchAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        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")
@@ -61,7 +60,6 @@ public class LaunchAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);

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

@@ -77,7 +77,6 @@ public class MinisterReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java

@@ -60,9 +60,7 @@ public class ReLaunchAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
-//            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java

@@ -56,7 +56,6 @@ public class SubMinisterReviewAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        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")
@@ -66,7 +65,6 @@ public class SubMinisterReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java

@@ -1,7 +1,12 @@
 package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
 
+import com.alibaba.fastjson.JSON;
+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.WG.BusinessDeptIssue;
+import com.ydw.bat.wkflow.business_main.datas.dto.WG.ProductDeptIssue;
 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;
@@ -14,10 +19,7 @@ import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 副总监审核
@@ -28,6 +30,7 @@ public class SubViceDirectorAfter implements TaskListener {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -36,6 +39,12 @@ public class SubViceDirectorAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
+        int i=1;
+        if (null!=delegateTask.getVariable("finishCount")){
+            i=delegateTask.getVariable("finishCount",Integer.class)+1;
+        }
+        delegateTask.setVariable("finishCount",i);
+
 
         /**
          * next 结束
@@ -44,6 +53,82 @@ public class SubViceDirectorAfter implements TaskListener {
         if ("0".equals(object.getString("actionFlag"))){
             delegateTask.setVariable("lawsProveViceChiefVerify",0);
 
+
+            if ("1".equals(object.getString("feedbackDept"))) {
+                List<BusinessDeptIssue> list = new ArrayList<>();
+                if (null != delegateTask.getVariable("v")) {
+                    list = delegateTask.getVariable("v", List.class);
+                }
+                JSONArray array = object.getJSONArray("infoTableDatas");
+                if (array.size() > 0) {
+                    for (Object o : array) {
+                        JSONObject object1 = JSON.parseObject(o.toString());
+                        BusinessDeptIssue businessDeptIssue = new BusinessDeptIssue();
+                        businessDeptIssue.setDelFlag("0");
+                        businessDeptIssue.setId(String.valueOf(UUID.randomUUID()));
+                        businessDeptIssue.setLawId(object1.getString("lawId"));
+                        businessDeptIssue.setImplRequire(object1.getString("implRequire"));
+                        businessDeptIssue.setImplTime(object1.getDate("implTime"));
+                        businessDeptIssue.setCompleteSituation(object1.getString("completeSituation"));
+                        businessDeptIssue.setSopTime(object1.getDate("sopTime"));
+                        businessDeptIssue.setLawName(object1.getString("lawName"));
+                        businessDeptIssue.setConformSituation(object1.getString("conformSituation"));
+                        businessDeptIssue.setTimeoutSituation(object1.getString("timeoutSituation"));
+                        businessDeptIssue.setDevScheme(object1.getString("devScheme"));
+                        businessDeptIssue.setLawNumber(object1.getString("lawCode"));
+                        businessDeptIssue.setProductType(object1.getString("dataSource"));
+                        businessDeptIssue.setResponsePeople(object1.getString("zerenren"));
+                        businessDeptIssue.setIsClose("0");
+                        list.add(businessDeptIssue);
+                    }
+                }
+
+                delegateTask.setVariable("v", list);
+
+                if (i >= delegateTask.getVariable("responseUserIdList", List.class).size()) {
+                    lawsUserInfoService.businessDeptIssueSaveBatch(list);
+                }
+            }else {
+                List<ProductDeptIssue> list = new ArrayList<>();
+                if (null != delegateTask.getVariable("v2")) {
+                    list = delegateTask.getVariable("v2", List.class);
+                }
+                JSONArray array = object.getJSONArray("infoTableDatas");
+                JSONArray tables = object.getJSONArray("table");
+                if (array.size() > 0 && tables.size()>0) {
+                    for (Object ta:tables){
+                      JSONObject object2=JSON.parseObject(ta.toString());
+                        for (Object o : array) {
+                            JSONObject object1 = JSON.parseObject(o.toString());
+                            ProductDeptIssue productDeptIssue = new ProductDeptIssue();
+                            productDeptIssue.setDelFlag("0");
+                            productDeptIssue.setId(String.valueOf(UUID.randomUUID()));
+                            productDeptIssue.setLawId(object1.getString("lawId"));
+                            productDeptIssue.setLawsNumber(object1.getString("lawCode"));
+                            productDeptIssue.setLawsName(object1.getString("lawName"));
+                            productDeptIssue.setProductBusiness(object2.getString("yewu"));
+                            productDeptIssue.setPlatform(object2.getString("pingtai"));
+                            productDeptIssue.setPojName(object2.getString("xiangmu"));
+                            productDeptIssue.setPojDescription(object2.getString("xiangmumiaoshu"));
+                            productDeptIssue.setCurrentNode(object2.getString("dangqianjiedian"));
+                            productDeptIssue.setConceptualState(object2.getString("gainianzhuangtai"));
+                            productDeptIssue.setScheduledIssuanceTime(object2.getDate("gainianzhuangtaiDate"));
+                            productDeptIssue.setRevisedPlan(object2.getString("gainianxiudingjihua"));
+                            productDeptIssue.setExplanation(object2.getString("qitashuoming"));
+                            productDeptIssue.setResponseDept(object2.getString("zerenren"));
+                            productDeptIssue.setIsClose("0");
+                            list.add(productDeptIssue);
+                        }
+                    }
+
+                }
+
+                delegateTask.setVariable("v2", list);
+                if (i >= delegateTask.getVariable("responseUserIdList", List.class).size()) {
+                    lawsUserInfoService.productDeptIssue(list);
+                }
+            }
+
             //流程结束
             func2(delegateTask, busBean, object, "0", busProcessNameService);
 
@@ -71,7 +156,9 @@ public class SubViceDirectorAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
+            if (i>=delegateTask.getVariable("responseUserIdList",List.class).size()) {
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("laws3");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);

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

@@ -72,7 +72,6 @@ public class ViceDirectorAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        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")
@@ -81,9 +80,7 @@ public class ViceDirectorAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
-//            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java

@@ -123,6 +123,18 @@ public class ResponUserSignAfter implements TaskListener {
                             busBean.save(busProcessNewNext);
                         }
                     }
+                }else{
+                    delegateTask.setVariable("actionFlag",1);
+                    delegateTask.setVariable("cs",0);
+                    BusProcessNew busProcessNewNext = new BusProcessNew();
+                    busProcessNewNext.setMsgType("clause");
+                    busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setFinishFlag("0");
+                    busProcessNewNext.setTaskInfo("调研结果处理");
+                    busProcessNewNext.setPrcName(prcName);
+                    busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
+                    busBean.save(busProcessNewNext);
                 }
             } else {
                 delegateTask.setVariable("actionFlag",1);

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java

@@ -80,6 +80,21 @@ public class UploadResearchResultAfter  implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
+
 
 
         BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java

@@ -98,7 +98,7 @@ public class BussLibraryC3After implements TaskListener{
                     BusProcessNew busProcessNewNext = new BusProcessNew();
                     busProcessNewNext.setMsgType("clause");
                     busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setMesg(objectNew.toJSONString());
                     busProcessNewNext.setFinishFlag("0");
                     busProcessNewNext.setUserId(nextUser);
                     busProcessNewNext.setPrcName(prcName);

src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java

@@ -35,8 +35,8 @@ public class LCLApplicantAfter implements TaskListener{
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
 
-//        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject objectNew =  JSONObject.parseObject(datas.getFormValsJson());
-//        delegateTask.setVariable("objectJson",object);
+        delegateTask.setVariable("objectJson",objectNew);
 
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -48,9 +48,9 @@ public class LCLApplicantAfter implements TaskListener{
             JSONObject object =  JSONObject.parseObject(one.getMesg());
             List<String> nextUserList = new ArrayList();
 
-            if(StringUtils.isNotBlank(object.getString("jlUserId"))){
+            if(StringUtils.isNotBlank(objectNew.getString("jlUserId"))){
-                delegateTask.setVariable("managerUserId",object.getString("jlUserId"));
+                delegateTask.setVariable("managerUserId",objectNew.getString("jlUserId"));
-                nextUserList.add(object.getString("jlUserId"));
+                nextUserList.add(objectNew.getString("jlUserId"));
             }else {
                 throw new ActivitiException("1#2经理人不存在,请配置相关人员");
             }
@@ -59,8 +59,8 @@ public class LCLApplicantAfter implements TaskListener{
 
             //截止时间 流程描述 创建人
             String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-            String user = object.getString("prcCreateUser");
+            String user = objectNew.getString("prcCreateUser");
-            String username = object.getString("prcCreateUserName");
+            String username = objectNew.getString("prcCreateUserName");
 //        object.getString("standName")
             String standName = "";
             String prcName = "政策入库流程";
@@ -81,10 +81,10 @@ public class LCLApplicantAfter implements TaskListener{
             busProcessNew.setId(one.getId());
             busProcessNew.setMsgType("clause");
             busProcessNew.setPId(delegateTask.getProcessInstanceId());
-            busProcessNew.setMesg(object.toJSONString());
+            busProcessNew.setMesg(objectNew.toJSONString());
             busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
             busProcessNew.setTaskId(delegateTask.getId());
-            busProcessNew.setCommitText(object.getString("commentText"));
+            busProcessNew.setCommitText(objectNew.getString("commentText"));
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(busProcessNew);
@@ -94,7 +94,7 @@ public class LCLApplicantAfter implements TaskListener{
                     BusProcessNew busProcessNewNext = new BusProcessNew();
                     busProcessNewNext.setMsgType("clause");
                     busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setMesg(objectNew.toJSONString());
                     busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                     busProcessNewNext.setFinishFlag("0");
                     busProcessNewNext.setTaskInfo(delegateTask.getName());

src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantBefore.java

@@ -24,6 +24,8 @@ public class LCLApplicantBefore implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java

@@ -8,6 +8,7 @@ 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.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -34,7 +35,6 @@ public class LawsManagerApproveAfter implements TaskListener {
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String prcName = "政策入库流程";
         if ("1".equalsIgnoreCase(approvalOpinion)) {
-            delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
 
             BusProcessNew busProcessNew = new BusProcessNew();
             busProcessNew.setMsgType("clause");
@@ -47,7 +47,8 @@ public class LawsManagerApproveAfter implements TaskListener {
             busProcessNew.setPrcName(prcName);
             busBean.save(busProcessNew);
 
-            func1(delegateTask, busBean, object, "1");
+            BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+            delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
             delegateTask.setVariable("jlFlag", 1);
         } else {
             delegateTask.setVariable("jlFlag", 0);
@@ -74,7 +75,7 @@ public class LawsManagerApproveAfter implements TaskListener {
         if (one2 != null) {
             //one2.setPrcName("入库流程结束");
             one2.setOverTime(OVERTIME);
-            one2.setPrcType("1");
+            one2.setPrcType("laws1");
             busProcessNameService.saveOrUpdate(one2);
         }
 

src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java

@@ -23,6 +23,7 @@ public class LawsManagerApproveBefore implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

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;
@@ -56,28 +58,39 @@ public class DirectorAfter implements TaskListener {
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
-            one1.setPrcType("1");
+            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 lawsProveEngineerId2 = object.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);
+//        }
-        }
 
 
         //截止时间 流程描述 创建人
@@ -56,44 +57,47 @@ public class DockerReviewAfter 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);
         }
 
-        // 存储当前节点意见
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-        BusProcessNew busProcessNew = new BusProcessNew();
+            String lawsProveEngineer = object.getString("lawsProveEngineerId");
-        busProcessNew.setMsgType("clause");
+            String commentUser = object.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);
@@ -89,34 +67,92 @@ public class EngineerReviewAfter implements TaskListener {
         delegateTask.setVariable("count",commentCount);
 
         Collection commentUserList=delegateTask.getVariable("commentUserList",Collection.class);
-        if(commentCount>=commentUserList.size()){
+        // 存储当前节点意见
-            // 存储当前节点意见
+        BusProcessNew busProcessNewHis = new BusProcessNew();
-            BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNewHis.setMsgType("clause");
-            busProcessNew.setMsgType("clause");
+        busProcessNewHis.setPId(delegateTask.getProcessInstanceId());
-            busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNewHis.setMesg(object.toJSONString());
-            busProcessNew.setMesg(object.toJSONString());
+        busProcessNewHis.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNewHis.setTaskId(delegateTask.getId());
-            busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNewHis.setCommitText(object.getString("commentText"));
-            busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNewHis.setFinishFlag("0");
-            busProcessNew.setFinishFlag("0");
+        busProcessNewHis.setTaskInfo(delegateTask.getName());
-            busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNewHis);
-            busBean.save(busProcessNew);
-        }
 
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-            for(String nextUser : nextUserList){
+            String lawsProveEngineer = object.getString("lawsProveEngineerId");
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+            String commentUser = object.getString("commentUser");
-                busProcessNewNext.setMsgType("clause");
+            if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+
-                busProcessNewNext.setMesg(object.toJSONString());
+                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                nextUserList.add(lawsProveEngineer);
-                busProcessNewNext.setFinishFlag("0");
+
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
-                busProcessNewNext.setUserId(nextUser);
+                if (commentCollectionList==null) {
-                busProcessNewNext.setPrcName(prcName);
+                    commentCollectionList=new JSONArray();
-                busBean.save(busProcessNewNext);
+                }
+                commentCollectionList.addAll(object.getJSONArray("info"));
+                delegateTask.setVariable("commentCollectionList",commentCollectionList);
+
+
+                if(commentCount>=commentUserList.size()){
+                    funEnd(delegateTask, busBean, queryWrapper, object, prcName);
+                    if(!nextUserList.isEmpty()){
+                        for(String nextUser : nextUserList){
+                            BusProcessNew busProcessNewNext = new BusProcessNew();
+                            busProcessNewNext.setMsgType("clause");
+                            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                            busProcessNewNext.setMesg(object.toJSONString());
+                            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                            busProcessNewNext.setFinishFlag("0");
+                            busProcessNewNext.setTaskInfo(delegateTask.getName());
+                            busProcessNewNext.setUserId(nextUser);
+                            busProcessNewNext.setPrcName(prcName);
+                            busBean.save(busProcessNewNext);
+                        }
+                    }
+                }else {
+                    funEnd(delegateTask, busBean, queryWrapper, object, prcName);
+                }
+                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驳回参数不存在");
+        }
+    }
+
+    private void funEnd(DelegateTask delegateTask, IBusProcessNewService busBean, QueryWrapper<Datas> queryWrapper, JSONObject object, String prcName) {
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        queryWrapper.isNotNull("PRC_NAME");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (!list.isEmpty()) {
+            BusProcessNew one2 = list.get(0);
+            one2.setMsgType("clause");
+            one2.setPId(delegateTask.getProcessInstanceId());
+            one2.setMesg(object.toJSONString());
+            one2.setFinishFlag("0");
+            one2.setTaskInfo(delegateTask.getName());
+            one2.setPrcName(prcName);
+            one2.setCommitFlag("0");
+            one2.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one2);
         }
     }
 

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

@@ -38,13 +38,11 @@ public class EngineerRevisionAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        JSONObject form = JSONObject.parseObject(object.getString("form"));
+        String lawsProveMinister = object.getString("lawsProveMinisterId");
-        String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId");
         if(StringUtils.isNotBlank(lawsProveMinister)){
 
             delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
-            nextUserList= Arrays.asList(lawsProveMinister.split(","));
+            nextUserList.add(lawsProveMinister);
-            delegateTask.addCandidateUsers(nextUserList);
         }
 
 
@@ -54,14 +52,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

@@ -35,17 +35,13 @@ public class FillCommentAfter implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
-        String responseDocker = JSONObject.parseObject(object.getString("form")).getString("responseDockerId");
+        String responseDocker = object.getString("responseDockerId");
 
         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 = object.getString("lawsProveViceChiefId");
-        busProcessNew.setMsgType("clause");
+            String lawsProveEngineerId2 = object.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 = object.getString("lawsProveChiefId");
-        busProcessNew.setMsgType("clause");
+            String lawsProveEngineerId2 = object.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驳回参数不存在");
         }
     }