From b4d23d40c6ba77b028538ccebf8b757b5491aa90 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 10:33:11 +0800
Subject: [PATCH] 1、流程bug修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 175 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 124 insertions(+), 51 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 2c0da83..24bd0b2 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
@@ -429,7 +429,7 @@
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
(t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
- and sign_status != 1
+ and t1.sign_status != 1
and t2.delete_status = 0
<include refid="myTaskFp-where-part"/>
</select>
@@ -445,7 +445,7 @@
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
(t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
- and sign_status != 1
+ and t1.sign_status != 1
and t2.delete_status = 0
<include refid="myTaskFp-where-part"/>
<if test="page.sort != null">
@@ -517,6 +517,17 @@
limit #{page.offset}, #{page.size}
</select>
+ <!-- 全部签收-查询未签收所有Id -->
+ <select id="listIdByTerms" resultType="cn.huge.module.cases.domain.dto.SignTaskDTO">
+ SELECT t1.id as caseTaskId, t1.case_id as caseId
+ FROM
+ dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ where
+ t2.delete_status = 0
+ and t1.status = '1'
+ <include refid="myTaskQs-where-part"/>
+ </select>
+
<!-- 工作台-待/已受理条件查询-条件 -->
<sql id="myTaskSl-where-part">
@@ -553,6 +564,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
<include refid="myTaskSl-where-part"/>
</select>
<!-- 首页-待/已受理分页查询 -->
@@ -568,6 +580,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
<include refid="myTaskSl-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -580,45 +593,56 @@
limit #{page.offset}, #{page.size}
</select>
+
+ <!-- 工作台-办理中条件查询-条件 -->
+ <sql id="myTaskBlz-where-part">
+ <if test="terms != null">
+ <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>
+ <if test="terms.caseTaskType != null and terms.caseTaskType !=''">
+ and t1.case_task_type = #{terms.caseTaskType}
+ </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}
+ and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
+ </if>
+ <if test="terms.partyName != null and terms.partyName !=''">
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ </if>
+ </if>
+ </sql>
<!-- 首页-办理中条件统计 -->
- <select id="countMyTaskProcessing" resultType="java.lang.Long">
+ <select id="countMyTaskBlz" resultType="java.lang.Long">
select
COUNT(t1.id)
from
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ left join dyh_case_info_unfold t3 on t1.case_id = t3.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and t1.node_id = 'BLFK'
- and t2.delete_status = 0
+ t1.node_id = 'BLFK'
and t1.status = 1
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- 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}, '%')
- </if>
+ and t2.delete_status = 0
+ <include refid="myTaskBlz-where-part"/>
</select>
<!-- 首页-办理中分页查询 -->
- <select id="pageMyTaskProcessing" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as ownerId, t1.case_id as caseId,
- 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
+ <select id="pageMyTaskBlz" resultType="cn.huge.module.cases.domain.dto.FrontPageListBLZDTO">
+ SELECT
+ t1.id as ownerId, t1.case_id as caseId, t1.create_time as turnaroundTime, t2.case_level as caseGrade,
+ t2.canal_name as caseSource, t2.case_type_name as caseType, t3.mediator as mediator,
+ t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ left join dyh_case_info_unfold t3 on t1.case_id = t3.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and t1.node_id = 'BLFK'
- and t2.delete_status = 0
+ t1.node_id = 'BLFK'
and t1.status = 1
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- 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}, '%')
- </if>
+ and t2.delete_status = 0
+ <include refid="myTaskBlz-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
isnull(${s.property}), ${s.property} ${s.direction}
@@ -632,37 +656,86 @@
<!-- 首页-待审核-我申请的条件统计 -->
<select id="countMyTaskShWSQD" resultType="java.lang.Long">
- select
- COUNT(t1.id)
+ select sum(t1.count)
from
- 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_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
- and t2.delete_status = 0
- and t1.sign_status != 1
- and t1.status = #{terms.status}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- 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}, '%')
- </if>
+ (
+ SELECT count(1) as count, case_id as caseId
+ FROM dyh_case_return
+ WHERE return_unit_id = #{terms.applyUnitId}
+ union all
+ SELECT count(1) as count, case_id as caseId
+ FROM dyh_case_windup_apply
+ WHERE apply_unit_id = #{terms.applyUnitId}
+ union all
+ SELECT count(1) as count, case_id as caseId
+ FROM dyh_case_appear
+ WHERE appear_unit_id = #{terms.applyUnitId}
+ union all
+ SELECT count(1) as count, case_id as caseId
+ FROM dyh_case_assist_apply
+ WHERE apply_unit_id = #{terms.applyUnitId}
+ )t1 left join dyh_case_info t2 on t1.caseId = t2.id
+ <where>
+ <if test="terms.applyType != null and terms.applyType !=''">
+ and t1.applyType = #{terms.applyType}
+ </if>
+ <if test="terms.auditStatus != null and terms.auditStatus !=''">
+ and t1.audit_result = #{terms.auditResult}
+ </if>
+ <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
+ and (DATE_FORMAT(t1.turnaroundTime,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
+ and DATE_FORMAT(t1.turnaroundTime,'%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}, '%')
+ </if>
+ </where>
</select>
<!-- 首页-待审核-我申请的分页查询 -->
- <select id="pageMyTaskShWSQD" resultMap="MyTaskApplyReviewResult">
- select caseId as caseId, return_time as turnaroundTime, '回退' as applyType, audit_unit_name as auditDept,
- return_status as applyStatus, audit_result_name as 'mediResult'
-
-
+ <select id="pageMyTaskShWSQD" resultType="cn.huge.module.cases.domain.dto.FrontPageListWSQDDTO">
+ select t1.*,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
+ (
+ SELECT case_id as caseId, id as ownerId, return_time as turnaroundTime, '回退' as applyType,
+ audit_unit_name as auditUnit, return_status as auditStatus, audit_result_name as auditResult,
+ audit_time as auditTime, create_time, audit_result
+ FROM dyh_case_return
+ WHERE return_unit_id = #{terms.applyUnitId}
+ union all
+ SELECT case_id as caseId, id as ownerId, apply_time as turnaroundTime, '结案' as applyType,
+ audit_unit_name as auditUnit, apply_status as auditStatus, audit_result_name as auditResult,
+ audit_time as auditTime, create_time, audit_result
+ FROM dyh_case_windup_apply
+ WHERE apply_unit_id = #{terms.applyUnitId}
+ union all
+ SELECT case_id as caseId, id as ownerId, appear_time as turnaroundTime, '上报' as applyType,
+ audit_unit_name as auditUnit, apply_status as auditStatus, audit_result_name as auditResult,
+ audit_time as auditTime, create_time, audit_result
+ FROM dyh_case_appear
+ WHERE appear_unit_id = #{terms.applyUnitId}
+ union all
+ SELECT case_id as caseId, id as ownerId, apply_time as turnaroundTime, '联合处置' as applyType,
+ audit_unit_name as auditUnit, apply_status as auditStatus, audit_result_name as auditStatus,
+ audit_time as auditTime, create_time, audit_result
+ FROM dyh_case_assist_apply
+ WHERE apply_unit_id = #{terms.applyUnitId}
+ )t1 left join dyh_case_info t2 on t1.caseId = t2.id
+ <where>
+ <if test="terms.applyType != null and terms.applyType !=''">
+ and t1.applyType = #{terms.applyType}
+ </if>
+ <if test="terms.auditStatus != null and terms.auditStatus !=''">
+ and t1.audit_result = #{terms.auditResult}
+ </if>
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
+ and (DATE_FORMAT(t1.turnaroundTime,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
+ and DATE_FORMAT(t1.turnaroundTime,'%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}, '%')
</if>
+ </where>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
isnull(${s.property}), ${s.property} ${s.direction}
--
Gitblit v1.8.0