From f6495f2ba590b219865362a0350e1d34e5ad97c9 Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Tue, 08 Oct 2024 14:58:08 +0800 Subject: [PATCH] 1、更换开发数据库 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml index b4b9302..763d357 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml @@ -382,8 +382,8 @@ <if test="terms.candeUnitId != null and terms.candeUnitId !=''"> and t1.cande_unit_id = #{terms.candeUnitId} </if> - <if test="terms.status != null and terms.status !=''"> - and t1.status = #{terms.status} + <if test="terms.handleUnitId != null and terms.handleUnitId !=''"> + and t1.handle_unit_id = #{terms.handleUnitId} </if> <if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''"> and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart} @@ -407,7 +407,9 @@ where (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP') and t1.sign_status != 1 + and t1.case_task_type = 1 and t2.delete_status = 0 + and t1.status = #{terms.status} <include refid="myTaskFp-where-part"/> </select> <!-- 工作台-待分派分页查询 --> @@ -423,7 +425,9 @@ where (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP') and t1.sign_status != 1 + and t1.case_task_type = 1 and t2.delete_status = 0 + and t1.status = #{terms.status} <include refid="myTaskFp-where-part"/> <if test="page.sort != null"> <foreach collection="page.sort" item="s" index="index" separator="," open="order by "> @@ -443,8 +447,8 @@ <if test="terms.candeUnitId != null and terms.candeUnitId !=''"> and t1.cande_unit_id = #{terms.candeUnitId} </if> - <if test="terms.signStatus != null and terms.signStatus !=''"> - and t1.sign_status = #{terms.signStatus} + <if test="terms.handleUnitId != null and terms.handleUnitId !=''"> + and t1.handle_unit_id = #{terms.handleUnitId} </if> <if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''"> and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart} @@ -468,6 +472,7 @@ where t2.delete_status = 0 and t1.status = '1' + and t1.sign_status = #{terms.signStatus} <include refid="myTaskQs-where-part"/> </select> <!-- 首页-待/已签收分页查询 --> @@ -482,6 +487,7 @@ where t2.delete_status = 0 and t1.status = '1' + and t1.sign_status = #{terms.signStatus} <include refid="myTaskQs-where-part"/> <if test="page.sort != null"> <foreach collection="page.sort" item="s" index="index" separator="," open="order by "> @@ -512,8 +518,8 @@ <if test="terms.candeUnitId != null and terms.candeUnitId !=''"> and t1.cande_unit_id = #{terms.candeUnitId} </if> - <if test="terms.status != null and terms.status !=''"> - and t1.status = #{terms.status} + <if test="terms.handleUnitId != null and terms.handleUnitId !=''"> + and t1.handle_unit_id = #{terms.handleUnitId} </if> <if test="terms.caseTaskType != null and terms.caseTaskType !=''"> and t1.case_task_type = #{terms.caseTaskType} @@ -541,7 +547,7 @@ (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL') and t2.delete_status = 0 and t1.sign_status != 1 - and (t1.handle_result != 3 or t1.handle_result is null) + and t1.status = #{terms.status} <include refid="myTaskSl-where-part"/> </select> <!-- 首页-待/已受理分页查询 --> @@ -557,7 +563,7 @@ (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL') and t2.delete_status = 0 and t1.sign_status != 1 - and (t1.handle_result != 3 or t1.handle_result is null) + and t1.status = #{terms.status} <include refid="myTaskSl-where-part"/> <if test="page.sort != null"> <foreach collection="page.sort" item="s" index="index" separator="," open="order by "> -- Gitblit v1.8.0