From de9369d2c8056e2bb723247b0e877fe9d96f8def Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 15 Sep 2024 15:20:58 +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 | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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..d4d4913 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
@@ -288,6 +288,22 @@
id = #{entity.id}
</where>
</update>
+
+ <!-- 批量对象 -->
+ <update id="updateCaseTaskList">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id IN
+ <foreach item="id" collection="taskIdList" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </where>
+ </update>
+
<!-- 条件更新对象 -->
<update id="updateCaseTaskTerms">
update
@@ -347,19 +363,16 @@
<!-- 查询任务数量 -->
<select id="countTaskList" resultMap="FrontPageCountResult">
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 (node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP') and sign_status != 1 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>
<!-- 首页-待办理结果集 -->
@@ -394,6 +407,7 @@
where
cande_unit_id = #{terms.candeUnitId}
and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP')
+ and sign_status != 1
and t1.delete_status = 0
and t1.status = #{terms.status}
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
@@ -401,7 +415,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待分派分页查询 -->
@@ -414,6 +428,7 @@
where
t1.cande_unit_id = #{terms.candeUnitId}
and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP')
+ and sign_status != 1
and t1.delete_status = 0
and t1.status = #{terms.status}
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
@@ -421,7 +436,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -450,7 +465,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待签收分页查询 -->
@@ -471,7 +486,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -492,7 +507,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}
@@ -501,7 +516,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待受理分页查询 -->
@@ -515,7 +530,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}
@@ -524,7 +539,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -553,13 +568,13 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-办理中分页查询 -->
<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
@@ -574,7 +589,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
--
Gitblit v1.8.0