feat: There is no way the, bug #52552 #52542

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

@@ -58,7 +58,7 @@ 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.setCreatUser(user);
             one1.setCreatUserName(username);
@@ -66,7 +66,7 @@ public class DirectorAfter implements TaskListener {
         }
 
         if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-            String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            String lawsProveEngineerId2 = object.getString("lawsProveEngineerId");
             if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
 
                 BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"laws2");

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

@@ -57,7 +57,7 @@ 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);
@@ -71,8 +71,8 @@ public class DockerReviewAfter implements TaskListener {
         }
 
         if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            String lawsProveEngineer = object.getString("lawsProveEngineerId");
-            String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser");
+            String commentUser = object.getString("commentUser");
             if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
 
                 delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);

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

@@ -67,25 +67,27 @@ 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(StringUtils.isNotBlank(object.getString("actionFlag"))){
-            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            String lawsProveEngineer = object.getString("lawsProveEngineerId");
-            String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser");
+            String commentUser = object.getString("commentUser");
             if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
 
+                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
+                nextUserList.add(lawsProveEngineer);
+
                 JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
                 if (commentCollectionList==null) {
                     commentCollectionList=new JSONArray();
@@ -93,10 +95,26 @@ public class EngineerReviewAfter implements TaskListener {
                 commentCollectionList.addAll(object.getJSONArray("info"));
                 delegateTask.setVariable("commentCollectionList",commentCollectionList);
 
-                delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
-                nextUserList.add(lawsProveEngineer);
 
-                BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                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();
@@ -119,6 +137,25 @@ public class EngineerReviewAfter implements TaskListener {
         }
     }
 
+    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);
+        }
+    }
+
     private String verifyObj(String str){
         return (str == null || str.equals("")) ? "" : str;
     }

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);
         }
 
 

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

@@ -35,7 +35,7 @@ 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();

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

@@ -60,8 +60,8 @@ public class MinisterReviewAfter implements TaskListener {
         }
 
         if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-            String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId");
+            String lawsProveViceChief = object.getString("lawsProveViceChiefId");
-            String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            String lawsProveEngineerId2 = object.getString("lawsProveEngineerId");
 
             if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
 

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

@@ -59,8 +59,8 @@ public class ViceDirectorAfter implements TaskListener {
         }
 
         if(StringUtils.isNotBlank(object.getString("actionFlag"))){
-            String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId");
+            String lawsProveChief = object.getString("lawsProveChiefId");
-            String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            String lawsProveEngineerId2 = object.getString("lawsProveEngineerId");
 
             if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {