From 251f76a4e68eeb62c079c371ab5168b4fc4cce81 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Dec 2023 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E4=BC=9A=E7=AD=BE=E9=A9=B3=E5=9B=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CounterSignNodeNameConstants.java | 4 ++++ .../common/service/ActFlowCommonService.java | 2 +- .../esRevision/entity/ProcessEsRevision.java | 11 +++++------ .../service/impl/EsRevisionServiceImpl.java | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java index cda9d962..a2349e55 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java @@ -12,5 +12,9 @@ public class CounterSignNodeNameConstants { public static final String ES_INIT_CHANGE_EXPERT_NODE_NAME = "专家审批"; + public static final String ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME = "其它起草人校对"; + public static final String ES_REVISION_LEADER_APPROVAL_NODE_NAME = "主管级领导审批"; + + public static final String ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME = "相关部门领导会签"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 7cb46669..05773a4f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -443,7 +443,7 @@ public class ActFlowCommonService { updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId); updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()); updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName); - updateWrapper.set(ProcessApprovalRecord::getFinishFlag, CommitFlagEnum.UNDISPOSED.getValue()); + updateWrapper.set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue()); processApprovalRecordService.update(updateWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java index 6673d29a..53ab88c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java @@ -190,35 +190,34 @@ public class ProcessEsRevision implements Serializable { /** * 校对人 */ - @TableField(exist = false) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "校对人") private String proofreader; /** * 审批人（主管级领导） */ - @TableField(exist = false) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "审批人（主管级领导）") private String approvalUser; /** * 审批人（标准化） */ - @TableField(exist = false) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "审批人（标准化）") private String approvalUserStandard; /** * 相关部门领导 */ - @TableField(exist = false) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "相关部门领导") private String relatedLeader; /** * 授权部门 */ - @TableField(exist = false) @ApiModelProperty(value = "授权部门") private String authDept; @@ -254,7 +253,7 @@ public class ProcessEsRevision implements Serializable { /** * 总工程师 */ - @TableField(exist = false) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "总工程师") private String chiefEngineer; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index ca705a9e..1cd91afa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.CommonVO; +import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType; @@ -462,6 +463,24 @@ public class EsRevisionServiceImpl extends ServiceImpl