From 00247e6b16f8139867f5ee1507624dad64092035 Mon Sep 17 00:00:00 2001 From: pengqiang Date: Tue, 16 Nov 2021 11:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 1 + .../work/service/ActListenerService.java | 7 ++---- .../work/service/ActProcInsService.java | 13 ++++++----- .../templates/admin/project_detail.ftl | 2 +- .../templates/admin/project_list.ftl | 22 ++++++++++++++----- .../admin/project_task_record_list.ftl | 4 ++-- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 5b479d4..fa6c771 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -74,6 +74,7 @@ public class ProjectController extends BaseController { Map model) { //当前登录人的角色类型 model.put("keywords", keywords); + model.put("adminId", InterfaceUtil.getAdminId()); model.put("deptList", deptRepository.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); model.put("pager", projectService.list(searchInfo, pageNumber, pageSize)); diff --git a/src/main/java/cn/palmte/work/service/ActListenerService.java b/src/main/java/cn/palmte/work/service/ActListenerService.java index 3a44ddd..3dee877 100644 --- a/src/main/java/cn/palmte/work/service/ActListenerService.java +++ b/src/main/java/cn/palmte/work/service/ActListenerService.java @@ -47,7 +47,7 @@ public class ActListenerService { * @throws Exception */ public void create(DelegateTask delegateTask) throws Exception { - logger.info("--节点创建后监听-- name:{}, {}", delegateTask.getName(), JSONObject.toJSONString(delegateTask)); + logger.info("--节点创建后监听-- procInsId:{}, {}", delegateTask.getProcessInstanceId(), delegateTask); String procDefId = delegateTask.getProcessDefinitionId(); String procInsId = delegateTask.getProcessInstanceId(); @@ -55,10 +55,7 @@ public class ActListenerService { List candidateUsers = actTaskDefService.findCandidateUsers(procDefId, procInsId, taskDefKey); logger.info("addCandidateUsers : {}", candidateUsers); - ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery(); - List list = processInstanceQuery.list(); - System.out.println(list); - ProcessInstance processInstance = processInstanceQuery.processInstanceId(delegateTask.getProcessInstanceId()).singleResult(); + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(delegateTask.getProcessInstanceId()).singleResult(); if (actUtil.isProjectProcessIns(processInstance)) { updateProjectApprover(candidateUsers, processInstance); } diff --git a/src/main/java/cn/palmte/work/service/ActProcInsService.java b/src/main/java/cn/palmte/work/service/ActProcInsService.java index 649d813..89675c5 100644 --- a/src/main/java/cn/palmte/work/service/ActProcInsService.java +++ b/src/main/java/cn/palmte/work/service/ActProcInsService.java @@ -87,9 +87,10 @@ public class ActProcInsService { String adminId = InterfaceUtil.getAdminId() + ""; variables.put(ActConstant.START_PROCESS_USERID, adminId); //启动流程 - ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinition.getId(), businessKey, variables); + ProcessInstance instance = runtimeService.startProcessInstanceById(processDefinition.getId(), businessKey, variables); + logger.info("startProcessInstanceSuccess procInsId:{}, procDefKey:{}, procDefName:{}", instance.getId(), instance.getProcessDefinitionKey(), instance.getProcessDefinitionName()); - String procInsId = processInstance.getProcessInstanceId(); + String procInsId = instance.getProcessInstanceId(); Task task = taskService.createTaskQuery().processInstanceId(procInsId).singleResult(); if (task == null) { throw new Exception("procDefKey(" + procDefKey + ")启动异常"); @@ -101,15 +102,15 @@ public class ActProcInsService { taskService.addComment(taskId, procInsId, comment); //设置发起人为办理人 然后完成任务 任务转入下一个审批节点 - task.setAssignee(adminId); + taskService.setAssignee(taskId, adminId); taskService.complete(taskId); - if (actUtil.isProjectProcessIns(processInstance)) { - projectTaskRecordService.saveTaskRecord(Integer.parseInt(processInstance.getBusinessKey()), + if (actUtil.isProjectProcessIns(instance)) { + projectTaskRecordService.saveTaskRecord(Integer.parseInt(instance.getBusinessKey()), task, ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus(), ActConstant.TASK_INDEX_FIRST_USER_TASK, comment); } - return processInstance.getId(); + return instance.getId(); } /** diff --git a/src/main/resources/templates/admin/project_detail.ftl b/src/main/resources/templates/admin/project_detail.ftl index a1ecc78..a9824d5 100644 --- a/src/main/resources/templates/admin/project_detail.ftl +++ b/src/main/resources/templates/admin/project_detail.ftl @@ -1336,7 +1336,7 @@
审核意见
-
+
<#list taskRecords as node> ${node.assigneeName} : ${node.taskComment}    ${node.createTime}
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index ca7e0c3..bd7c615 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -201,18 +201,23 @@
<#--<@shiro.hasPermission name="PROJECT_EDIT">--> + <#if list.approveStatusEstimate==0 || list.approveStatusEstimate==3> + + <#-- <@shiro.hasPermission name="PROJECT_EDIT">--> + <#if list.status==5> + <#-- --> - + + + <#if adminId==list.approveId> + + +
${node.roleName}-${node.assigneeName}: - <#if node.taskStatus==2>审批通过 - <#if node.taskStatus==3>审批不通过 + <#if node.taskIndex!=2 && node.taskStatus==2>审批通过 + <#if node.taskIndex!=2 && node.taskStatus==3>审批不通过
${node.taskComment}