From 21f45258cfcdc79127f85ad6e45736cff5acd345 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 21 Oct 2024 20:58:05 +0800
Subject: [PATCH] 1、数据割接程序，白云区矛盾纠纷多元化解平台 2、纠纷态势报错修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 68b8150..822143f 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
@@ -408,7 +408,7 @@
and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
</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_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="terms.status == 2">
and t1.handle_result in (0, 1, 2)
@@ -433,9 +433,9 @@
<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, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(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,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(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
@@ -476,7 +476,7 @@
and DATE_FORMAT(t1.sign_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.signTimeEnd})
</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_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -496,8 +496,8 @@
<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, 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,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(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
@@ -550,7 +550,7 @@
and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
</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_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -571,8 +571,8 @@
<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, 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,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(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
@@ -611,7 +611,7 @@
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}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -632,9 +632,9 @@
<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, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType, t3.mediator as mediator,
+ t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(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_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(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
@@ -688,14 +688,14 @@
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}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</where>
</select>
<!-- 首页-待审核-我申请的分页查询 -->
<select id="pageMyTaskShWSQD" resultType="cn.huge.module.cases.domain.dto.FrontPageListWSQDDTO">
- 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
+ select t1.*,t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
from
(
SELECT case_id as caseId, id as ownerId, return_time as turnaroundTime, '回退' as applyType,
@@ -734,7 +734,7 @@
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}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</where>
<if test="page.sort != null">
@@ -796,7 +796,7 @@
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,
+ concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(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
--
Gitblit v1.8.0