From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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 ab727a8..3038f5f 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
@@ -299,6 +299,8 @@
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
<result property="process" column="process"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核条件统计 -->
@@ -321,10 +323,10 @@
</select>
<!-- 首页-待审核分页查询 -->
<select id="listMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
+ 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,
- t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
+ 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
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -394,7 +396,7 @@
<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, t2.case_type_name as caseType,
+ t1.audit_unit_name as auditUnit, 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 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(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
--
Gitblit v1.8.0