Revert "add 未合规整改模块"

This reverts commit 572ff912 xxx
2021-07-14 15:27:50 +08:00
parent 572ff912cf
commit 8184d3841e
12 changed files with 138 additions and 94 deletions
@@ -76,6 +76,7 @@ public class SelectResponUserAfter implements TaskListener {
                        jsonObject.put("dockUser",preResponUser.getString("dockUser"));
                        jsonObject.put("info",standardInfoList.get(i));

+
                        responUserList.add(jsonObject);
                    }
                }
@@ -75,24 +75,38 @@ public class DirectorSignAfter implements TaskListener {
        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
        busBean.update(busProcessNew,updataWapper);

-        if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
-            BusProcessNew busProcessNewNext = new BusProcessNew();
-            busProcessNewNext.setMsgType("clause");
-            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-            busProcessNewNext.setMesg(object.toJSONString());
-            busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo("工程研究总院院长批准");
-            busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", JSONObject.class).getString("id"));
-            busBean.save(busProcessNewNext);
+        if (nextUserList != null && !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);
+                busBean.save(busProcessNewNext);
+            }
        } else {
-            BusProcessNew busProcessNewNext = new BusProcessNew();
-            busProcessNewNext.setMsgType("clause");
-            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-            busProcessNewNext.setMesg(object.toJSONString());
-            busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
-            busProcessNewNext.setUserId(delegateTask.getVariable("startUser", JSONObject.class).getString("id"));
-            busBean.save(busProcessNewNext);
+            if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo("工程研究总院院长批准");
+                busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
+                busBean.save(busProcessNewNext);
+            } else {
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
+                busBean.save(busProcessNewNext);
+            }
        }
    }
 }
@@ -1,6 +1,5 @@
 package com.ydw.bat.wkflow.listener.StandardSurvey;

-        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;
@@ -91,7 +90,7 @@ public class DockingApprovalAfter implements TaskListener {
            if(delegateTask.getVariable("actionFlag",Integer.class)==0){

                Integer count=delegateTask.getVariable("task1Count",Integer.class);
-                JSONArray responUserList=delegateTask.getVariable("responUserList",JSONArray.class);
+                List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
                if(count==null)count=0;
                count++;
                delegateTask.setVariable("task1Count",count);
@@ -103,7 +102,7 @@ public class DockingApprovalAfter implements TaskListener {
                    busProcessNewNext.setMesg(object.toJSONString());
                    busProcessNewNext.setFinishFlag("0");
                    busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
-                    busProcessNewNext.setUserId(delegateTask.getVariable("startUser",JSONObject.class).getString("id"));
+                    busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
                    busBean.save(busProcessNewNext);
                }

@@ -1,6 +1,5 @@
 package com.ydw.bat.wkflow.listener.StandardSurvey;

-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;
@@ -83,7 +82,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
        busBean.update(busProcessNew,updataWapper);

        Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
-        JSONArray userList=delegateTask.getVariable("userList",JSONArray.class);
+        List<String> userList=delegateTask.getVariable("userList",List.class);

        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
            if(count==null)count=0;
@@ -92,14 +91,28 @@ public class MinisterAndDockerSignAfter implements TaskListener {
        }
        if(count>=userList.size()){
            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
-                busProcessNewNext.setUserId(delegateTask.getVariable("directorUser",JSONObject.class).getString("id"));
-                busBean.save(busProcessNewNext);
+                if(nextUserList != null && !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);
+                        busBean.save(busProcessNewNext);
+                    }
+                }else {
+                    BusProcessNew busProcessNewNext = new BusProcessNew();
+                    busProcessNewNext.setMsgType("clause");
+                    busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setFinishFlag("0");
+                    busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
+                    busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
+                    busBean.save(busProcessNewNext);
+                }
            }else{
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
@@ -107,7 +120,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
                busProcessNewNext.setMesg(object.toJSONString());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
-                busProcessNewNext.setUserId(delegateTask.getVariable("startUser",JSONObject.class).getString("id"));
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
                busBean.save(busProcessNewNext);
            }
        }
@@ -74,5 +74,18 @@ public class PresidentSignAfter implements TaskListener {
        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
        busBean.update(busProcessNew,updataWapper);

+        if (nextUserList != null && !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);
+                busBean.save(busProcessNewNext);
+            }
+        }
    }
 }
@@ -1,6 +1,5 @@
 package com.ydw.bat.wkflow.listener.StandardSurvey;

-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;
@@ -33,9 +32,9 @@ public class ResponUserSignAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

