From 5e3231d59b46adfb6e44cd4b4fb17ece12c931a9 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 11 九月 2024 12:02:16 +0800
Subject: [PATCH] !582 优化admin配置文件读取 * update 优化admin监控配置读取名称 * update 优化admin监控配置读取
---
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 a36f880..3641900 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
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.ActTaskMapper">
- <resultMap type="org.dromara.workflow.domain.vo.TaskVo" id="TaskWaitingVoResult">
+ <resultMap type="org.dromara.workflow.domain.vo.TaskVo" id="TaskVoResult">
<result property="id" column="ID_"/>
<result property="name" column="NAME_"/>
<result property="description" column="DESCRIPTION_"/>
@@ -15,43 +15,63 @@
<result property="taskDefinitionId" column="TASK_DEF_ID_"/>
<result property="processDefinitionId" column="PROC_DEF_ID_"/>
<result property="createTime" column="CREATE_TIME_"/>
+ <result property="startTime" column="START_TIME_"/>
<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>
- <select id="getTaskWaitByPage" resultMap="TaskWaitingVoResult">
+ <select id="getTaskWaitByPage" resultMap="TaskVoResult">
select *
from (SELECT RES.*,
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_
- WHERE RES.PARENT_TASK_ID_ IS NULL
- ORDER BY RES.CREATE_TIME_ DESC) t ${ew.getCustomSqlSegment}
+ WHERE RES.PARENT_TASK_ID_ IS NULL) t ${ew.getCustomSqlSegment}
</select>
- <select id="getTaskCopyByPage" resultMap="TaskWaitingVoResult">
+ <select id="getTaskFinishByPage" resultMap="TaskVoResult">
+ select *
+ from (SELECT HTI.*,
+ AHP.BUSINESS_STATUS_,
+ AHP.BUSINESS_KEY_,
+ ARP.NAME_ AS processDefinitionName,
+ 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_
+ WHERE HTI.PARENT_TASK_ID_ IS NULL AND HTI.END_TIME_ IS NOT NULL
+ ) t ${ew.getCustomSqlSegment}
+ </select>
+
+ <select id="getTaskCopyByPage" resultMap="TaskVoResult">
select *
from (SELECT AHT.*,
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_
- WHERE AHT.PARENT_TASK_ID_ is not null
+ WHERE AHT.PARENT_TASK_ID_ IS NOT NULL
and AHT.scope_type_ = 'copy'
- ORDER BY AHT.START_TIME_ DESC) t ${ew.getCustomSqlSegment}
+ ) t ${ew.getCustomSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.3