From b43c9c2b291fcc35050b331e316140e35a5729d6 Mon Sep 17 00:00:00 2001
From: firefly <1633489380@qq.com>
Date: Mon, 18 Aug 2025 18:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=B0=E9=9A=BE=E8=B5=84=E5=8A=A9-=E8=87=AA?=
 =?UTF-8?q?=E6=B2=BB=E5=8C=BA=E4=BA=BA=E6=B0=91=E6=94=BF=E5=BA=9C=E5=A5=96?=
 =?UTF-8?q?=E5=AD=A6=E9=87=91-=E8=BE=85=E5=AF=BC=E5=91=98=E4=BB=A3?=
 =?UTF-8?q?=E5=8A=9E-----=E5=AD=A6=E9=99=A2=E4=BB=A3=E5=8A=9E---=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E5=AE=A1=E6=A0=B8=E4=BB=A3=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comprehensive/CphGoodApplyMapper.xml      | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 127dcc5..14134d1 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -495,13 +495,19 @@
         union
         select concat('knzz-',count(a.id)) as `all`
         from knzz_tufa_apply as a
-        where a.apply_status = 1
+        where a.apply_status = 3
         /*宁博  6、困难资助-国家励志奖学金-学工审核代办*/
         union
         select concat('knzzgl-',count(a.id)) as `all`
         from knzz_gl_apply as a
         left join view_stu_info as b on a.stu_no = b.stu_no
-        where a.apply_status = 1
+        where a.apply_status = 3
+        -- 陈冠元 困难资助-自治区人民政府奖学金-学工审核代办
+        union
+        select concat('knzzzzq-',count(a.id)) as `all`
+        from knzz_zzq_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 3
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -585,13 +591,19 @@
         select concat('knzz-',count(a.id)) as `all`
         from knzz_tufa_apply as a
         left join view_stu_info as b on a.stu_no = b.stu_no
-        where a.apply_status = 1 and b.dept_id = #{id}
+        where a.apply_status = 2 and b.dept_id = #{id}
         /*宁博  6、困难资助-国家励志奖学金-学务审核代办*/
         union
         select concat('knzzgl-',count(a.id)) as `all`
         from knzz_gl_apply as a
         left join view_stu_info as b on a.stu_no = b.stu_no
-        where a.apply_status = 1 and b.dept_id = #{id}
+        where a.apply_status = 2 and b.dept_id = #{id}
+        -- 陈冠元 困难资助-自治区人民政府奖学金-学校审核代办
+        union
+        select concat('knzzzzq-',count(a.id)) as `all`
+        from knzz_zzq_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 2 and b.dept_id = #{id}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -662,6 +674,12 @@
         from knzz_gl_apply as a
         left join view_stu_info as b on a.stu_no = b.stu_no
         where a.apply_status = 1 and b.t_no = #{tNo}
+        -- 陈冠元 困难资助-自治区人民政府奖学金-辅导员审核代办
+        union
+        select concat('knzzzzq-',count(a.id)) as `all`
+        from knzz_zzq_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 1 and b.dept_id = #{id}
     </select>