From e17a4aae66580428443ae8a4e26c7cc267ecd543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=A5=E6=97=A0=E6=B6=AF?= <2637171921@qq.com>
Date: Tue, 19 Aug 2025 10:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BA=E5=AF=BC=E5=91=98=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=20=20=E4=B8=AD=E8=81=8C=E5=8D=87=E9=AB=98?=
 =?UTF-8?q?=E8=81=8C=E5=9B=B0=E9=9A=BE=E5=AD=A6=E7=94=9F=E5=AD=A6=E8=B4=B9?=
 =?UTF-8?q?=E8=A1=A5=E5=8A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comprehensive/CphGoodApplyMapper.xml      | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 9d73551..24d8cdb 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
+        <!-- 知无涯 "中职升高职" 学校终审  -->
+        union
+        select concat('zsg-',count(a.id)) as `all`
+        from knzz_zsg_apply as a
+        where a.apply_status = 3
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -613,6 +618,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 = 2 and b.dept_id = #{id}
+        <!-- 知无涯"中职升高职" 学务审核  -->
+        union
+        select concat('jx-',count(a.id)) as `all`
+        from sys_performance as a
+        left join sys_user as b on a.credit_pass = b.user_name
+        where a.xwstatus IS NULL and b.dept_id = #{id}
+        <!--  知无涯"铺导员综合绩效"  (第1步：学务初审)  -->
+        union
+        select concat('jx-',count(a.id)) as `all`
+        from sys_performance as a
+        left join sys_user as b on a.credit_pass = b.user_name
+        where a.xwstatus IS NULL and b.dept_id = #{id}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -700,6 +717,18 @@
         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('zsg-',count(a.id)) as `all`
+        from knzz_zsg_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}
+        <!--知无涯 "铺导员综合绩效" 待办 (第3步：科室复核 和 第4步：学工处长终审)  -->
+        union
+        select concat('jx-',count(a.id)) as `all`
+        from sys_performance as a
+        where (a.shstatus IS NOT NULL and a.ksstatus IS NULL) -- 科室复核待办
+        or (a.ksstatus IS NOT NULL and a.xgstatus IS NULL) -- 学工处长待办
     </select>
 
 
@@ -723,13 +752,12 @@
                                      LEFT JOIN sys_menu m on rm.menu_id = m.menu_id
                 where r.role_key ='Junior_college_leader'
             )
-<!--            知无涯 书记困难资助-->
+        <!-- 知无涯  "铺导员综合绩效"  (第2步：书记审核)  -->
         union
-        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}
-
+        select concat('jx-',count(a.id)) as `all`
+        from sys_performance as a
+        left join sys_user as b on a.credit_pass = b.user_name
+        where a.xwstatus IS NOT NULL and a.shstatus IS NULL and b.dept_id = #{id}
     </select>
 
 </mapper>