wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-18 18:29:21 +08:00
parent ac3622a039 56fa006d82
commit beb8fc93d9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -107,9 +107,13 @@ public class TAbilityApplicationController {
if (inStanceId == null) { if (inStanceId == null) {
return index; return index;
} }
ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(inStanceId + "").singleResult(); ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().processInstanceId(inStanceId + "").singleResult();
if (execution != null) { if (execution != null) {
index.setEnded(execution.isEnded()); // 流程引擎内是否已结束 index.setEnded(execution.isEnded()); // 流程引擎内是否已结束
} else {
if (params.containsKey("ended")) {
index.setEnded(Boolean.valueOf(params.get("ended").toString()));
}
} }
List<TAbilityApplicationDTO> dtos = List<TAbilityApplicationDTO> dtos =
tAbilityApplicationService.getByInstanceId(inStanceId + ""); tAbilityApplicationService.getByInstanceId(inStanceId + "");
@ -128,9 +132,6 @@ public class TAbilityApplicationController {
} }
}); });
} }
if (params.containsKey("ended")) {
index.setEnded(Boolean.valueOf(params.get("ended").toString()));
}
return index; return index;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
page.setList(list); page.setList(list);
@ -214,7 +215,7 @@ public class TAbilityApplicationController {
camera = cameraList; camera = cameraList;
List<Object> finalCamera = camera; List<Object> finalCamera = camera;
ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(tAbilityApplicationDTOList.get(0).getInstanceId() + "").singleResult(); ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().processInstanceId(tAbilityApplicationDTOList.get(0).getInstanceId() + "").singleResult();
Map<String, Object> resourceApplication = new HashMap<String, Object>() { Map<String, Object> resourceApplication = new HashMap<String, Object>() {
{ {
put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id