From dd569475b4ec1bbffc40af2feb024919791b33a7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 四月 2025 15:45:42 +0800
Subject: [PATCH] 修改查询条件数据类型
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 96 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 13 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 46ca3a5..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
@@ -1,22 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.flowable.apithird.business.mapper.FlowMyBusinessMapper">
-
- <select id="findPageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
+ <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,
- NC_ASSIGN_FILE_STREAM.STATUS as status,
- ACT_RE_PROCDEF.NAME_ as flowName
+ 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,
+ 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_
- LEFT JOIN NC_ASSIGN_FILE_STREAM ON flow_my_business.data_id = NC_ASSIGN_FILE_STREAM.STREAM_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>
+ <if test="flowMyBusinessDto.flowName!= null and flowMyBusinessDto.flowName!= ''">
+ AND ACT_RE_PROCDEF.name_ LIKE CONCAT('%',#{flowMyBusinessDto.flowName},'%')
+ </if>
+ <if test="flowMyBusinessDto.title != null and flowMyBusinessDto.title != ''">
+ AND flow_my_business.title LIKE CONCAT('%',#{flowMyBusinessDto.title},'%')
+ </if>
+ <if test="flowMyBusinessDto.startTime!= null and flowMyBusinessDto.startTime!= ''">
+ AND ACT_HI_PROCINST.START_TIME_ >= #{flowMyBusinessDto.startTime}
+ </if>
+ <if test="flowMyBusinessDto.endTime!= null and flowMyBusinessDto.endTime!= ''">
+ AND ACT_HI_PROCINST.END_TIME_ <= #{flowMyBusinessDto.endTime}
+ </if>
ORDER BY
flow_my_business.create_time desc
</select>
+ <select id="PageListMyBusiness" resultType="org.jeecg.modules.flowable.domain.dto.FlowTaskDto">
+ SELECT
+ 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_
+ 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 != ''">
+ AND TASK.ASSIGNEE_ = #{flowMyBusinessDto.currentUser}
+ </if>
+ <if test="flowMyBusinessDto.category != null and flowMyBusinessDto.category != ''">
+ and ACT_RE_PROCDEF.CATEGORY_ = #{flowMyBusinessDto.category}
+ </if>
+ <if test="flowMyBusinessDto.flowName!= null and flowMyBusinessDto.flowName!= ''">
+ AND ACT_RE_PROCDEF.name_ LIKE CONCAT('%',#{flowMyBusinessDto.flowName},'%')
+ </if>
+ <if test="flowMyBusinessDto.title != null and flowMyBusinessDto.title != ''">
+ AND flow_my_business.title LIKE CONCAT('%',#{flowMyBusinessDto.title},'%')
+ </if>
+ <if test="flowMyBusinessDto.startTime!= null and flowMyBusinessDto.startTime!= ''">
+ AND TASK.START_TIME_ >= #{flowMyBusinessDto.startTime}
+ </if>
+ <if test="flowMyBusinessDto.endTime!= null and flowMyBusinessDto.endTime!= ''">
+ AND TASK.END_TIME_ <= #{flowMyBusinessDto.endTime}
+ </if>
+ ORDER BY
+ TASK.END_TIME_ DESC
+ </select>
</mapper>
--
Gitblit v1.9.3