课表调整

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -657,9 +657,6 @@ public class DataUtil {
             List<String> teacherIds = new ArrayList<>();
             List<String> teacherNames = new ArrayList<>();
             List<String> teacher_serial_nos = new ArrayList<>();
-            if(courseClassName.contains("声乐/舞蹈")){
-               System.out.println(teachers.toString());
-            }
             for (JsonElement teacher : teachers) {
                 JsonObject teacherJson = teacher.getAsJsonObject();
                 teacherIds.add(teacherMap.get(teacherJson.get("teacherSerialNo").getAsString())==null?"0":teacherMap.get(teacherJson.get("teacherSerialNo").getAsString()));

src/main/resources/mapper/courseTable/CourseTable.xml

@@ -5,10 +5,6 @@
 <mapper namespace="com.xjrsoft.module.courseTable.mapper.CourseTableMapper">
     <select id="getList" parameterType="com.xjrsoft.module.schedule.dto.CourseTableDto" resultType="com.xjrsoft.module.schedule.vo.CourseDetailVo">
         SELECT t1.course_name, t1.teacher_name,CONCAT(t4.name,t3.name) AS classroom_name,t1.weeks,t1.time_period,t1.time_number,t5.name as class_name,t1.schedule_date,t1.adjust_type FROM course_table t1
-        <if test="dto.courseType != null and dto.courseType != '' and dto.courseType == 'teacher' and dto.teacherId != null">
-            LEFT JOIN xjr_user t2 ON t1.teacher_id like concat('%', t2.id, '%')
-        </if>
-
         LEFT JOIN base_classroom t3 ON t1.site_id = t3.id
         LEFT JOIN base_office_build t4 ON t3.office_build_id = t4.id
         LEFT JOIN base_class t5 ON t1.class_id = t5.id
@@ -43,7 +39,7 @@
             and t1.schedule_date = #{dto.toDay}
         </if>
         <if test="dto.teacherId != null">
-            and t1.teacher_id = #{dto.teacherId}
+            and t1.teacher_id like concat('%', #{dto.teacherId}, '%')
         </if>
         <if test="dto.classId != null">
             and t5.id = #{dto.classId}