Merge remote-tracking branch 'origin/main'

This commit is contained in:
MDSMO
2025-08-27 15:36:59 +08:00
18 changed files with 517 additions and 93 deletions

View File

@@ -528,18 +528,6 @@
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)
-- 陈冠元 辅导员业绩考核-科室复核待办-学工处长审核待办
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">
@@ -786,7 +774,7 @@
select concat('zsfy-',count(a.id)) as `all`
from dms_new_record as a
left join view_dms_record as d on a.stu_no = d.stu_no
where d.employee_id = #{tNo} and a.apply_status = 6
where d.employee_id = #{tNo} and a.apply_status = 6 and a.apply_status = 1
</select>

View File

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 班级信息 -->
<select id="selectDeptByDeptCodes" parameterType="String" resultType="com.srs.comprehensive.domain.SrsClass">
SELECT DISTINCT v.class_id,v.class_name
FROM srs_dev.view_stu_info v
FROM view_stu_info v
JOIN srs_class c ON v.teacher_id = c.teacher_id
WHERE v.t_no = #{userName}
</select>