From c12bfb50883842c2db5aaf0642034a18953eb250 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 13 Apr 2024 20:30:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=8E=A8=E9=80=81oa=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E9=A2=98=E4=B8=AD=E4=BD=BF=E7=94=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiwork/service/impl/HiworkTodoServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 0b02b021..bc9e63a9 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 @@ -142,8 +142,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { hiworkTodo.setSysCode(hiworkSysCode); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String date = DateUtil.formatDateTime(new Date()); - String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getRealname() + " " + date + ")"; - hiworkTodo.setNoticeTitle(noticeTitle); + hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId()); hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId()); hiworkTodo.setProcessType(PROCESS_TYPE); @@ -163,12 +162,14 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { // 是否显示（0否，1是） hiworkTodo.setIsShow(String.valueOf(processNode.getIsView())); } - + String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getRealname() + " " + date + ")"; LambdaQueryWrapper queryProcessAll = new LambdaQueryWrapper<>(); queryProcessAll.eq(ProcessAll::getProcessInstanceId,processApprovalRecord.getProcessInstanceId()); ProcessAll processAll = processAllService.getOne(queryProcessAll); if(!Objects.isNull(processAll)){ - hiworkTodo.setProcessName(ProcessTypeEnum.getNameByValue(processAll.getPrcType())); + String processName = ProcessTypeEnum.getNameByValue(processAll.getPrcType()); + noticeTitle = processName + "(" + loginUser.getRealname() + " " + date + ")"; + hiworkTodo.setProcessName(processName); SysUser sysUser = sysUserService.getById(processAll.getCreateUserId()); if(!Objects.isNull(sysUser)){ @@ -206,6 +207,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType()))); hiworkTodo.setAppBusinessLink(appBusinessLink); } + hiworkTodo.setNoticeTitle(noticeTitle); SysUser sysUser = sysUserService.getById(processApprovalRecord.getUserId()); if(!Objects.isNull(sysUser)){ hiworkTodo.setUserId(processApprovalRecord.getUserId());