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:15:05 +08:00
parent a3e320ea4c fe35973785
commit fd02f8ea2d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,10 @@ public class TAbilityApplicationController {
if (inStanceId == null) {
return index;
}
ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(inStanceId + "").singleResult();
if (execution != null) {
index.setEnded(execution.isEnded()); // 流程引擎内是否已结束
}
List<TAbilityApplicationDTO> dtos =
tAbilityApplicationService.getByInstanceId(inStanceId + "");
if (!dtos.isEmpty()) {
@ -124,9 +128,8 @@ public class TAbilityApplicationController {
}
});
}
ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(inStanceId + "").singleResult();
if (execution != null) {
index.setEnded(execution.isEnded()); // 流程引擎内是否已结束
if (params.containsKey("ended")) {
index.setEnded(Boolean.valueOf(params.get("ended").toString()));
}
return index;
}).collect(Collectors.toList());
@ -211,11 +214,18 @@ public class TAbilityApplicationController {
camera = cameraList;
List<Object> finalCamera = camera;
ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(tAbilityApplicationDTOList.get(0).getInstanceId() + "").singleResult();
Map<String, Object> resourceApplication = new HashMap<String, Object>() {
{
put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id
put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息
put("resources", resourceDTOS);//申请的该部门的能力资源
if (execution != null) {
put("ended", execution.isEnded());
} else {
put("ended", false);
}
put("taskHandleDetailInfo", taskHandleDetailInfo); // 流程详情
if (!finalCamera.isEmpty()) {
put("camera", finalCamera); // 流程详情