Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
wanggeng 2022-06-14 11:36:02 +08:00
parent 78357f4a4e
commit d3d48fb343
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java
View File

@ -265,7 +265,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements
LOG.debug("发起流程，查询第一个用户任务"); LOG.debug("发起流程，查询第一个用户任务");
UserTask firstUserTask = activitiModelService.getFirstUserTaskByProcessDefinitionId(processDefinitionId); UserTask firstUserTask = activitiModelService.getFirstUserTaskByProcessDefinitionId(processDefinitionId);
LOG.debug("发起流程，查询第一个用户任务后直连用户任务列表"); LOG.debug("发起流程，查询第一个用户任务后直连用户任务列表");
List<ConfirmAssigneeVO> confirmAssigneeVOs = listConfirmAssignee(currentUserId, deploymentId, firstUserTask); List<ConfirmAssigneeVO> confirmAssigneeVOs = listConfirmAssignee(null, currentUserId, deploymentId, firstUserTask);
model.put("confirmAssignees", JSON.toJSONString(confirmAssigneeVOs)); model.put("confirmAssignees", JSON.toJSONString(confirmAssigneeVOs));
setPageFields(deploymentId, firstUserTask, model); setPageFields(deploymentId, firstUserTask, model);
@ -301,7 +301,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements
model.put("processInstanceId", task.getProcessInstanceId()); model.put("processInstanceId", task.getProcessInstanceId());
model.put("isNeedClaim", isNeedClaim); model.put("isNeedClaim", isNeedClaim);
LOG.debug("查询下一个用户任务后直连用户任务列表"); LOG.debug("查询下一个用户任务后直连用户任务列表");
List<ConfirmAssigneeVO> confirmAssigneeVOs = listConfirmAssignee(currentUserId, deploymentId, currentUserTask); List<ConfirmAssigneeVO> confirmAssigneeVOs = listConfirmAssignee(task.getProcessInstanceId(), currentUserId, deploymentId, currentUserTask);
model.put("confirmAssignees", JSON.toJSONString(confirmAssigneeVOs)); model.put("confirmAssignees", JSON.toJSONString(confirmAssigneeVOs));
setPageFields(deploymentId, currentUserTask, model); setPageFields(deploymentId, currentUserTask, model);
@ -403,7 +403,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements
* @param currentUserTask * @param currentUserTask
* @return * @return
*/ */
private List<ConfirmAssigneeVO> listConfirmAssignee(String currentUserId, String deploymentId, UserTask currentUserTask) { private List<ConfirmAssigneeVO> listConfirmAssignee(String processInstanceId, String currentUserId, String deploymentId, UserTask currentUserTask) {
LOG.debug("1.获取后续任务节点"); LOG.debug("1.获取后续任务节点");
List<UserTask> nextUserTasks = activitiModelService.listNextUserTasksByUserTask(currentUserTask); List<UserTask> nextUserTasks = activitiModelService.listNextUserTasksByUserTask(currentUserTask);
clearUserTask(nextUserTasks); clearUserTask(nextUserTasks);
@ -433,7 +433,12 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements
// 设置节点类型 // 设置节点类型
confirmAssigneeVO.setNodeType(oaNodeAssigneePO.getNodeType()); confirmAssigneeVO.setNodeType(oaNodeAssigneePO.getNodeType());
// 设置节点代理人列表 // 设置节点代理人列表
List<String> assigneeList = nodeAssigneeService.listAssigneeUserId(currentUserId, oaNodeAssigneePO); List<String> assigneeList;
if (StringUtils.isBlank(processInstanceId)) {
assigneeList = nodeAssigneeService.listAssigneeUserId(currentUserId, oaNodeAssigneePO);
} else {
assigneeList = nodeAssigneeService.listAssigneeUserId(processInstanceId, currentUserId, oaNodeAssigneePO);
}
List<UserDTO> userDTOs = userBaseService.listByUserIds(assigneeList); List<UserDTO> userDTOs = userBaseService.listByUserIds(assigneeList);
List<ConfirmAssigneeVO.AssigneeVO> assigneeVOs = userDTOs.stream().map(userDTO -> { List<ConfirmAssigneeVO.AssigneeVO> assigneeVOs = userDTOs.stream().map(userDTO -> {
ConfirmAssigneeVO.AssigneeVO assigneeVO = new ConfirmAssigneeVO.AssigneeVO(); ConfirmAssigneeVO.AssigneeVO assigneeVO = new ConfirmAssigneeVO.AssigneeVO();