From 469488eee6de08f1d027633c222291554f1ca597 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 15 May 2023 16:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=87=E6=89=8D=E5=8F=91=E8=B5=B7=20?=
 =?UTF-8?q?=E6=B2=A1=E5=88=A0=E9=99=A4=E8=BF=87=E4=B8=8D=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProcessNewServiceImpl.java        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
index 717be53a..41a253a1 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
@@ -21,6 +21,7 @@ import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.ProcessEngineImpl;
+import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskQuery;
@@ -260,6 +261,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
          QueryWrapper<BusProcessNew> busProcessNewQueryWrapper = new QueryWrapper<>();
          busProcessNewQueryWrapper.eq("PRC_NAME",prcName);
          List<BusProcessNew> busProcessNews = baseMapper.selectList(busProcessNewQueryWrapper);
+         String log = "";
          if(!busProcessNews.isEmpty()){
              for (BusProcessNew newData:busProcessNews){
                  //判断是否是同一条企标计划
@@ -272,21 +274,30 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                              if(esId.equals(esById)){
                                  //是同一条企标计划 删除当前待办 是否是起草页面
                                  //删除OA待办任务
-                                 webServiceOAService.deleteOAByPid(newData.getPId());
+                                 //webServiceOAService.deleteOAByPid(newData.getPId());
                                  runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
                              }
                          }
                      }else {
                          if(esId.equals(esIdMesg)){
-                             webServiceOAService.deleteOAByPid(newData.getPId());
-                             runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
+                             //webServiceOAService.deleteOAByPid(newData.getPId());
+                              ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
+                             if(processInstance!=null) {
+                                 runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
+                                 //更名流程 在这里有删除的情况下才进行发送没有则不发送
+                                 if(StringUtils.isNotBlank(log)){
+                                     log = log+","+esIdMesg;
+                                 } else {
+                                     log = esIdMesg;
+                                 }
+                             }
                          }
                      }
 
                  }
              }
          }
-        return "成功";
+        return "成功"+"-"+log;
     }
 
     public void taskInfo(List<BusProcessNew> busProcessNews){