-        JSONArray nextUserList = new JSONArray();
-        JSONArray userList=delegateTask.getVariable("userList",JSONArray.class);
-        JSONObject startUser=delegateTask.getVariable("startUser",JSONObject.class);
+        List<String> nextUserList = new ArrayList();
+        List<String> userList=delegateTask.getVariable("userList",List.class);
+        String startUser=delegateTask.getVariable("startUser",String.class);

        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
            if("1".equals(object.getString("actionFlag"))){
@@ -99,8 +98,7 @@ public class ResponUserSignAfter implements TaskListener {
        if(count>=responUserList.size()){
            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
                if(nextUserList != null && !nextUserList.isEmpty()){
-                    for (int i = 0; i < nextUserList.size(); i++) {
-                        JSONObject nextUser=nextUserList.getJSONObject(i);
+                    for(String nextUser : nextUserList){
                        BusProcessNew busProcessNewNext = new BusProcessNew();
                        busProcessNewNext.setMsgType("clause");
                        busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -108,7 +106,7 @@ public class ResponUserSignAfter implements TaskListener {
                        busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                        busProcessNewNext.setFinishFlag("0");
                        busProcessNewNext.setTaskInfo(delegateTask.getName());
-                        busProcessNewNext.setUserId(nextUser.getString("id"));
+                        busProcessNewNext.setUserId(nextUser);
                        busBean.save(busProcessNewNext);
                    }
                }
@@ -119,7 +117,7 @@ public class ResponUserSignAfter implements TaskListener {
                busProcessNewNext.setMesg(object.toJSONString());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
-                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", JSONObject.class).getString("id"));
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
                busBean.save(busProcessNewNext);
            }
        }
@@ -15,7 +15,6 @@ public class ResponUserSignBefore implements TaskListener {
        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
        QueryWrapper queryWrapper1 = new QueryWrapper();
        queryWrapper1.isNull("TASK_ID");
-        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
        List<BusProcessNew> list = busBean.list(queryWrapper1);
        if(!list.isEmpty()){
@@ -33,20 +33,31 @@ public class SelectResponsibleUserAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

-        JSONArray nextUserList = new JSONArray();
+        List<String> nextUserList = new ArrayList();
+        String userListString=object.getString("responUserList");
+        String userListStringName=object.getString("responUserListName");

-        JSONArray preResponUserList = object.getJSONArray("responUserList");
-        JSONArray responUserList=delegateTask.getVariable("responUserList",JSONArray.class);
-        if(responUserList==null)responUserList=new JSONArray();
-        for (int i = 0; i < preResponUserList.size(); i++) {
-            JSONObject preResponUser=preResponUserList.getJSONObject(i);
-            preResponUser.put("dockUser",delegateTask.getAssignee());
-            responUserList.add(preResponUser);
+        List<String> userList = Arrays.asList(userListString.split(","));
+        for (int i = 0; i < userList.size(); i++) {
+            nextUserList.add(userList.get(i).trim());
        }
+        List<String> userListName=Arrays.asList(userListStringName.split(","));
+        List<String> newUserListName = new ArrayList();
+        userListName.forEach((String name)->{
+            newUserListName.add(name.trim());
+        });

-        delegateTask.setVariable("responUserList",responUserList);
+        JSONObject userListJson=new JSONObject();
+        for (int i = 0; i < userList.size(); i++) {
+            JSONObject json=new JSONObject();
+            json.put("id",userList.get(i));
+            json.put("name",newUserListName.get(i));
+            userListJson.put(userList.get(i),json);
+        }
+        delegateTask.setVariable("responUserListMap",userListJson.toJSONString());
+
+        delegateTask.setVariable("responUserList",nextUserList);

-        nextUserList=responUserList;


        //截止时间 流程描述 创建人
@@ -84,14 +95,8 @@ public class SelectResponsibleUserAfter implements TaskListener {
        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
        busBean.update(busProcessNew,updataWapper);

-        Integer count=delegateTask.getVariable("selectResponCount",Integer.class);
-        if(count==null)count=0;
-        count++;
-        delegateTask.setVariable("selectResponCount",count);
-
-        if(count>=delegateTask.getVariable("dockUserList",JSONArray.class).size()){
-            for (int i = 0; i < nextUserList.size(); i++) {
-                JSONObject nextUser=nextUserList.getJSONObject(i);
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -99,10 +104,9 @@ public class SelectResponsibleUserAfter implements TaskListener {
                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser.getString("id"));
+                busProcessNewNext.setUserId(nextUser);
                busBean.save(busProcessNewNext);
            }
        }
-
    }
 }
@@ -16,8 +16,6 @@ public class SelectResponsibleUserBefore implements TaskListener {
        QueryWrapper queryWrapper1 = new QueryWrapper();
        queryWrapper1.isNull("TASK_ID");
        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
-
-        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
        List<BusProcessNew> list = busBean.list(queryWrapper1);
        if(!list.isEmpty()){
            BusProcessNew one1 = list.get(0);
@@ -1,6 +1,5 @@
 package com.ydw.bat.wkflow.listener.StandardSurvey;

-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;
@@ -35,25 +34,21 @@ public class StartSurveyAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

-        JSONArray nextUserList = new JSONArray();
-        JSONArray userList=new JSONArray();
+        List<String> nextUserList = new ArrayList();
+        List<String> userList=new ArrayList<>();

-        delegateTask.setVariable("startUser",object.getJSONObject("startUser"));
-        delegateTask.setVariable("ministerUser",object.getJSONObject("ministerUser"));
-        delegateTask.setVariable("directorUser",object.getJSONObject("directorUser"));
-        delegateTask.setVariable("presidentUser",object.getJSONObject("presidentUser"));
+        delegateTask.setVariable("startUser",object.getString("startUser"));
+        delegateTask.setVariable("dockUser",object.getString("dockUser"));
+        delegateTask.setVariable("ministerUser",object.getString("ministerUser"));
+        delegateTask.setVariable("directorUser",object.getString("directorUser"));
+        delegateTask.setVariable("presidentUser",object.getString("presidentUser"));

-        delegateTask.setVariable("dockUserList",object.getJSONArray("dockUserList"));
-
-        userList.addAll(object.getJSONArray("dockUserList"));
+        userList.add(object.getString("dockUser"));
        userList.add(object.getString("ministerUser"));

        delegateTask.setVariable("userList",userList);
        delegateTask.setVariable("actionFlag",0);

-        delegateTask.setVariable("selectResponCount",0);
-
-        nextUserList=object.getJSONArray("dockUserList");

        //截止时间 流程描述 创建人
        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -91,10 +86,7 @@ public class StartSurveyAfter implements TaskListener {
        busBean.save(busProcessNew);

        if(nextUserList != null && !nextUserList.isEmpty()){
-
-            for (int i = 0; i < nextUserList.size(); i++) {
-                JSONObject nextUser = nextUserList.getJSONObject(i);
-
+            for(String nextUser : nextUserList){
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -102,7 +94,7 @@ public class StartSurveyAfter implements TaskListener {
                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser.getString("id"));
+                busProcessNewNext.setUserId(nextUser);
                busBean.save(busProcessNewNext);
            }
        }else{
@@ -1,6 +1,5 @@
 package com.ydw.bat.wkflow.listener.StandardSurvey;

-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;
@@ -32,9 +31,9 @@ public class SummarySurveyAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

-        JSONArray nextUserList;
+        List<String> nextUserList;

-        JSONArray responUserList=delegateTask.getVariable("responUserList",JSONArray.class);
+        List<String> responUserList=delegateTask.getVariable("responUserList",List.class);

        for (int i=1;i<10;i++){
            delegateTask.setVariable("task"+ i +"Count",0);
@@ -42,6 +41,7 @@ public class SummarySurveyAfter implements TaskListener {


        delegateTask.setVariable("actionFlag",0);
+        delegateTask.setVariable("responUserList",responUserList);
        nextUserList=responUserList;


@@ -81,8 +81,7 @@ public class SummarySurveyAfter implements TaskListener {
        busBean.update(busProcessNew,updataWapper);

        if(nextUserList != null && !nextUserList.isEmpty()){
-            for (int i = 0; i < nextUserList.size(); i++) {
-                JSONObject nextUser=nextUserList.getJSONObject(i);
+            for(String nextUser : nextUserList){
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -90,7 +89,7 @@ public class SummarySurveyAfter implements TaskListener {
                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser.getString("id"));
+                busProcessNewNext.setUserId(nextUser);
                busBean.save(busProcessNewNext);
            }
        }
@@ -88,13 +88,27 @@ public class UploadResearchResultAfter  implements TaskListener {
        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
        busBean.update(busProcessNew,updataWapper);

-        BusProcessNew busProcessNewNext = new BusProcessNew();
-        busProcessNewNext.setMsgType("clause");
-        busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-        busProcessNewNext.setMesg(object.toJSONString());
-        busProcessNewNext.setFinishFlag("0");
-        busProcessNewNext.setTaskInfo("责任对接人审批");
-        busProcessNewNext.setUserId(delegateTask.getVariable("responUser",JSONObject.class).getString("dockUser"));
-        busBean.save(busProcessNewNext);
+        if(nextUserList != null && !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);
+                busBean.save(busProcessNewNext);
+            }
+        }else{
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo("责任对接人审批");
+            busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
+            busBean.save(busProcessNewNext);
+        }
    }
 }