From 749dc845dcb016ca079ba5d92a9c882fd0326f3f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 30 Jan 2024 20:13:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081474=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=83=A8?= =?UTF-8?q?=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=8A=82=E7=82=B9-=E6=9F=A5=E7=9C=8B=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=B2=A1=E6=9C=89=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/流程图导入后初始sql.sql | 15 +++++++++++++++ .../entity/ProcessProjectStandardTermUser.java | 1 + .../service/ProcessProjectStandardService.java | 11 +++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/db/流程图导入后初始sql.sql b/db/流程图导入后初始sql.sql index 5144b13c..9c3e2b7b 100644 --- a/db/流程图导入后初始sql.sql +++ b/db/流程图导入后初始sql.sql @@ -71,6 +71,21 @@ where process_definition_id like 'project-assessment:%'; # 未符合项跟踪流程开始 +update process_node +set can_choose = 0 +where process_definition_id like 'project-not-met:%' +and xml_node_id in ('fggcsfqzg','fggcssp') +; +update process_node +set sort = case + when xml_node_id = 'fggcsfqzg' then '1' + when xml_node_id = 'sjgcssczgcl' then '2' + when xml_node_id = 'zgjldsp' then '3' + when xml_node_id = 'fggcssp' then '4' + end +where process_definition_id like 'project-not-met:%' +; + # 未符合项跟踪流程结束 # 法规合规评估流程开始 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java index 20ed8c8c..3ff10e56 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java @@ -90,6 +90,7 @@ public class ProcessProjectStandardTermUser { * 责任单位负责人id */ @TableField(value = "responsible_unit_leader") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @ApiModelProperty(value="责任单位负责人id") private String responsibleUnitLeader; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 1b817aab..92e1c3cd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -940,12 +940,15 @@ public class ProcessProjectStandardService extends ServiceImpl getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) { + String taskId = termUser.getTaskId(); + if (taskId != null){ + ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + termUser.setResponsibleUnitLeader(originUserId); + } Page page = new Page<>(pageNo, pageSize); Page pageList = termUserMapper.selectPageByUser(page, termUser); - for (ProcessProjectStandardTermUser record : pageList.getRecords()) { - String moduleOwner = record.getModuleOwner(); - record.setModuleOwner(sysBaseAPI.translateUserRealNameFromTable(moduleOwner)); - } return pageList; }