From bdec8b24b78a6f52d21fff2cc8dfab847304dacc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 四月 2025 11:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
index cf2f3ad..72d3f84 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
@@ -8,6 +8,10 @@
flow_my_business.proposer,
flow_my_business.task_name,
flow_my_business.task_id,
+ flow_my_business.data_id AS 'dataId',
+ flow_my_business.process_definition_key,
+ flow_my_business.process_definition_id,
+ flow_my_business.process_instance_id,
ACT_RU_TASK.ASSIGNEE_ as todoUsers,
flow_my_business.done_Users,
ACT_HI_PROCINST.START_TIME_ AS start_time,
@@ -41,25 +45,27 @@
</select>
<select id="PageListMyBusiness" resultType="org.jeecg.modules.flowable.domain.dto.FlowTaskDto">
SELECT
- task.ID_ as 'hisProcInsId',
- TASK.PROC_INST_ID_ AS 'taskId',
- ACT_RE_PROCDEF.CATEGORY_ AS 'category',
- ACT_RE_PROCDEF.NAME_ 'procDefName',
- flow_my_business.title AS 'Description',
- flow_my_business.data_id AS 'dataId',
- flow_my_business.process_definition_key AS 'processDefinitionKey',
- flow_my_business.process_definition_id AS 'processDefinitionId',
- flow_my_business.process_instance_id AS 'processInstanceId',
- TASK.EXECUTION_ID_ AS 'executionId',
- task.NAME_ AS 'taskName',
- task.DURATION_ 'duration',
- task.START_TIME_ AS 'createTime',
- task.END_TIME_ AS 'finishTime',
- task.TASK_DEF_KEY_ AS 'TaskDefKey'
+ task.ID_ AS 'taskId',
+ TASK.PROC_INST_ID_ AS 'procInsId',
+ ACT_RE_PROCDEF.CATEGORY_ AS 'category',
+ ACT_RE_PROCDEF.NAME_ 'procDefName',
+ flow_my_business.title AS 'Description',
+ flow_my_business.data_id AS 'dataId',
+ flow_my_business.process_definition_key AS 'processDefinitionKey',
+ flow_my_business.process_definition_id AS 'processDefinitionId',
+ ACT_HI_PROCINST.START_TIME_ AS createTime,
+ ACT_RU_TASK.ASSIGNEE_ as todoUsers,
+ task.END_TIME_ AS 'finishTime',
+ TASK.EXECUTION_ID_ AS 'executionId',
+ task.NAME_ AS 'taskName',
+ task.DURATION_ 'duration',
+ task.TASK_DEF_KEY_ AS 'TaskDefKey'
FROM
- ACT_HI_TASKINST TASK
- LEFT JOIN flow_my_business ON flow_my_business.process_instance_id = TASK.PROC_INST_ID_
- LEFT JOIN ACT_RE_PROCDEF ON flow_my_business.process_definition_id = ACT_RE_PROCDEF.ID_
+ ACT_HI_TASKINST TASK
+ LEFT JOIN flow_my_business ON flow_my_business.process_instance_id = TASK.PROC_INST_ID_
+ LEFT JOIN ACT_RE_PROCDEF ON flow_my_business.process_definition_id = ACT_RE_PROCDEF.ID_
+ LEFT JOIN ACT_HI_PROCINST ON TASK.PROC_INST_ID_ = ACT_HI_PROCINST.ID_
+ left join ACT_RU_TASK on flow_my_business.task_id = ACT_RU_TASK.ID_
WHERE
TASK.END_TIME_ IS NOT NULL
<if test="flowMyBusinessDto.currentUser != null and flowMyBusinessDto.currentUser != ''">
--
Gitblit v1.9.3