From 8a87336ca8f99ccb79c8eeb3e3796c2e41d207e7 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:07 +0800
Subject: [PATCH] 1、流程督办，当时人评价节点优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 131 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 36 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 3bee051..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
@@ -365,7 +365,7 @@
select
count(case when (node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP' or node_id = '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_DSL' or node_id = 'SJ_DSL' or node_id = 'DSL') and sign_status != 1 then id end) as waitAccept,
+ count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL' or node_id = 'DSL') and sign_status != 1 and (handle_result != 3 or handle_result is null) then id end) as waitAccept,
count(case when node_id = 'BLFK' then id end) as Processing
from
<include refid="table-name" />
@@ -375,29 +375,6 @@
and status = 1
</select>
- <!-- 首页-待办理结果集 -->
- <resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
- <result property="ownerId" column="ownerId"/>
- <result property="caseId" column="caseId"/>
- <result property="turnaroundTime" column="turnaroundTime"/>
- <result property="timeLimit" column="timeLimit"/>
- <result property="caseGrade" column="caseGrade"/>
- <result property="caseSource" column="caseSource"/>
- <result property="caseType" column="caseType"/>
- <result property="plaintiffs" column="plaintiffs"/>
- <result property="defendants" column="defendants"/>
- <result property="processingDays" column="processingDays"/>
- <result property="mediResult" column="mediResult"/>
- <result property="organizingUnit" column="organizingUnit"/>
- <result property="cooperatingUnit" column="cooperatingUnit"/>
- <result property="manager" column="manager"/>
- <result property="mediResult" column="mediResult"/>
- <result property="backUnit" column="backUnit"/>
- <result property="reason" column="reason"/>
- <result property="opinion" column="opinion"/>
- <result property="process" column="process"/>
- </resultMap>
-
<!-- 工作台-待/已分派条件查询-条件 -->
<sql id="myTaskFp-where-part">
@@ -405,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}
@@ -430,14 +407,16 @@
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>
<!-- 工作台-待分派分页查询 -->
<select id="pageMyTaskFp" resultType="cn.huge.module.cases.domain.dto.FrontPageListFPDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t1.handle_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
concat(t2.que_area_name, t2.que_road_name) as queAddress,
concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
@@ -446,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 ">
@@ -466,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}
@@ -491,13 +472,14 @@
where
t2.delete_status = 0
and t1.status = '1'
+ and t1.sign_status = #{terms.signStatus}
<include refid="myTaskQs-where-part"/>
</select>
<!-- 首页-待/已签收分页查询 -->
<select id="pageMyTaskQs" resultType="cn.huge.module.cases.domain.dto.FrontPageListQSDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.sign_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
@@ -505,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 ">
@@ -535,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}
@@ -564,13 +547,15 @@
(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 or t1.handle_result is null)
+ and t1.status = #{terms.status}
<include refid="myTaskSl-where-part"/>
</select>
<!-- 首页-待/已受理分页查询 -->
<select id="pageMyTaskSl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.handle_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
@@ -579,6 +564,8 @@
(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 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 ">
@@ -630,9 +617,10 @@
<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,
+ t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,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
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ (select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
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
@@ -691,7 +679,7 @@
</select>
<!-- 首页-待审核-我申请的分页查询 -->
<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,
+ select t1.*,t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
from
(
@@ -745,4 +733,75 @@
limit #{page.offset}, #{page.size}
</select>
+
+ <!-- web端-工作台-已办事项条件查询-条件 -->
+ <sql id="myTaskYb-where-part">
+ <if test="terms != null">
+ <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.handleTimeStart != null and terms.handleTimeStart !='' and terms.handleTimeEnd != null and terms.handleTimeEnd !=''">
+ and (DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.handleTimeStart}
+ and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
+ </if>
+ <if test="terms.mediator != null and terms.mediator !=''">
+ and t3.mediator like concat('%', #{terms.mediator}, '%')
+ </if>
+ <if test="terms.canal != null and terms.canal !=''">
+ and t2.canal = #{terms.canal}
+ </if>
+ <if test="terms.mediResult != null and terms.mediResult !=''">
+ and t3.medi_result = #{terms.mediResult}
+ </if>
+ <if test="terms.caseLevel != null and terms.caseLevel !=''">
+ and t2.case_level = #{terms.caseLevel}
+ </if>
+ <if test="terms.caseType != null and terms.caseType !=''">
+ and t2.case_type = #{terms.caseType}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and t2.status = #{terms.status}
+ </if>
+ </if>
+ </sql>
+ <!-- web端-工作台-已办事项条件统计 -->
+ <select id="countMyTaskYb" resultType="java.lang.Long">
+ SELECT count(DISTINCT t2.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.status = 2
+ and t1.node_id = 'BLFK'
+ and t1.handle_unit_id = #{terms.handleUnitId}
+ and t2.delete_status = 0
+ <include refid="myTaskYb-where-part"/>
+ </select>
+ <!-- web端-工作台-已办事项分页查询 -->
+ <select id="pageMyTaskYb" resultType="cn.huge.module.cases.domain.dto.FrontPageListYBDTO">
+ SELECT t1.id as caseTaskId, t2.id as caseId, t1.create_time as createTime, t2.status_name as statusName,
+ t3.medi_result as mediResult, t3.medi_result_name as mediResultName, t3.mediator as mediator,
+ t1.handle_time as handleTime, t2.case_level as caseLevel, t2.canal_name as canalName,
+ concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
+ (select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
+ 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.status = 2
+ and t1.node_id = 'BLFK'
+ and t1.handle_unit_id = #{terms.handleUnitId}
+ and t2.delete_status = 0
+ <include refid="myTaskYb-where-part"/>
+ group by t2.id
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(t1.create_time), t1.create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0