From dd0d2937c518cd6841b0034b9a67c02131ffdc2c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 10 三月 2023 00:02:12 +0800
Subject: [PATCH] 本地新oss，配置，经测试成功，原来bucket被推送太多数据，不方便测试
---
ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
index fc7f13a..d623161 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
@@ -4,41 +4,66 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.DisposeRecord">
- <id column="id" property="id" />
- <result column="base_case_id" property="baseCaseId" />
- <result column="workflow_config_step_id" property="workflowConfigStepId" />
- <result column="step_name" property="stepName" />
- <result column="start_time" property="startTime" />
- <result column="handler_role_id" property="handlerRoleId" />
- <result column="end_time" property="endTime" />
- <result column="state" property="state" />
- <result column="handler_id" property="handlerId" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
+ <id column="id" property="id"/>
+ <result column="base_case_id" property="baseCaseId"/>
+ <result column="workflow_config_step_id" property="workflowConfigStepId"/>
+ <result column="step_name" property="stepName"/>
+ <result column="start_time" property="startTime"/>
+ <result column="handler_role_id" property="handlerRoleId"/>
+ <result column="end_time" property="endTime"/>
+ <result column="state" property="state"/>
+ <result column="handler_id" property="handlerId"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_time" property="createTime"/>
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id, base_case_id, step_name, start_time, handler_role_id, end_time, state, handler_id, create_user, create_time
+ id
+ , base_case_id, step_name, start_time, handler_role_id, end_time, state, handler_id, create_user, create_time
</sql>
<select id="selectMyBackList" resultType="com.ycl.vo.MyBacklogVO">
+ with tmp as(
SELECT
- t3.event_source,
- t3.category,
- t2.step_name,
- t3.`code`,
- t2.create_time
+ t3.event_source,
+ t3.category,
+ t2.step_name,
+ t3.`id` caseId,
+ t3.`code`,
+ t2.create_time,
+ t2.limit_time
FROM
- ums_admin_role_relation t1
- JOIN ums_dispose_record t2 ON t1.role_id = t2.handler_role_id
- JOIN ums_base_case t3 ON t2.base_case_id=t3.id
+ ums_admin_role_relation t1
+ left JOIN ums_dispose_record t2 ON t1.role_id = t2.handler_role_id
+ left JOIN ums_base_case t3 ON t2.base_case_id=t3.id
<where>
- t1.admin_id = #{id}
- AND ISNULL( t2.end_time )
- <if test="code!='' and code!=null">
- and t3.`code` LIKE CONCAT('%',#{code},'%')
- </if>
+ t1.admin_id = #{id} and t3.`code` is not null
+ AND t2.state = 0
+ <if test="code!='' and code!=null">
+ and t3.`code` LIKE CONCAT('%',#{code},'%')
+ </if>
</where>
+ union all
+ SELECT
+ t3.event_source,
+ t3.category,
+ t2.step_name,
+ t3.`id` caseId,
+ t3.`code`,
+ t2.create_time,
+ t2.limit_time
+ FROM
+ ums_dispose_record t2
+ LEFT JOIN ums_base_case t3 ON t2.base_case_id = t3.id
+ <where>
+ t2.handler_id = #{id}
+ AND t2.state = 0
+ <if test="code!='' and code!=null">
+ and t3.`code` LIKE CONCAT('%',#{code},'%')
+ </if>
+ </where>
+ )
+ select distinct * from tmp order by create_time
</select>
</mapper>
--
Gitblit v1.8.0