From eb690f53d6b300018b890e441853387ca912391c Mon Sep 17 00:00:00 2001
From: ningbo <3301955438@qq.com>
Date: Tue, 19 Aug 2025 22:59:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(performance):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E7=AE=A1=E7=90=86=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增学务初审、书记审核、科室复核和学工处长终审的待办查询
- 在现有的绩效查询基础上增加了成果绩效的统计
- 通过联合查询和条件筛选，实现了对不同审核阶段的待办任务计数
---
 .../comprehensive/CphGoodApplyMapper.xml       | 18 ++++++++++++++++++
 1 file changed, 18 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..f4cda59 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}
+#         宁博-辅导员管理--成果绩效----(第1步：学务初审)
+        union
+        select concat('cg-',count(a.check_id)) as `all`
+        from sys_teacher_achievementcheck as a
+        left join sys_user as b on a.teacher_id = b.user_name
+        where a.check_status = 1 and b.dept_id = #{id}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -756,6 +762,12 @@
         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) -- 学工处长待办
+#         宁博-辅导员管理--成果绩效----待办 (第3步：科室复核 和 第4步：学工处长终审)
+        union
+        select concat('cg-',count(a.check_id)) as `all`
+        from sys_teacher_achievementcheck as a
+        left join sys_user as b on a.teacher_id = b.user_name
+        where a.check_status in (3, 4)
     </select>
 
 
@@ -791,6 +803,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}
+#         宁博-辅导员管理--成果绩效----待办 (第2步：书记审核)
+        union
+        select concat('cg-',count(a.check_id)) as `all`
+        from sys_teacher_achievementcheck as a
+        left join sys_user as b on a.teacher_id = b.user_name
+        where a.check_status = 2 and b.dept_id = #{id}
     </select>
 
 

From 983c06e603f672243f3af5a0c723e5bf6cddec5d Mon Sep 17 00:00:00 2001
From: ningbo <3301955438@qq.com>
Date: Tue, 19 Aug 2025 23:47:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=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    | 14 ++++++++------
 1 file changed, 8 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 f4cda59..c4dd0d7 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -528,6 +528,12 @@
         select concat('zsg-',count(a.id)) as `all`
         from knzz_zsg_apply as a
         where a.apply_status = 3
+        #         宁博-辅导员管理--成果绩效----待办 (第3步：科室复核 和 第4步：学工处长终审)
+        union
+        select concat('cg-',count(a.check_id)) as `all`
+        from sys_teacher_achievementcheck as a
+        left join sys_user as b on a.teacher_id = b.user_name
+        where a.check_status in (3, 4)
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -559,6 +565,7 @@
         select concat('knzz-',count(a.id)) as `all`
         from knzz_tufa_apply as a
         where a.apply_status = 6 and a.stu_no = #{stuNo}
+
     </select>
 
 
@@ -762,12 +769,7 @@
         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) -- 学工处长待办
-#         宁博-辅导员管理--成果绩效----待办 (第3步：科室复核 和 第4步：学工处长终审)
-        union
-        select concat('cg-',count(a.check_id)) as `all`
-        from sys_teacher_achievementcheck as a
-        left join sys_user as b on a.teacher_id = b.user_name
-        where a.check_status in (3, 4)
+
     </select>