辅导员管理-业绩考核----学务审核代办-----学院书记代办----科室复核代办---学工处长审核代办

# Conflicts:
#	srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml

srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml

@@ -534,6 +534,12 @@
         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)
+        -- 陈冠元 辅导员业绩考核-科室复核待办-学工处长审核待办
+        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>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -657,6 +663,12 @@
         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}
+        -- 陈冠元 辅导员业绩考核-学务审核待办
+        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">
@@ -769,7 +781,6 @@
         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>
 
 
@@ -811,6 +822,12 @@
         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}
+        -- 陈冠元 辅导员业绩考核-学院书记待办
+        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>