From 051effad5a4885f28c4ead26e8e8c0da1b3d91d2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 21 Oct 2024 21:32:45 +0800
Subject: [PATCH] 1、工作视窗报错修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml | 4 ++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml | 4 ++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml | 4 ++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml | 4 ++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 22 +++++++++++-----------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 6 +++---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
index 4a5b55b..d942978 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
@@ -305,8 +305,8 @@
<select id="pageMyTaskAppearReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.appear_time as turnaroundTime, t1.appear_unit_name as organizingUnit, t1.appear_content as opinion,
- 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
+ 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, '')) as plaintiffs, concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_appear t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
index b9f8867..04913e0 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
@@ -311,8 +311,8 @@
<select id="pageMyTaskAssistReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.id as ownerId, t1.case_id as CaseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.apply_assist_unit_name as cooperatingUnit,
- t1.apply_content as reason,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
+ t1.apply_content as reason,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, '')) as plaintiffs, concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_assist_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
index f09782e..204e99d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
@@ -210,8 +210,8 @@
<select id="pageMyTaskBysl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
t1.case_task_time as turnaroundTime, t1.dis_time as taskHandleTime,
- 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,
+ 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, '')) as plaintiffs, 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_dismiss t1 left join dyh_case_info t2 on t1.case_id = t2.id
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
index 6d31011..5ea11cb 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
@@ -312,8 +312,8 @@
<select id="pageMyTaskReturnReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.return_time as turnaroundTime, t1.return_unit_name as organizingUnit, t1.return_content as reason,
- 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
+ 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, '')) as plaintiffs, concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_return t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
index 37ff3eb..fb4751c 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
@@ -327,7 +327,7 @@
SELECT t1.id as ownerId, t1.case_id as caseId, t1.reply_content as content, t1.sup_status as applyStatus, t1.reply_time as replyTime,
t1.sup_time as turnaroundTime, DATEADD(hour, t1.reply_term, t1.sup_time) as timeLimit, t1.sup_unit_name as organizingUnit,
t1.sup_content as opinion, 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.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '')) as caseType, concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs,
concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
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 822143f..32e04b0 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
@@ -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_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(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_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs, 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
@@ -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_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,
+ 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, '')) as plaintiffs, 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
@@ -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_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,
+ 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, '')) as plaintiffs, 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
@@ -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_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(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_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs, 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
@@ -694,8 +694,8 @@
</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_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 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, '')) as plaintiffs, 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,
@@ -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_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(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
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
index 76dad9b..fa30602 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -344,7 +344,7 @@
SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,
t1.fail_reason as reason, 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.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '')) as caseType, concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs,
concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -414,10 +414,10 @@
<if test="terms.applyStatus == 1">
t1.audit_time as turnaroundTime,
</if>
- t1.audit_unit_name as auditUnit, 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,
+ t1.audit_unit_name as auditUnit, 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,
t3.mediator as manager, t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
t1.medi_result as mediResult, t1.medi_result_name as mediResultName, t2.status_name as caseStatusName,
- concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs, concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
left join dyh_case_info_unfold t3 on t3.id = t2.id
--
Gitblit v1.8.0