From 5c401f12d9c4d4040d15db61bfa8047cda378cad Mon Sep 17 00:00:00 2001
From: firefly <1633489380@qq.com>
Date: Wed, 20 Aug 2025 00:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E8=80=83=E6=A0=B8----=E5=AD=A6=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BB=A3=E5=8A=9E-----=E5=AD=A6=E9=99=A2?=
 =?UTF-8?q?=E4=B9=A6=E8=AE=B0=E4=BB=A3=E5=8A=9E----=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E4=BB=A3=E5=8A=9E---=E5=AD=A6=E5=B7=A5?=
 =?UTF-8?q?=E5=A4=84=E9=95=BF=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      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 306231b..1aa0281 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -644,6 +644,12 @@
         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}
+        -- 陈冠元 辅导员业绩考核-学务审核待办
+        union
+        select concat('yj-',count(a.id)) as `all`
+        from sys_teacher_kpi_filling as a
+        left join sys_user as b on a.job_number = b.user_name
+        where a.role_audit = 1 and b.dept_id = #{id}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -756,6 +762,13 @@
         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) -- 学工处长待办
+        -- 陈冠元 辅导员业绩考核-科室复核待办-学工处长审核待办
+        union
+        select concat('yj-',count(a.id)) as `all`
+        from sys_teacher_kpi_filling as a
+        left join sys_user as b on a.job_number = b.user_name
+        where a.role_audit in (3, 4)
+
     </select>
 
 
@@ -791,6 +804,12 @@
         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}
+        -- 陈冠元 辅导员业绩考核-学院书记待办
+        union
+        select concat('yj-',count(a.id)) as `all`
+        from sys_teacher_kpi_filling as a
+        left join sys_user as b on a.job_number = b.user_name
+        where a.role_audit = 2 and b.dept_id = #{id}
     </select>