From 4e871e02e6057a7fddf07aa02becad73dbfd2d9f Mon Sep 17 00:00:00 2001
From: Liang <545073804@qq.com>
Date: 星期三, 03 四月 2024 09:05:39 +0800
Subject: [PATCH] update 优化Mapper.xml结果集定义

---
 ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

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 9c33726..6801a8e 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
@@ -19,14 +19,14 @@
         <result property="endTime" column="END_TIME_"/>
         <result property="taskDefinitionKey" column="TASK_DEF_KEY_"/>
         <result property="dueDate" column="DUE_DATE_"/>
-        <result property="processDefinitionKey" column="key_"/>
         <result property="category" column="CATEGORY_"/>
         <result property="parentTaskId" column="PARENT_TASK_ID_"/>
         <result property="tenantId" column="TENANT_ID_"/>
         <result property="claimTime" column="CLAIM_TIME"/>
         <result property="businessStatus" column="BUSINESS_STATUS_"/>
         <result property="processDefinitionName" column="processDefinitionName"/>
-        <result property="processDefinitionKey" column="processDefinitionName"/>
+        <result property="processDefinitionKey" column="processDefinitionKey"/>
+        <result property="processDefinitionVersion" column="processDefinitionVersion"/>
         <result property="businessKey" column="BUSINESS_KEY_"/>
 
     </resultMap>
@@ -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_

--
Gitblit v1.9.3