通过AI比对原操作文档，生成系统功能完善方案，根据方案进行增补，完善从学期新增到最终的排课功能

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/ElectiveCourseMapper.xml

@@ -90,7 +90,8 @@
               FROM "学员队年度学期基本信息表"
              GROUP BY "学员队编号", "年度", "学期第次"
         ) xq ON xq."学员队编号" = t."学员队编号"
-            AND xq."年度" = t."年度"
+            AND (CASE WHEN xq."年度" >= 100000 THEN xq."年度"
+                      ELSE xq."年度" * 100 + xq."学期第次" END) = t."年度"
             AND xq."学期第次" = t."学期第次"
         LEFT JOIN (
             SELECT "科目编号", "教员编号", "年度",

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/JYLMapper.java

@@ -0,0 +1,12 @@
+package com.roomroot.jwgl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.roomroot.jwgl.entity.JYL;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 教员历 Mapper
+ */
+@Mapper
+public interface JYLMapper extends BaseMapper<JYL> {
+}

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/TeachingTaskMapper.java

@@ -8,6 +8,7 @@ import com.roomroot.jwgl.vo.jys.TeachingOfficeBookCourseVO;
 import com.roomroot.jwgl.vo.jys.TeachingOfficeBookVO;
 import com.roomroot.jwgl.vo.jys.TeachingTaskSquadVO;
 import com.roomroot.jwgl.vo.jys.TeachingTaskVO;
+import com.roomroot.jwgl.vo.taskbook.TaskBookRowVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -54,4 +55,10 @@ public interface TeachingTaskMapper extends BaseMapper<JXRW> {
      */
     List<TeachingOfficeBookCourseVO> selectOfficeBookCourses(@Param("jxrwbh") String jxrwbh,
             @Param("jysdh") String jysdh);
+
+    /**
+     * 教研室任务书填报列表（阶段 4）：某教学任务下全部课程任务行，
+     * 排序 课程 → 责任教员 → 课次，含合班分组号（编组）与教员/场地/教研室联查。
+     */
+    List<TaskBookRowVO> selectTaskBookRows(@Param("jxrwbh") String jxrwbh);
 }

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/TeachingTaskMapper.xml

@@ -228,4 +228,41 @@
         ORDER BY d."学员队名称", k."课名称"
     </select>
 
+    <select id="selectTaskBookRows" resultType="com.roomroot.jwgl.vo.taskbook.TaskBookRowVO">
+        SELECT
+            r."编号" AS bh,
+            r."学员队学期编号" AS xydxqbh,
+            r."课编号" AS kbh,
+            NVL(NULLIF(r."简称", ''), k."课名称") AS kcmc,
+            r."课类型" AS klx,
+            r."学时" AS xs,
+            r."周课时" AS zks,
+            r."成绩分制" AS cjfz,
+            r."学员队编号" AS xydbh,
+            d."学员队名称" AS xydmc,
+            r."教员编号" AS jybh,
+            jy."教员姓名" AS jyxm,
+            r."教室编号" AS jsbh,
+            js."教室名称" AS jsmc,
+            r."课次序号" AS kcxh,
+            r."编组" AS bz2,
+            r."教研室代号" AS jysdh,
+            jys."教研室名称" AS jysmc,
+            r."教研室计划教员编号" AS jysjhjybh,
+            jy2."教员姓名" AS jysjhjyxm,
+            r."教研室计划备注" AS jysjhbz
+        FROM "学员队任务表" r
+        INNER JOIN "学员队年度学期基本信息表" s ON s."编号" = r."学员队学期编号"
+        LEFT JOIN "课表" k ON k."课编号" = r."课编号"
+        LEFT JOIN "学员队表" d ON d."学员队编号" = r."学员队编号"
+        LEFT JOIN "教员表" jy ON jy."教员编号" = r."教员编号"
+        LEFT JOIN "教员表" jy2 ON jy2."教员编号" = r."教研室计划教员编号"
+        LEFT JOIN "教室表" js ON js."教室编号" = r."教室编号"
+        LEFT JOIN "教研室表" jys ON jys."教研室代号" = r."教研室代号"
+        WHERE s."教学任务编号" = #{jxrwbh}
+          AND NVL(r."DEL_FLAG", 0) = 0
+          AND NVL(s."DEL_FLAG", 0) = 0
+        ORDER BY r."课编号", r."教员编号" NULLS LAST, r."课次序号" NULLS LAST, r."编号"
+    </select>
+
 </mapper>