diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 1aa0281..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)
@@ -644,12 +651,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('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 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}
@@ -804,12 +805,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('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 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}