From c4eddf6f793986516c919add6493ad2be2c63b82 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 四月 2025 13:57:47 +0800
Subject: [PATCH] 修改flow基础代码,添加设备岗位查询用户

---
 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml |   69 ++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 28 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 27b7a5e..07c540b 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
@@ -3,17 +3,28 @@
 <mapper namespace="org.jeecg.modules.flowable.apithird.business.mapper.FlowMyBusinessMapper">
     <select id="PageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
         SELECT
-            flow_my_business.*,
-            ACT_HI_PROCINST.START_TIME_ as start_time,
-            ACT_HI_PROCINST.END_TIME_ as end_time,
-            ACT_RE_PROCDEF.NAME_ as flowName,
-            ACT_RE_PROCDEF.CATEGORY_ as category
+        flow_my_business.id,
+        flow_my_business.title,
+        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,
+        flow_my_business.todo_users as todoUsers,
+        flow_my_business.done_Users,
+        ACT_HI_PROCINST.START_TIME_ AS start_time,
+        ACT_HI_PROCINST.END_TIME_ AS end_time,
+        ACT_RE_PROCDEF.NAME_ AS flowName,
+        ACT_RE_PROCDEF.CATEGORY_ AS category
         FROM
-            flow_my_business
-                LEFT JOIN ACT_HI_PROCINST ON flow_my_business.process_instance_id = ACT_HI_PROCINST.ID_
-                LEFT JOIN ACT_RE_PROCDEF ON flow_my_business.process_definition_id = ACT_RE_PROCDEF.ID_
-        where
-            1 = 1
+        flow_my_business
+        LEFT JOIN ACT_HI_PROCINST ON flow_my_business.process_instance_id = ACT_HI_PROCINST.ID_
+        LEFT JOIN ACT_RE_PROCDEF ON flow_my_business.process_definition_id = ACT_RE_PROCDEF.ID_
+        left join ACT_RU_TASK on flow_my_business.task_id = ACT_RU_TASK.ID_
+        WHERE
+        1 = 1
         <if test="flowMyBusinessDto.category != null and flowMyBusinessDto.category != ''">
             and ACT_RE_PROCDEF.CATEGORY_ = #{flowMyBusinessDto.category}
         </if>
@@ -34,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