From a42365b18dd4d0b20e7895a877d413991de58aaf Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 17 Feb 2022 14:56:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20buss3=20=E6=96=B0=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/bussFs/BussFs2After.java | 53 +++++-------------- .../wkflow/listener/bussFs/BussFs2Before.java | 2 +- .../wkflow/listener/bussFs/BussFs3After.java | 5 ++ .../wkflow/listener/bussFs/BussFs3Before.java | 2 +- .../listener/bussFs/BussFsC2Before.java | 2 +- .../listener/bussFs/BussFsSub1Before.java | 2 +- .../listener/bussFs/BussFsSub2Before.java | 2 +- 7 files changed, 23 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java index 4e60a8b5..b201c6f7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java @@ -43,7 +43,7 @@ public class BussFs2After implements TaskListener{ delegateTask.setVariable("bussFsUser3",object.getString("bussFsUser3")); nextUserList.add(object.getString("bussFsUser3")); }else { - throw new ActivitiException("1#2发起人不存在,请配置相关人员"); + throw new ActivitiException("1#2标准法规部高级经理不存在,请配置相关人员"); } @@ -68,16 +68,6 @@ public class BussFs2After implements TaskListener{ busProcessNameService.saveOrUpdate(one1); } - /** - * 当子任务结束时存储 - */ - Integer commentCount=delegateTask.getVariable("commentCount",Integer.class); - if(commentCount==null)commentCount=0; - commentCount++; - delegateTask.setVariable("count",commentCount); - - Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class); - // 存储当前节点意见 BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); @@ -90,35 +80,18 @@ public class BussFs2After implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNew); - if(commentCount>=commentUserList.size()){ - 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); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); - } - } - }else { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one2 = busBean.getOne(queryWrapper1); - if (one1 != null) { - 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); + 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); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java index 36fa49b0..fc064629 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java @@ -41,7 +41,7 @@ public class BussFs2Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFs2?prcType=buss3"); + one1.setLink("bussFs2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java index 028ef16e..030b09ed 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java @@ -2,9 +2,11 @@ package com.ydw.bat.wkflow.listener.bussFs; 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.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.entity.EsRevisePlanDTO; 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; @@ -30,6 +32,7 @@ public class BussFs3After 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 queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -49,6 +52,7 @@ public class BussFs3After implements TaskListener{ String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String standSort = object.get("standSort") == null ? "" : object.get("standSort").toString(); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -72,6 +76,7 @@ public class BussFs3After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"buss3"); + delegateTask.setVariable("bussFs3Flag", 0); } else { if(StringUtils.isNotBlank(object.getString("bussFsUserC2"))) { BusProcessNew busProcessNew = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java index a2485ad4..9961819f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java @@ -38,7 +38,7 @@ public class BussFs3Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFs3?prcType=buss3"); + one1.setLink("bussFs3?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java index bff623ef..1268de35 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java @@ -38,7 +38,7 @@ public class BussFsC2Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFsC2?prcType=buss3"); + one1.setLink("bussFsC2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java index 2f393cd6..7cd280eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java @@ -41,7 +41,7 @@ public class BussFsSub1Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFsSub1?prcType=buss3"); + one1.setLink("bussFsSub1?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java index 9cca52b1..5f51a679 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java @@ -38,7 +38,7 @@ public class BussFsSub2Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("BussFsSub2?prcType=buss3"); + one1.setLink("bussFsSub2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1);