From cb54981736771e19e6b954d8cb60f77576671fc5 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Wed, 11 Sep 2024 13:31:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 813ec26..91268df 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
@@ -349,17 +349,14 @@
select
count(case when node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP' then id end) as waitDisp,
count(case when sign_status = 1 then id end) as waitSign,
- count(case when node_id = 'ZJ_DSL' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP' then id end) as waitAccept,
+ count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL') and sign_status != 1 then id end) as waitAccept,
count(case when node_id = 'BLFK' then id end) as Processing
from
<include refid="table-name" />
where
cande_unit_id = #{terms.candeUnitId}
- <if test="terms.candeDeptId != null and terms.candeDeptId !=''">
- and (cande_dept_id = #{terms.candeDeptId})
- </if>
- and delete_status = '0'
- and status = '1'
+ and delete_status = 0
+ and status = 1
</select>
<!-- 首页-待办理结果集 -->
@@ -492,7 +489,7 @@
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
t1.cande_unit_id = #{terms.candeUnitId}
- and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP')
+ and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL')
and t1.delete_status = 0
and t1.sign_status != 1
and t1.status = #{terms.status}
@@ -515,7 +512,7 @@
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
t1.cande_unit_id = #{terms.candeUnitId}
- and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP')
+ and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL')
and t1.delete_status = 0
and t1.sign_status != 1
and t1.status = #{terms.status}
@@ -559,7 +556,7 @@
<!-- 首页-办理中分页查询 -->
<select id="pageMyTaskProcessing" resultMap="MyTaskApplyReviewResult">
SELECT t1.id as ownerId, t1.case_id as caseId,
- t1.create_time as turnaroundTime, t1.cande_unit_name as organizingUnit, t2.case_level as caseGrade, t2.canal_name as caseSource,
+ t1.create_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource,
t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
concat(t2.defendants, t2.dagents) as defendants
FROM
--
Gitblit v1.8.0