From 6b0c99943f1ae73a55f54a721473b7cc8ddd1c24 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 26 十月 2022 14:13:18 +0800
Subject: [PATCH] 我的待办处置人查询 上传处置重构

---
 ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml |   68 ++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 23 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..73fc29e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
@@ -4,41 +4,63 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <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">
         SELECT
-            t3.event_source,
-            t3.category,
-            t2.step_name,
-            t3.`code`,
-            t2.create_time
+        t3.event_source,
+        t3.category,
+        t2.step_name,
+        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
+        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
         <where>
             t1.admin_id = #{id}
             AND ISNULL( t2.end_time )
-        <if test="code!='' and code!=null">
-            and t3.`code` LIKE CONCAT('%',#{code},'%')
-        </if>
+            <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.`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 ISNULL(
+            t2.end_time
+            )
+            <if test="code!='' and code!=null">
+                and t3.`code` LIKE CONCAT('%',#{code},'%')
+            </if>
         </where>
     </select>
 </mapper>

--
Gitblit v1.8.0