From cbc1030043989a54c4a5fdd8c28a503f4aff4bc8 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Tue, 2 Apr 2024 20:52:52 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/workflow/domain/vo/ProcessInstanceVo.java | 2 +- .../main/java/org/dromara/workflow/domain/vo/TaskVo.java | 5 +++++ .../workflow/service/impl/ActTaskServiceImpl.java | 1 + .../src/main/resources/mapper/workflow/ActTaskMapper.xml | 9 ++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java index 305b5233c..b697e29bd 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java @@ -41,7 +41,7 @@ public class ProcessInstanceVo implements Serializable { /** * 流程定义版本 */ - private String processDefinitionVersion; + private Integer processDefinitionVersion; /** * 部署id diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java index fa03008cf..466e77690 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java @@ -141,6 +141,11 @@ public class TaskVo implements Serializable { */ private String processDefinitionKey; + /** + * 流程定义版本 + */ + private Integer processDefinitionVersion; + /** * 参与者 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index 871db164b..d156a71d1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -339,6 +339,7 @@ public class ActTaskServiceImpl implements IActTaskService { taskVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(taskVo.getBusinessStatus())); taskVo.setProcessDefinitionKey(e.getProcessDefinitionKey()); taskVo.setProcessDefinitionName(e.getProcessDefinitionName()); + taskVo.setProcessDefinitionVersion(e.getProcessDefinitionVersion()); taskVo.setBusinessKey(e.getBusinessKey()); }); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml index 9c3372686..0a8c697f4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml @@ -36,7 +36,8 @@ AHP.BUSINESS_STATUS_, AHP.BUSINESS_KEY_, ARP.NAME_ AS processDefinitionName, - ARP.KEY_ AS processDefinitionKey + ARP.KEY_ AS processDefinitionKey, + ARP.VERSION_ AS processDefinitionVersion FROM ACT_RU_TASK RES INNER JOIN ACT_HI_PROCINST AHP ON RES.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = RES.PROC_DEF_ID_ @@ -50,7 +51,8 @@ AHP.BUSINESS_STATUS_, AHP.BUSINESS_KEY_, ARP.NAME_ AS processDefinitionName, - ARP.KEY_ AS processDefinitionKey + ARP.KEY_ AS processDefinitionKey, + ARP.VERSION_ AS processDefinitionVersion FROM ACT_HI_TASKINST HTI INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_ @@ -64,7 +66,8 @@ AHP.BUSINESS_STATUS_, AHP.BUSINESS_KEY_, ARP.NAME_ as processDefinitionName, - ARP.KEY_ as processDefinitionKey + ARP.KEY_ as processDefinitionKey, + ARP.VERSION_ AS processDefinitionVersion FROM ACT_HI_TASKINST AHT INNER JOIN ACT_HI_PROCINST AHP ON AHT.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = AHT.PROC_DEF_ID_