diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java index bb90d71d..12cc9bd3 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java @@ -137,7 +137,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { String noticeTitle = processAll.getPrcName() + "(" + loginUser.getRealname() + " " + date + ")"; hiworkTodo.setNoticeTitle(noticeTitle); hiworkTodo.setProcessId(processAll.getProcessInstanceId()); - hiworkTodo.setProcessName(processAll.getPrcName()); + hiworkTodo.setProcessName(ProcessTypeEnum.getNameByValue(processAll.getPrcType())); hiworkTodo.setProcessType(PROCESS_TYPE); // 是否显示(0否,1是) @@ -158,8 +158,6 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { hiworkTodo.setUserName(sysUser.getRealname()); } hiworkTodo.setReceiveTime(Instant.now()); - //2已完成时进入下一节点 - hiworkTodo.setMultiInstance(0); hiworkTodo.setIsTodo(String.valueOf(3)); hiworkTodoList.add(hiworkTodo); return hiworkTodoList; @@ -188,7 +186,6 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getRealname() + " " + date + ")"; hiworkTodo.setNoticeTitle(noticeTitle); hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId()); - hiworkTodo.setProcessName(processApprovalRecord.getPrcName()); hiworkTodo.setProcessType(PROCESS_TYPE); hiworkTodo.setTaskId(processApprovalRecord.getTaskId()); hiworkTodo.setTaskName(processApprovalRecord.getTaskName()); @@ -211,6 +208,8 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { queryProcessAll.eq(ProcessAll::getProcessInstanceId,processApprovalRecord.getProcessInstanceId()); ProcessAll processAll = processAllService.getOne(queryProcessAll); if(!Objects.isNull(processAll)){ + hiworkTodo.setProcessName(ProcessTypeEnum.getNameByValue(processAll.getPrcType())); + SysUser sysUser = sysUserService.getById(processAll.getCreateUserId()); if(!Objects.isNull(sysUser)){ hiworkTodo.setCreateUserCode(sysUser.getUsername()); @@ -254,8 +253,6 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { Integer finishFlag = processApprovalRecord.getFinishFlag(); if (finishFlag.equals(2)){ hiworkTodo.setMultiInstance(0); - }else { - hiworkTodo.setMultiInstance(1); } hiworkTodo.setIsTodo(String.valueOf(finishFlag)); hiworkTodoList.add(hiworkTodo);