更名流程 删除过才发起 没删除过不发起
This commit is contained in:
+15
-4
@@ -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){
|
||||
|
||||
Reference in New Issue
Block a user