add 未合规整改模块

2021-07-14 14:58:47 +08:00
parent 34d5a31bc9
commit 572ff912cf
12 changed files with 94 additions and 138 deletions
@@ -76,7 +76,6 @@ public class SelectResponUserAfter implements TaskListener {
                        jsonObject.put("dockUser",preResponUser.getString("dockUser"));
                        jsonObject.put("info",standardInfoList.get(i));

-
                        responUserList.add(jsonObject);
                    }
                }
@@ -75,38 +75,24 @@ public class DirectorSignAfter 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);
-            }
+        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);
        } else {
-            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);
-            }
+            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);
        }
    }
 }
@@ -1,5 +1,6 @@
 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;
@@ -90,7 +91,7 @@ public class DockingApprovalAfter implements TaskListener {
            if(delegateTask.getVariable("actionFlag",Integer.class)==0){

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

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

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

        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
            if(count==null)count=0;
@@ -91,28 +92,14 @@ public class MinisterAndDockerSignAfter implements TaskListener {
        }
        if(count>=userList.size()){
            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-                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);
-                }
+                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);
            }else{
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
@@ -120,7 +107,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
                busProcessNewNext.setMesg(object.toJSONString());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
-                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser",JSONObject.class).getString("id"));
                busBean.save(busProcessNewNext);
            }
        }
@@ -74,18 +74,5 @@ 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,5 +1,6 @@
 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 +33,9 @@ public class ResponUserSignAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

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

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

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

-        List<String> userList = Arrays.asList(userListString.split(","));
-        for (int i = 0; i < userList.size(); i++) {
-            nextUserList.add(userList.get(i).trim());
+        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> userListName=Arrays.asList(userListStringName.split(","));
-        List<String> newUserListName = new ArrayList();
-        userListName.forEach((String name)->{
-            newUserListName.add(name.trim());
-        });

-        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);
+        delegateTask.setVariable("responUserList",responUserList);

+        nextUserList=responUserList;


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

-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
+        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);
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -104,9 +99,10 @@ public class SelectResponsibleUserAfter implements TaskListener {
                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setUserId(nextUser.getString("id"));
                busBean.save(busProcessNewNext);
            }
        }
+
    }
 }
@@ -16,6 +16,8 @@ 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,5 +1,6 @@
 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;
@@ -34,21 +35,25 @@ public class StartSurveyAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

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

-        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("startUser",object.getJSONObject("startUser"));
+        delegateTask.setVariable("ministerUser",object.getJSONObject("ministerUser"));
+        delegateTask.setVariable("directorUser",object.getJSONObject("directorUser"));
+        delegateTask.setVariable("presidentUser",object.getJSONObject("presidentUser"));

-        userList.add(object.getString("dockUser"));
+        delegateTask.setVariable("dockUserList",object.getJSONArray("dockUserList"));
+
+        userList.addAll(object.getJSONArray("dockUserList"));
        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());
@@ -86,7 +91,10 @@ public class StartSurveyAfter implements TaskListener {
        busBean.save(busProcessNew);

        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
+
+            for (int i = 0; i < nextUserList.size(); i++) {
+                JSONObject nextUser = nextUserList.getJSONObject(i);
+
                BusProcessNew busProcessNewNext = new BusProcessNew();
                busProcessNewNext.setMsgType("clause");
                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -94,7 +102,7 @@ public class StartSurveyAfter implements TaskListener {
                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                busProcessNewNext.setFinishFlag("0");
                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setUserId(nextUser.getString("id"));
                busBean.save(busProcessNewNext);
            }
        }else{
@@ -1,5 +1,6 @@
 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;
@@ -31,9 +32,9 @@ public class SummarySurveyAfter implements TaskListener {
        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
        delegateTask.setVariable("objectJson",object);

-        List<String> nextUserList;
+        JSONArray nextUserList;

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

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


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


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

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