From eb13a764afa6bf7c7617c98c7b6b1d898e99acb0 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 23 Sep 2024 10:07:15 +0800
Subject: [PATCH] 已办事项-查询条件

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 cbc95ef..b2f6335 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
@@ -324,7 +324,7 @@
         SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
         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
@@ -360,9 +360,6 @@
             <if test="terms.assistUnitId != null and terms.assistUnitId !=''">
                 and t3.assist_unit_id like concat('%', #{terms.assistUnitId}, '%')
             </if>
-            <if test="terms.applyStatus != null and terms.applyStatus !=''">
-                and t1.apply_status = #{terms.applyStatus}
-            </if>
             <if test="terms.auditResult != null and terms.auditResult !=''">
                 and t1.audit_result = #{terms.auditResult}
             </if>
@@ -381,8 +378,10 @@
         COUNT(t1.id)
         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
         where
-        t2.delete_status = 0
+        t1.apply_status = #{terms.applyStatus}
+        and t2.delete_status = 0
         <include refid="mySubmitApplyReview-where-part"/>
     </select>
     <!--  首页-结案申请/已结案分页查询  -->
@@ -395,7 +394,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
@@ -403,7 +402,8 @@
         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
         where
-        t2.delete_status = 0
+        t1.apply_status = #{terms.applyStatus}
+        and t2.delete_status = 0
         <include refid="mySubmitApplyReview-where-part"/>
         <if test="page.sort != null">
             <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">

--
Gitblit v1.8.0