feat：课表列表调整

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EndCourseScheduleQueryInfo.java

@@ -1,10 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -70,6 +67,9 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "上课模式")
     private TeachModeEnum teachMode;
 
+    @ApiModelProperty(value = "职务类型（助教、主教）")
+    private TeachTypeEnum teachType;
+
     private boolean isExport = false;
 
     public TeachModeEnum getTeachMode() {
@@ -223,4 +223,12 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
 	public void setCreateEndDate(Date createEndDate) {
 		this.createEndDate = createEndDate;
 	}
+
+    public TeachTypeEnum getTeachType() {
+        return teachType;
+    }
+
+    public void setTeachType(TeachTypeEnum teachType) {
+        this.teachType = teachType;
+    }
 }

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2338,6 +2338,7 @@
             course_schedule cs
             LEFT JOIN school s ON cs.schoole_id_=s.id_
             LEFT JOIN organization o ON cs.organ_id_=o.id_
+            LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
             left join teacher_attendance ta on ta.course_schedule_id_ = cs.id_ and ta.is_complaints_ = 1
             LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.remark_ IS NULL
             <include refid="endFindCourseSchedulesCondition"/>
@@ -2352,6 +2353,7 @@
         FROM
         course_schedule cs
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.remark_ IS NULL
+        LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
         <include refid="endFindCourseSchedulesCondition"/>
     </select>
     <select id="findCourseIdsByStudent" resultType="int">
@@ -2446,7 +2448,10 @@
             AND cs.teach_mode_ = #{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
         <if test="teacherIdList != null">
-            AND cs.actual_teacher_id_=#{teacherIdList}
+            AND csts.user_id_=#{teacherIdList}
+        </if>
+        <if test="teachType != null">
+            AND csts.teacher_role_ = #{teachType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
         <if test="organIdList!=null">
             AND FIND_IN_SET(cs.organ_id_,#{organIdList})