diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java index 446d2fa2..e831e6db 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java @@ -97,9 +97,7 @@ public class BLApplicantAfter implements TaskListener{ 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/BLApplicantBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantBefore.java index e1357465..b040e8bb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantBefore.java @@ -1,8 +1,15 @@ package com.ydw.bat.wkflow.listener.bussFs; +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; + /** * 发起企标复审流程前 */ @@ -10,15 +17,17 @@ public class BLApplicantBefore implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { -// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); -// QueryWrapper queryWrapper1 = new QueryWrapper(); -// queryWrapper1.isNull("TASK_ID"); -// List list = busBean.list(queryWrapper1); -// if(!list.isEmpty()){ -// BusProcessNew one1 = list.get(0); -// one1.setTaskId(delegateTask.getId()); -// busBean.saveOrUpdate(one1); -// } + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + + } // // WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程"); 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 e48e6077..e4daa432 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 @@ -38,8 +38,8 @@ public class BussFs2Before implements TaskListener{ JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class); jsonObject.put("fileModelList",fileList); one1.setMesg(jsonObject.toJSONString()); - one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 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 75c70078..913d4308 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 @@ -37,6 +37,7 @@ public class BussFs3Before implements TaskListener{ // one1.setMesg(jsonObject.toJSONString()); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs4Before.java index 185557d7..c5872496 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs4Before.java @@ -37,6 +37,7 @@ public class BussFs4Before implements TaskListener { // one1.setMesg(jsonObject.toJSONString()); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5Before.java index d154f367..23e0f1eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5Before.java @@ -36,6 +36,7 @@ public class BussFs5Before implements TaskListener { if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 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 9dfb3be2..ebd01092 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 @@ -37,6 +37,7 @@ public class BussFsC2Before implements TaskListener{ // one1.setMesg(jsonObject.toJSONString()); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 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 440d3954..21366bfc 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 @@ -40,6 +40,7 @@ public class BussFsSub1Before implements TaskListener{ // one1.setMesg(jsonObject.toJSONString()); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 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 eae7fd55..1a6810f3 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 @@ -37,6 +37,7 @@ public class BussFsSub2Before implements TaskListener{ // one1.setMesg(jsonObject.toJSONString()); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型