From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 a178308..b0d8ccd 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}
@@ -542,6 +548,7 @@
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>
<!-- 首页-待/已受理分页查询 -->
@@ -558,6 +565,7 @@
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 ">
@@ -741,16 +749,16 @@
and t3.mediator like concat('%', #{terms.mediator}, '%')
</if>
<if test="terms.canal != null and terms.canal !=''">
- and t1.canal = #{terms.canal}
+ and t2.canal = #{terms.canal}
</if>
<if test="terms.mediResult != null and terms.mediResult !=''">
- and t1.medi_result = #{terms.mediResult}
+ and t3.medi_result = #{terms.mediResult}
</if>
<if test="terms.caseLevel != null and terms.caseLevel !=''">
- and t1.case_level = #{terms.caseLevel}
+ and t2.case_level = #{terms.caseLevel}
</if>
<if test="terms.caseType != null and terms.caseType !=''">
- and t1.case_type = #{terms.caseType}
+ and t2.case_type = #{terms.caseType}
</if>
<if test="terms.status != null and terms.status !=''">
and t2.status = #{terms.status}
--
Gitblit v1.8.0