xgxt_sd/zhxg_java
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_java

Browse Source 
# Conflicts:
#	srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
This commit is contained in:
firefly
2025-08-20 00:15:54 +08:00
parent 5c401f12d9 983c06e603
commit 9cb10756c0
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
View File

@@ -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>
@@ -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}
</select>
<select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -762,12 +769,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) -- 学工处长待办
-- 陈冠元 辅导员业绩考核-科室复核待办-学工处长审核待办
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>
@@ -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}
</select>