zhaichao/education
1
0
Fork 0
forked from liweijie/education
Code Pull Requests Activity

1、校历的78、晚上、夜间等直接落库，

Browse Source 
2、配当、任务书完善、排课窗完善；
3、任务书批量发布、删除等；
4、班历同步校历
This commit is contained in:
liweijie
2026-09-18 10:38:39 +08:00
parent 911dfe911b
commit f3ae9fb2fd
62 changed files with 3508 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KcbTimetableMapper.xml
+82
View File
@@ -25,6 +25,44 @@
AND cxf."学期第次" = #{cond.xqdc}
)
</if>
<if test="cond != null and cond.jybh != null and cond.jybh != ''">
AND (
c."教员编号" = #{cond.jybh}
OR c."责任教员编号" = #{cond.jybh}
OR EXISTS (
SELECT 1 FROM "实施_课程表_辅助教员" f2
WHERE f2."实施_课程表编号" = s."编号"
AND f2."辅助教员编号" = #{cond.jybh}
)
)
</if>
<if test="cond != null and cond.jybhs != null and cond.jybhs.size() > 0">
AND (
c."教员编号" IN
<foreach collection="cond.jybhs" item="j" open="(" separator="," close=")">#{j}</foreach>
OR c."责任教员编号" IN
<foreach collection="cond.jybhs" item="j" open="(" separator="," close=")">#{j}</foreach>
OR EXISTS (
SELECT 1 FROM "实施_课程表_辅助教员" f3
WHERE f3."实施_课程表编号" = s."编号"
AND f3."辅助教员编号" IN
<foreach collection="cond.jybhs" item="j" open="(" separator="," close=")">#{j}</foreach>
)
)
</if>
<if test="cond != null and cond.jsbh != null and cond.jsbh != ''">
AND (
c."教室编号" = #{cond.jsbh}
OR EXISTS (
SELECT 1 FROM "实施_课程表_教室" j2
WHERE j2."实施_课程表编号" = s."编号"
AND j2."教室编号" = #{cond.jsbh}
)
)
</if>
<if test="cond != null and cond.jysdh != null and cond.jysdh != ''">
AND k."教研室代号" = #{cond.jysdh}
</if>
</sql>
<select id="selectLessonTimetable" resultType="com.roomroot.jwgl.vo.kcb.DailyWeeklyTimetableVO">
@@ -89,6 +127,50 @@
<if test="cond != null and cond.xydmc != null and cond.xydmc != ''">
AND xyd."学员队名称" LIKE CONCAT('%', #{cond.xydmc}, '%')
</if>
<if test="cond != null and cond.jybh != null and cond.jybh != ''">
AND (
c."教员编号" = #{cond.jybh}
OR c."责任教员编号" = #{cond.jybh}
OR EXISTS (
SELECT 1 FROM "实施_课程表" t2
INNER JOIN "实施_课程表_辅助教员" f2 ON f2."实施_课程表编号" = t2."编号"
WHERE LOWER(RAWTOHEX(c."编号")) = LOWER(REPLACE(TRIM(t2."实施_课程编号"), '-', ''))
AND COALESCE(t2."删除状态", 0) = 0
AND f2."辅助教员编号" = #{cond.jybh}
)
)
</if>
<if test="cond != null and cond.jybhs != null and cond.jybhs.size() > 0">
AND (
c."教员编号" IN
<foreach collection="cond.jybhs" item="j" open="(" separator="," close=")">#{j}</foreach>
OR c."责任教员编号" IN
<foreach collection="cond.jybhs" item="j" open="(" separator="," close=")">#{j}</foreach>
OR EXISTS (
SELECT 1 FROM "实施_课程表" t3
INNER JOIN "实施_课程表_辅助教员" f3 ON f3."实施_课程表编号" = t3."编号"
WHERE LOWER(RAWTOHEX(c."编号")) = LOWER(REPLACE(TRIM(t3."实施_课程编号"), '-', ''))
AND COALESCE(t3."删除状态", 0) = 0
AND f3."辅助教员编号" IN
<foreach collection="cond.jybhs" item="j" open="(" separator="," close=")">#{j}</foreach>
)
)
</if>
<if test="cond != null and cond.jsbh != null and cond.jsbh != ''">
AND (
c."教室编号" = #{cond.jsbh}
OR EXISTS (
SELECT 1 FROM "实施_课程表" t4
INNER JOIN "实施_课程表_教室" j2 ON j2."实施_课程表编号" = t4."编号"
WHERE LOWER(RAWTOHEX(c."编号")) = LOWER(REPLACE(TRIM(t4."实施_课程编号"), '-', ''))
AND COALESCE(t4."删除状态", 0) = 0
AND j2."教室编号" = #{cond.jsbh}
)
)
</if>
<if test="cond != null and cond.jysdh != null and cond.jysdh != ''">
AND k."教研室代号" = #{cond.jysdh}
</if>
</sql>
<sql id="ClassTimetableSelect">
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/TeachingTaskMapper.xml
+2
View File
@@ -242,6 +242,7 @@
d."学员队名称" AS xydmc,
r."教员编号" AS jybh,
jy."教员姓名" AS jyxm,
jysx."主任" AS zr,
r."教室编号" AS jsbh,
js."教室名称" AS jsmc,
r."课次序号" AS kcxh,
@@ -256,6 +257,7 @@
LEFT JOIN "课表" k ON k."课编号" = r."课编号"
LEFT JOIN "学员队表" d ON d."学员队编号" = r."学员队编号"
LEFT JOIN "教员表" jy ON jy."教员编号" = r."教员编号"
LEFT JOIN "教员属性" jysx ON jysx."教员编号" = r."教员编号"
LEFT JOIN "教员表" jy2 ON jy2."教员编号" = r."教研室计划教员编号"
LEFT JOIN "教室表" js ON js."教室编号" = r."教室编号"
LEFT JOIN "教研室表" jys ON jys."教研室代号" = r."教研室代号"