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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 f9849a3..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
@@ -407,6 +407,7 @@
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"/>
@@ -424,6 +425,7 @@
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"/>
@@ -747,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