From eb11769e087326c8bd80332eb2a2c284089fa290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E?= <3154396966@qq.com>
Date: Tue, 19 Aug 2025 10:25:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E7=B4=A0=E8=B4=A8-?=
 =?UTF-8?q?=E7=BB=BC=E5=90=88=E7=B4=A0=E8=B4=A8=E7=94=B3=E8=AF=B7=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E5=8A=9E=E5=92=8C=E5=AD=A6=E7=94=9F=E5=A5=96?=
 =?UTF-8?q?=E6=83=A9-=E5=85=88=E8=BF=9B=E7=8F=AD=E9=9B=86=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 9d73551..85b663c 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -517,6 +517,11 @@
         select concat('zxzm-',count(a.id)) as `all`
         from rt_stu_at_school as a
         where a.xgstatus = 0
+        /*庞世斌  4、学生奖惩-先进班集体-学工审核代办*/
+        union
+        select concat('xjbjt-',count(a.id)) as `all`
+        from cph_new_good_class_apply as a
+        WHERE a.apply_status = 3
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -613,6 +618,16 @@
         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}
+        /*庞世斌  4、学生奖惩-先进班集体-学务审核代办*/
+        union
+        select concat('xjbjt-',count(a.id)) as `all`
+        from cph_new_good_class_apply as a
+        left join srs_class as c on a.class_id = c.class_id
+        left join srs_majors as e on c.major_id = e.major_id
+        left join sys_dept as f on e.college_id = f.dept_id
+        WHERE a.apply_status = 2 and f.dept_id = #{id}
+
+
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -700,6 +715,19 @@
         from rt_stu_at_school as a
         left join view_stu_info as d on a.student_id = d.stu_no
         where  d.t_no = #{tNo} and a.status = 0
+        /* 庞世斌 学生奖惩-先进班集体-辅导员审核代办*/
+        union
+        select concat('xjbjt-',count(a.id)) as `all`
+        from cph_new_good_class_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        WHERE b.t_no = #{tNo} and a.apply_status = 1
+        /*庞世斌 3、综合素质-综合素质申请审核代办*/
+        union
+        select concat('zhsz-',count(a.id)) as `all`
+        from cph_audit_details a
+        left join view_stu_info as b on a.submitter_id = b.stu_id
+        WHERE status_code = 1 and t_no=#{tNo}
+
     </select>
 
 

From f0cdc12d7ee511d7f3ddeaa320deab1897bdec14 Mon Sep 17 00:00:00 2001
From: s1431_z_w <15596413+s1431zw@user.noreply.gitee.com>
Date: Tue, 19 Aug 2025 10:38:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=81=E8=A1=A5?=
 =?UTF-8?q?=E5=8A=9E=E5=92=8C=E5=9C=A8=E6=A0=A1=E8=AF=81=E6=98=8E=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/comprehensive/CphGoodApplyMapper.xml        | 10 ++++++----
 1 file changed, 6 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 85b663c..8944c8b 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -508,15 +508,16 @@
         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
-        -- 绍征文
+        -- 邵政文-(日常事务-学生证补办-辅导员审核-学工审核)
         union
         select concat('xszb-',count(a.id)) as `all`
         from rt_stu_id_reissue as a
         where a.inspection_progress = 1
+        -- 邵政文-(日常事务-在校证明申请-辅导员审核-学工审核)
         union
         select concat('zxzm-',count(a.id)) as `all`
         from rt_stu_at_school as a
-        where a.xgstatus = 0
+        where a.xgstatus = 0 or a.xgstatus is null
         /*庞世斌  4、学生奖惩-先进班集体-学工审核代办*/
         union
         select concat('xjbjt-',count(a.id)) as `all`
@@ -704,17 +705,18 @@
         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.t_no = #{tNo}
-        -- 绍征文
+        -- 邵政文-(日常事务-学生证补办-辅导员审核-学工审核)
         union
         select concat('xszb-',count(a.id)) as `all`
         from rt_stu_id_reissue as a
         left join view_stu_info as b on a.stu_no = b.stu_no
         where  b.t_no = #{tNo} and a.inspection_progress = 0
+        -- 邵政文-(日常事务-在校证明申请-辅导员审核-学工审核)
         union
         select concat('zxzm-',count(a.id)) as `all`
         from rt_stu_at_school as a
         left join view_stu_info as d on a.student_id = d.stu_no
-        where  d.t_no = #{tNo} and a.status = 0
+        where  d.t_no = #{tNo} and (a.status = 0 or a.status is null)
         /* 庞世斌 学生奖惩-先进班集体-辅导员审核代办*/
         union
         select concat('xjbjt-',count(a.id)) as `all`