Merge branch 'develop' into FOTON

2022-02-24 17:08:11 +08:00
parent 4af5809ab7 61299637da
commit e28c5c42a1
14 changed files with 240 additions and 14 deletions
@@ -1996,18 +1996,18 @@ public class TodoTaskController extends BaseAction {
                                }
                            }
                        }
-                        //获取新的流程名称·
-                        QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
-                        queryWrapper1.eq("P_ID",busProcessName.getPrcId());
-                        queryWrapper1.eq("TASK_ID",task.getId());
-                        BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                        if (null!=busProcessNew) {
-                            if (null != busProcessNew.getPrcName()) {
-                                busProcessName.setPrcName(busProcessNew.getPrcName());
-                            } else {
-                                busProcessNew.setPrcName("");
-                            }
-                        }
+//                        //获取新的流程名称·
+//                        QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
+//                        queryWrapper1.eq("P_ID",busProcessName.getPrcId());
+//                        queryWrapper1.eq("TASK_ID",task.getId());
+//                        BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
+//                        if (null!=busProcessNew) {
+//                            if (null != busProcessNew.getPrcName()) {
+//                                busProcessName.setPrcName(busProcessNew.getPrcName());
+//                            } else {
+//                                busProcessNew.setPrcName("");
+//                            }
+//                        }

                    }
                }
@@ -59,7 +59,7 @@ public class Step10After implements TaskListener {
                        sarPublicIdeaAll.setOldText(object1.getString("oldText"));
                        sarPublicIdeaAll.setNewText(object1.getString("newText"));
                        sarPublicIdeaAll.setReason(object1.getString("reason"));
-                        sarPublicIdeaAll.setUserId(object1.getString(""));
+                        sarPublicIdeaAll.setUserId(object1.getString("responUser"));
                        sarPublicIdeaAll.setPartCode(object1.getString("chapterNumber"));
                        sarPublicIdeaAll.setCid(object.getString("cid"));
                        sarPublicIdeaAll.setUserName(object1.getString("responUserName"));
@@ -77,6 +77,7 @@ public class ProcessStep1After implements TaskListener {
            List<BusProcessNew> list = busBean.list(queryWrapper3);
            if (!list.isEmpty()) {
                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                busProcessNews.setTaskId(delegateTask.getId());
                busProcessNews.setCommitText(object.getString("commentText"));
                busBean.saveOrUpdate(busProcessNews);
@@ -80,6 +80,7 @@ public class ProcessStep2After implements TaskListener {
            List<BusProcessNew> list = busBean.list(queryWrapper3);
            if (!list.isEmpty()) {
                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                busProcessNews.setTaskId(delegateTask.getId());
                busProcessNews.setCommitText(object.getString("commentText"));
                busBean.saveOrUpdate(busProcessNews);
@@ -72,6 +72,7 @@ public class ProcessStep3After implements TaskListener {
            List<BusProcessNew> list = busBean.list(queryWrapper3);
            if (!list.isEmpty()) {
                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                busProcessNews.setTaskId(delegateTask.getId());
                busProcessNews.setCommitText(object.getString("commentText"));
                busBean.saveOrUpdate(busProcessNews);
@@ -163,6 +163,7 @@ public class ProcessStep4After implements TaskListener {
            List<BusProcessNew> list = busBean.list(queryWrapper3);
            if (!list.isEmpty()) {
                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                busProcessNews.setTaskId(delegateTask.getId());
                busProcessNews.setCommitText(object.getString("commentText"));
                busBean.saveOrUpdate(busProcessNews);
@@ -61,6 +61,7 @@ public class ProcessStep5After implements TaskListener {
            List<BusProcessNew> list = busBean.list(queryWrapper3);
            if (!list.isEmpty()) {
                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                busProcessNews.setTaskId(delegateTask.getId());
                busProcessNews.setCommitText(object.getString("commentText"));
                busBean.saveOrUpdate(busProcessNews);
@@ -0,0 +1,83 @@
+package com.ydw.bat.wkflow.listener.qbzxdlxjh;
+
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
+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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class Step2After implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        //根据流程id找到流程信息
+        QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
+        Datas datas = datasService.getOne(queryWrapper);
+        JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
+        delegateTask.setVariable("objectJson", object);
+
+
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = delegateTask.getVariable("prcCreateUser", String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部部长审核";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setOverTime(OVERTIME);
+            one1.setPrcType("26");
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见1
+        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.setTaskInfo(delegateTask.getName());
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+        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("finish");
+        busProcessNewNext.setPrcName(prcName);
+        busBean.save(busProcessNewNext);
+
+    }
+}
@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.qbzxdlxjh;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class Step2Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
+        queryWrapper1.isNull("TASK_ID");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep2?prcType=6");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}
@@ -0,0 +1,86 @@
+package com.ydw.bat.wkflow.listener.qbzxdlxjh;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
+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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//启动
+public class startAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
+        Datas datas = datasService.getOne(queryWrapper);
+
+        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        delegateTask.setVariable("objectJson",object);
+
+        List<String> nextUserList = new ArrayList();
+        nextUserList.add(object.getString("dockUser"));
+        delegateTask.setVariable("zrId",object.getString("dockUser"));
+
+
+        //截止时间 流程描述 创建人
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        delegateTask.setVariable("startId",user);
+        delegateTask.setVariable("startName",username);
+        String prcName = object.getString("processName");
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+            one1.setPrcType("26");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
+        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);
+            }
+        }
+    }
+}
@@ -0,0 +1,11 @@
+package com.ydw.bat.wkflow.listener.qbzxdlxjh;
+
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+public class startBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //流程发起节点
+    }
+}
@@ -71,6 +71,7 @@ public class CountersignSRPAfter implements TaskListener{
            BusProcessNew busProcessNew = list.get(0);
            busProcessNew.setTaskId(delegateTask.getId());
            busProcessNew.setCommitText(object.getString("commentText"));
+            busProcessNew.setTaskInfo(delegateTask.getName());
            busBean.saveOrUpdate(busProcessNew);
        }

@@ -69,6 +69,7 @@ public class SRPApplyApplicantAfter implements TaskListener{
            BusProcessNew busProcessNew = list.get(0);
            busProcessNew.setTaskId(delegateTask.getId());
            busProcessNew.setCommitText(object.getString("commentText"));
+            busProcessNew.setTaskInfo(delegateTask.getName());
            busBean.saveOrUpdate(busProcessNew);
        }

@@ -87,7 +87,9 @@ public class SRPManagerApproveAfter implements TaskListener{
                    }
                }
                detailed.setInforlist(info.substring(0,info.length()-1));
-                detailed.setInforlist1(putTime.substring(0,putTime.length()-1));
+                if (!putTime.isEmpty()) {
+                    detailed.setInforlist1(putTime.substring(0, putTime.length() - 1));
+                }
                if (!zccTime.isEmpty()) {
                    detailed.setInforlist2(zccTime.substring(0, zccTime.length() - 1));
                }
@@ -137,6 +139,7 @@ public class SRPManagerApproveAfter implements TaskListener{
        queryWrapper1.eq("TASK_ID",delegateTask.getId());
        BusProcessNew one1 = busBean.getOne(queryWrapper1);
        if(one1!=null){
+            one1.setTaskInfo(delegateTask.getName());
            one1.setCommitFlag(commitFlag);
            one1.setCommitText(object.getString("commentText"));
            busBean.saveOrUpdate(one1);