From 2f09f4719493c58b8eeed3a16497fdc19358833b Mon Sep 17 00:00:00 2001
From: ningbo <3301955438@qq.com>
Date: Sun, 17 Aug 2025 22:32:30 +0800
Subject: [PATCH] =?UTF-8?q?CphGoodApplyMapper.xml=20=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=9B=BD=E5=AE=B6=E5=8A=B1=E5=BF=97=E5=A5=96?=
 =?UTF-8?q?=E5=AD=A6=E9=87=91=E7=9A=84=E5=AE=A1=E6=A0=B8=E4=BB=A3=E5=8A=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20-=20=E5=8C=85=E6=8B=AC=E5=AD=A6=E5=B7=A5?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E5=AD=A6=E5=8A=A1=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=92=8C=E8=BE=85=E5=AF=BC=E5=91=98=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=BE=85=E5=AF=BC=E5=91=98=E5=AD=A6=E7=94=9F=E8=BF=94?=
 =?UTF-8?q?=E6=A0=A1=E5=BE=85=E5=AE=A1=E6=A0=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comprehensive/CphGoodApplyMapper.xml      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 90e53a2..127dcc5 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -496,6 +496,12 @@
         select concat('knzz-',count(a.id)) as `all`
         from knzz_tufa_apply as a
         where a.apply_status = 1
+        /*宁博  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
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -580,6 +586,12 @@
         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}
+        /*宁博  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}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -638,6 +650,18 @@
         from sur_itinerary as a
         left join view_stu_info as b on a.stu_no = b.stu_no
         where a.leave_status = 1 and b.t_no = #{tNo}
+        /*宁博 10、假期去向-学生返校-辅导员审核代办*/
+        union
+        select concat('return-',count(a.return_school_id)) as `all`
+        from sur_itinerary as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.status = '1' and b.t_no = #{tNo}
+        /*宁博  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.t_no = #{tNo}
     </select>