FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
企标复审流程 待办中心的不展示 通过流程实例进行优化

查看合并请求 laws-foton-slrs/foton-wkflow-rest!43
This commit is contained in:
高嵩
2023-05-16 18:03:07 +08:00
parent 330094f151 fffe2f7150
commit db421bbc1c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+4 -4
View File
@@ -228,8 +228,8 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
if (StringUtils.isNotBlank(standId)) { if (StringUtils.isNotBlank(standId)) {
if (data.getStandId().equals(standId)) { if (data.getStandId().equals(standId)) {
//如果相等 则判断task表示否有待办任务 //如果相等 则判断task表示否有待办任务
List<Task> list = taskService.createTaskQuery().taskId(busProcessNew.getTaskId()).list(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(busProcessNew.getPId()).singleResult();
if (!list.isEmpty()) { if (processInstance!=null) {
count = count+1; count = count+1;
} }
} }
@@ -272,7 +272,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
String[] split = esIdMesg.split(","); String[] split = esIdMesg.split(",");
for (String esById : split){ for (String esById : split){
if(esId.equals(esById)){ if(esId.equals(esById)){
webServiceOAService.deleteOAByPid(newData.getPId()); //webServiceOAService.deleteOAByPid(newData.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
if(processInstance!=null) { if(processInstance!=null) {
runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改"); runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
@@ -283,7 +283,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
} }
}else { }else {
if(esId.equals(esIdMesg)){ if(esId.equals(esIdMesg)){
webServiceOAService.deleteOAByPid(newData.getPId()); //webServiceOAService.deleteOAByPid(newData.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
if(processInstance!=null) { if(processInstance!=null) {
runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改"); runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");