From d0a734e47a46d4e1331ac017086cedf68766cb67 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 21 Feb 2022 09:35:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20-=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceProductAssess.java | 4 + .../wkflow/listener/xmhgpgXM/Step1After.java | 97 ++++++++++ .../wkflow/listener/xmhgpgXM/Step1Before.java | 13 ++ .../wkflow/listener/xmhgpgXM/Step2After.java | 168 ++++++++++++++++++ .../wkflow/listener/xmhgpgXM/Step2Before.java | 36 ++++ .../wkflow/listener/xmhgpgXM/Step3After.java | 84 +++++++++ .../wkflow/listener/xmhgpgXM/Step3Before.java | 36 ++++ .../wkflow/listener/xmhgpgXM/Step4After.java | 128 +++++++++++++ .../wkflow/listener/xmhgpgXM/Step4Before.java | 36 ++++ .../wkflow/listener/xmhgpgXM/Step5After.java | 154 ++++++++++++++++ .../wkflow/listener/xmhgpgXM/Step5Before.java | 36 ++++ 11 files changed, 792 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java index adc70651..daf00c98 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java @@ -129,5 +129,9 @@ public class SarStandardComplianceProductAssess { @TableField("evaluation_people_name") private String evaluationPeopleName; + @ApiModelProperty(value = "不涉及理由") + @TableField("no_involve") + private String noInvolve; + } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1After.java new file mode 100644 index 00000000..f6a3f1ce --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1After.java @@ -0,0 +1,97 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + +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.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +public class Step1After 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 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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + //赋值标准法规工程师，工程经理，标准法规部部长 + if (object.getString("serviceManager").contains(",")){ + nextUserList.addAll(Arrays.asList(object.getString("serviceManager").split(","))); + }else { + nextUserList.add(object.getString("serviceManager")); + } + delegateTask.setVariable("managerList",nextUserList); + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String prcName = object.getString("projectNumber")+"-项目合规评估流程-项目维度"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("6"); + 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 != 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/xmhgpgXM/Step1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1Before.java new file mode 100644 index 00000000..72366044 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1Before.java @@ -0,0 +1,13 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class Step1Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java new file mode 100644 index 00000000..d0c1636a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java @@ -0,0 +1,168 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + + +import com.alibaba.fastjson.JSON; +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; +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.*; + +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 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 nextUserList = new ArrayList<>(); + //计数器 + if (null != delegateTask.getVariable("count2")) { + delegateTask.setVariable("count2", delegateTask.getVariable("count2", Integer.class) + 1); + } else { + delegateTask.setVariable("count2", 1); + } + //数据存储器 + Map map = new HashMap<>(); + if (null != delegateTask.getVariable("Step2res")) { + map = delegateTask.getVariable("Step2res", Map.class); + } + //处理数据 + JSONArray array = object.getJSONArray("dataList"); + for (Object o : array) { + JSONObject object1 = JSON.parseObject(o.toString()); + + if (!"有条款".equals(object1.getString("people")) && !"请选择责任人".equals(object1.getString("workPeople"))) { + List middles = new ArrayList<>(Arrays.asList(object1.getString("workPeopleId").split(","))); + for (String s : middles) { + if (null != map.get(delegateTask.getAssignee()+"-"+s)) { + map.get(delegateTask.getAssignee()+"-"+s).getJSONArray("dataList").add(object1); + } else { + JSONArray jsonArray = new JSONArray(); + jsonArray.add(object1); + JSONObject res = JSON.parseObject(object.toJSONString()); + res.put("dataList", jsonArray); + res.put("GC_FZ",delegateTask.getAssignee()+"-"+s); + map.put(delegateTask.getAssignee()+"-"+s, res); + } + } + } + JSONArray array1 = object1.getJSONArray("children"); + if (null != array1) { + //遍历条款 生成数据 + for (Object o2 : array1) { + JSONObject object2 = JSON.parseObject(o2.toString()); + if (!"请选择责任人".equals(object2.getString("workPeople"))) { + List middleChildren = new ArrayList<>(Arrays.asList(object2.getString("workPeopleId").split(","))); + for (String ss : middleChildren) { + if (null != map.get(delegateTask.getAssignee()+"-"+ss)) { + JSONArray middle = map.get(delegateTask.getAssignee()+"-"+ss).getJSONArray("dataList"); + //如果有上级 那么就将数据重新组装 在赋值 因为要转对象 地址会变 =。= 暂时想不到好办法 + JSONArray dataList=new JSONArray(); + boolean flag=true; + for (Object o3 : middle) { + JSONObject object3 = JSONObject.parseObject(o3.toString()); + if (object3.getString("standId").equals(object2.getString("key"))) { + object3.getJSONArray("children").add(object2); + flag=false; + } + dataList.add(object3); + } + //如果没有父级 那么生成他 + if (flag){ + JSONObject push=JSON.parseObject(object1.toJSONString()); + JSONArray jsonArray3 = new JSONArray(); + jsonArray3.add(object2); + push.put("children", jsonArray3); + map.get(delegateTask.getAssignee()+"-"+ss).getJSONArray("dataList").add(push); + }else { + map.get(delegateTask.getAssignee()+"-"+ss).put("dataList",dataList); + } + } else { + JSONArray jsonArray = new JSONArray(); + jsonArray.add(object1); + JSONArray jsonArray1 = new JSONArray(); + jsonArray1.add(object2); + object1.put("children", jsonArray1); + JSONObject res = JSON.parseObject(object.toJSONString()); + res.put("dataList", jsonArray); + res.put("GC_FZ",delegateTask.getAssignee()+"-"+ss); + map.put(delegateTask.getAssignee()+"-"+ss, res); + } + } + } + } + } + } + + delegateTask.setVariable("Step2res", map); + for (String s : map.keySet()) { + if (null != s) { + String peo[] = s.split("-"); + nextUserList.add(peo[1]); + } + } + delegateTask.setVariable("zrList", nextUserList); + //截止时间 流程描述 创建人 + 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.setPrcType("6"); + 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 list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if (delegateTask.getVariable("count2", Integer.class) >= delegateTask.getVariable("managerList", List.class).size()) { + for (String userId : map.keySet()) { + String peo[] = userId.split("-"); + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(map.get(userId).toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(peo[1]); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java new file mode 100644 index 00000000..b593705d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + +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 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java new file mode 100644 index 00000000..591269b3 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java @@ -0,0 +1,84 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + + +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 Step3After 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 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 nextUserList=new ArrayList<>(); + //后续节点所需要的数据 + String a[]=object.getString("GC_FZ").split("-"); + nextUserList.add(a[0]); + delegateTask.setVariable("shManager",a[0]); + //截止时间 流程描述 创建人 + 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.setPrcType("6"); + 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 list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String userId : 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(userId); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java new file mode 100644 index 00000000..cea6f309 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + +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 Step3Before 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 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java new file mode 100644 index 00000000..bed77713 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java @@ -0,0 +1,128 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + + +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 Step4After 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 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 nextUserList=new ArrayList<>(); + //设置计数器 + if (null!=delegateTask.getVariable("count4")){ + delegateTask.setVariable("count4",delegateTask.getVariable("count4",Integer.class)+1); + }else { + delegateTask.setVariable("count4",1); + } + + //后续节点所需要的数据 + JSONObject resJson=new JSONObject(); + if (null!=delegateTask.getVariable("resJSON")){ + resJson=delegateTask.getVariable("resJSON",JSONObject.class); + } + if ("0".equals(object.getString("passFlag"))){ + if (null!=resJson.getString("GC_FZ")){ + resJson.getJSONArray("dataList").addAll(object.getJSONArray("dataList")); + }else { + resJson=object; + } + delegateTask.setVariable("resJSON",resJson); + delegateTask.setVariable("passFlag","0"); + nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("beLeaderId",delegateTask.getVariable("prcCreateUser",String.class)); + }else { + String a[]=object.getString("GC_FZ").split("-"); + nextUserList.add(a[1]); + delegateTask.setVariable("zrId",a[1]); + delegateTask.setVariable("passFlag","1"); + } + + //截止时间 流程描述 创建人 + 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.setPrcType("6"); + 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 list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if ("0".equals(object.getString("passFlag"))) { + if (delegateTask.getVariable("count4", Integer.class) >= delegateTask.getVariable("zrList", List.class).size()) { + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String userId : 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(userId); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + }else { + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String userId : 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(userId); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java new file mode 100644 index 00000000..95479bbc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + +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 Step4Before 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 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java new file mode 100644 index 00000000..76ee98e2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java @@ -0,0 +1,154 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +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.dto.SarStandUnqualified; +import com.ydw.bat.wkflow.business_main.datas.dto.SarStandardComplianceProductAssess; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +public class Step5After 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + + UUID uuid = UUID.randomUUID(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //根据流程id找到流程信息 + QueryWrapper 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 standUnqualifieds = new ArrayList<>(); + //评估结果存储集合 + List sarStandardComplianceProductAssesses = new ArrayList<>(); + List nextUserList = new ArrayList<>(); + //后续节点所需要的数据 + JSONArray jsonArray = object.getJSONArray("dataList"); + for (Object o : jsonArray) { + JSONObject jsonObject = JSON.parseObject(o.toString()); + if (null != jsonObject.getString("noCompliance")) { + SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); + //少一个standId 不合格原因 在研在产！ + sarStandUnqualified.setStandId(jsonObject.getString("standId")); + sarStandUnqualified.setStandSerialNumber(jsonObject.getString("standSort") + " " + jsonObject.getString("standNumber") + "-" + jsonObject.getString("standYear")); + if (null != jsonObject.getString("standName") && !"".equals(jsonObject.getString("standName"))) { + sarStandUnqualified.setStandName(jsonObject.getString("standName")); + } else { + sarStandUnqualified.setStandName(jsonObject.getString("standEnName")); + } + sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); + sarStandUnqualified.setCloseState(1); + sarStandUnqualified.setCreateTime(new Date()); + sarStandUnqualified.setProductName(object.getString("projectName")); + sarStandUnqualified.setResponsibleUnit(jsonObject.getString("zrbm")); + sarStandUnqualified.setReason(jsonObject.getString("noCompliance")); + sarStandUnqualified.setPlanCloseTime(jsonObject.getDate("completionTime")); + sarStandUnqualified.setProductLine(object.getString("productLine")); + sarStandUnqualified.setProductId(object.getString("projectId")); + standUnqualifieds.add(sarStandUnqualified); + } + if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) { + //合估评规 结果！ + SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess(); + sarStandard.setStandId(jsonObject.getString("standId")); + if (null != jsonObject.getString("standName") && !"".equals(jsonObject.getString("standName"))) { + sarStandard.setStandName(jsonObject.getString("standName")); + } else { + sarStandard.setStandName(jsonObject.getString("standEnName")); + } + sarStandard.setProductLineId(object.getString("productLine")); + sarStandard.setProductId(object.getString("projectId")); + sarStandard.setProductName(object.getString("projectName")); + sarStandard.setStandNumber(jsonObject.getString("standSort") + " " + jsonObject.getString("standNumber") + "-" + jsonObject.getString("standYear")); + sarStandard.setStandType(jsonObject.getString("standType")); + sarStandard.setType(String.valueOf(uuid)); + sarStandard.setResearchCompletionTime(jsonObject.getDate("completionTime")); + sarStandard.setResearchCountermeasures(jsonObject.getString("countermeasures")); + sarStandard.setResearchNonCompliance(jsonObject.getString("noCompliance")); + sarStandard.setResearchCompliance(jsonObject.getString("complianceReasons")); + sarStandard.setClauseName(jsonObject.getString("itemsName")); + sarStandard.setStandardItem(jsonObject.getString("itemsNum")); + sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); + sarStandard.setEvaluationPeopleName(jsonObject.getString("workPeople")); + sarStandard.setEvaluationPeople(jsonObject.getString("workPeopleId")); + sarStandard.setNoInvolve(jsonObject.getString("remarks")); + sarStandardComplianceProductAssesses.add(sarStandard); + } + + } + //数据入库！！！！ + lawsUserInfoService.addsarStandUnqualified(standUnqualifieds); + lawsUserInfoService.addProduct(sarStandardComplianceProductAssesses); + + + //截止时间 流程描述 创建人 + 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.setPrcType("6"); + 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 list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + 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); + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java new file mode 100644 index 00000000..0d10e907 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.xmhgpgXM; + +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 Step5Before 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 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} From 8a2adeb635e3a128672a23a88545251c5f38b1e1 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 21 Feb 2022 16:44:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=B5=81=E7=A8=8B=E5=86=85=E9=83=A8bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/xmhgpgXM/Step2Before.java | 2 +- .../wkflow/listener/xmhgpgXM/Step3Before.java | 2 +- .../wkflow/listener/xmhgpgXM/Step4After.java | 2 +- .../wkflow/listener/xmhgpgXM/Step4Before.java | 2 +- .../wkflow/listener/xmhgpgXM/Step5After.java | 32 ++++++++++++++----- .../wkflow/listener/xmhgpgXM/Step5Before.java | 2 +- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java index b593705d..1c571280 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java @@ -27,7 +27,7 @@ public class Step2Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("xmpgStep2?prcType=6"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java index cea6f309..5d6d3fb5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java @@ -27,7 +27,7 @@ public class Step3Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("xmpgStep3?prcType=6"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java index bed77713..bf31abe3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java @@ -97,7 +97,7 @@ public class Step4After implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setMesg(delegateTask.getVariable("resJSON",JSONObject.class).toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java index 95479bbc..98c16aef 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java @@ -27,7 +27,7 @@ public class Step4Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("xmpgStep4?prcType=6"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java index 76ee98e2..8697e026 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java @@ -20,10 +20,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; public class Step5After implements TaskListener { @@ -54,12 +51,25 @@ public class Step5After implements TaskListener { List nextUserList = new ArrayList<>(); //后续节点所需要的数据 JSONArray jsonArray = object.getJSONArray("dataList"); + Map map=new HashMap<>(); + JSONArray array=object.getJSONArray("children"); + for (Object o:array){ + if (null!=o){ + JSONObject jsonObject=JSON.parseObject(o.toString()); + map.put(jsonObject.getString("id"),jsonObject.getString("key")); + } + } + for (Object o : jsonArray) { JSONObject jsonObject = JSON.parseObject(o.toString()); if (null != jsonObject.getString("noCompliance")) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ - sarStandUnqualified.setStandId(jsonObject.getString("standId")); + if (null!=map.get(jsonObject.getString("standId"))){ + sarStandUnqualified.setStandId(map.get(jsonObject.getString("standId"))); + }else { + sarStandUnqualified.setStandId(jsonObject.getString("standId")); + } sarStandUnqualified.setStandSerialNumber(jsonObject.getString("standSort") + " " + jsonObject.getString("standNumber") + "-" + jsonObject.getString("standYear")); if (null != jsonObject.getString("standName") && !"".equals(jsonObject.getString("standName"))) { sarStandUnqualified.setStandName(jsonObject.getString("standName")); @@ -74,20 +84,24 @@ public class Step5After implements TaskListener { sarStandUnqualified.setReason(jsonObject.getString("noCompliance")); sarStandUnqualified.setPlanCloseTime(jsonObject.getDate("completionTime")); sarStandUnqualified.setProductLine(object.getString("productLine")); - sarStandUnqualified.setProductId(object.getString("projectId")); + sarStandUnqualified.setProductId(object.getString("projectNumber")); standUnqualifieds.add(sarStandUnqualified); } if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) { //合估评规 结果！ SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess(); - sarStandard.setStandId(jsonObject.getString("standId")); + if (null!=map.get(jsonObject.getString("standId"))){ + sarStandard.setStandId(map.get(jsonObject.getString("standId"))); + }else { + sarStandard.setStandId(jsonObject.getString("standId")); + } if (null != jsonObject.getString("standName") && !"".equals(jsonObject.getString("standName"))) { sarStandard.setStandName(jsonObject.getString("standName")); } else { sarStandard.setStandName(jsonObject.getString("standEnName")); } sarStandard.setProductLineId(object.getString("productLine")); - sarStandard.setProductId(object.getString("projectId")); + sarStandard.setProductId(object.getString("projectNumber")); sarStandard.setProductName(object.getString("projectName")); sarStandard.setStandNumber(jsonObject.getString("standSort") + " " + jsonObject.getString("standNumber") + "-" + jsonObject.getString("standYear")); sarStandard.setStandType(jsonObject.getString("standType")); @@ -112,6 +126,7 @@ public class Step5After implements TaskListener { //截止时间 流程描述 创建人 + 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) + "-项目合规评估流程-标准法规部部长审核"; @@ -119,6 +134,7 @@ public class Step5After implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { + one1.setOverTime(OVERTIME); one1.setPrcType("6"); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java index 0d10e907..bb09950c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java @@ -27,7 +27,7 @@ public class Step5Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("xmpgStep5?prcType=6"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From 61299637da76b2bfaac42e079276946aebfc0ad3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 24 Feb 2022 16:13:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 24 +++--- .../Step10After.java | 2 +- .../ProcessStep1After.java | 1 + .../ProcessStep2After.java | 1 + .../ProcessStep3After.java | 1 + .../ProcessStep4After.java | 1 + .../ProcessStep5After.java | 1 + .../wkflow/listener/qbzxdlxjh/Step2After.java | 83 ++++++++++++++++++ .../listener/qbzxdlxjh/Step2Before.java | 36 ++++++++ .../wkflow/listener/qbzxdlxjh/startAfter.java | 86 +++++++++++++++++++ .../listener/qbzxdlxjh/startBefore.java | 11 +++ .../CountersignSRPAfter.java | 1 + .../SRPApplyApplicantAfter.java | 1 + .../SRPManagerApproveAfter.java | 5 +- 14 files changed, 240 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 561a0e11..bbd84e3d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -1996,18 +1996,18 @@ public class TodoTaskController extends BaseAction { } } } - //获取新的流程名称· - QueryWrapper 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 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(""); +// } +// } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java index 3b37d08f..a445b068 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java @@ -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")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java index 44a7b03a..5ca7f279 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java @@ -77,6 +77,7 @@ public class ProcessStep1After implements TaskListener { List 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java index 57455402..583c10cb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java @@ -80,6 +80,7 @@ public class ProcessStep2After implements TaskListener { List 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java index 5f0db003..3b946012 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java @@ -72,6 +72,7 @@ public class ProcessStep3After implements TaskListener { List 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index dd4ecec0..5a40f8b3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -163,6 +163,7 @@ public class ProcessStep4After implements TaskListener { List 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java index 3469e53a..d58aba60 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java @@ -61,6 +61,7 @@ public class ProcessStep5After implements TaskListener { List 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java new file mode 100644 index 00000000..31e85301 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java @@ -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 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 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); + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java new file mode 100644 index 00000000..21214b53 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java @@ -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 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); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java new file mode 100644 index 00000000..e9883a6b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java @@ -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 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 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); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java new file mode 100644 index 00000000..23a3b8d0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java @@ -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) { + //流程发起节点 + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java index d6973e39..54b0b572 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java @@ -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); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java index 9d1d20f3..e38b711f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java @@ -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); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java index 32d0b8f0..2c0c3cf4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java @@ -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); From 8bceafefd857761916c1875b4f25f56c015c888b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 28 Feb 2022 16:00:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=20=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index bbd84e3d..964f8ad7 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -2119,18 +2119,18 @@ public class TodoTaskController extends BaseAction { } } } - //获取新的流程名称· - QueryWrapper 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 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(""); +// } +// } } } if (assignee != null && !assignee.equals("")) { From 9e2ad78ed5029192c792f126f39000579c500a5e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 1 Mar 2022 14:46:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/standardLibrary/SLApplicantAfter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java index d46197d2..ed51dd54 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java @@ -77,12 +77,12 @@ public class SLApplicantAfter implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = object.getString("standName"); -// if(object.getString("standInData").equals("0")){ -// standName = "国内"; -// }else { -// standName = "海外"; -// } + String standName = ""; + if (null!=object.getString("standName") && !"".equals(object.getString("standName"))){ + standName=object.getString("standName"); + }else { + standName=object.getString("standEnName"); + } String standAllName = ""; if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));