合并分支 'dev_20230216' 到 'master'

复审流程撤回 OA删除问题

查看合并请求 laws-foton-slrs/foton-wkflow-rest!35

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);

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);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
-//        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper queryWrapper1 = new QueryWrapper();
-//        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.isNull("TASK_ID");
-//        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
-//        if(!list.isEmpty()){
+        if(!list.isEmpty()){
-//            BusProcessNew one1 = list.get(0);
+            BusProcessNew one1 = list.get(0);
-//            one1.setTaskId(delegateTask.getId());
+            one1.setTaskId(delegateTask.getId());
-//            busBean.saveOrUpdate(one1);
+            one1.setTaskInfo(delegateTask.getName());
-//        }
+            busBean.saveOrUpdate(one1);
+
+        }
 //
 
 //        WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程");

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 ? 后面流程类型

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 ? 后面流程类型

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 ? 后面流程类型

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 ? 后面流程类型

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 ? 后面流程类型

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 ? 后面流程类型

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 ? 后面流程类型