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-09-26 16:25:53 +08:00
parent 736d815f68 21a56a4d26
commit c67274cf51
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@ public class TAbilityApplicationController {
if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("审核中")) { // 若处于审核中时 增加当前节点信息 if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("审核中")) { // 若处于审核中时 增加当前节点信息
Task task = taskService.createTaskQuery().processInstanceId(tAbilityApplicationDTOList.get(0).getInstanceId()).active().includeProcessVariables().singleResult(); Task task = taskService.createTaskQuery().processInstanceId(tAbilityApplicationDTOList.get(0).getInstanceId()).active().includeProcessVariables().singleResult();
if (task != null && StringUtils.isNotEmpty(task.getId()) && StringUtils.isNumeric(task.getAssignee())) { if (task != null && StringUtils.isNotEmpty(task.getId()) && StringUtils.isNumeric(task.getAssignee())) {
HistoryDetailDTO detailDTO = new HistoryDetailDTO(); final HistoryDetailDTO detailDTO = new HistoryDetailDTO();
detailDTO.setId(task.getId()); detailDTO.setId(task.getId());
detailDTO.setAssignee(sysUserService.get(Long.valueOf(task.getAssignee())).getRealName()); detailDTO.setAssignee(sysUserService.get(Long.valueOf(task.getAssignee())).getRealName());
detailDTO.setActivityName(task.getName()); detailDTO.setActivityName(task.getName());
@ -285,7 +285,11 @@ public class TAbilityApplicationController {
detailDTO.setDurationInSeconds(null); detailDTO.setDurationInSeconds(null);
detailDTO.setExecutionId(task.getExecutionId()); detailDTO.setExecutionId(task.getExecutionId());
detailDTO.setProcessDefinitionId(task.getProcessDefinitionId()); detailDTO.setProcessDefinitionId(task.getProcessDefinitionId());
detailDTO.setComment("待审核");
final List<HistoryDetailDTO> taskHandleDetailInfo_ = taskHandleDetailInfo;
taskHandleDetailInfo.clear();
taskHandleDetailInfo.add(detailDTO); taskHandleDetailInfo.add(detailDTO);
taskHandleDetailInfo.addAll(taskHandleDetailInfo_);
} }
} }