From b4d23d40c6ba77b028538ccebf8b757b5491aa90 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 10:33:11 +0800
Subject: [PATCH] 1、流程bug修复

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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..ab727a8 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
@@ -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>
     <!--  首页-结案申请/已结案分页查询  -->
@@ -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