From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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..cf2f3ad 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,24 @@
<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,
+ ACT_RU_TASK.ASSIGNEE_ 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>
--
Gitblit v1.9.3