修改调课

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -343,12 +343,12 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             LocalDate localDateTime = LocalDate.parse(exchangeDate, formatter);
             DayOfWeek dayOfWeek = localDateTime.getDayOfWeek();
-            dto.setAdjustDate(exchangeDate);
+            dto.setExchangeDate(exchangeDate);
             dto.setWeek(dayOfWeek.getValue());
         }
 
         if (adjustDate != null && !"".equals(adjustDate)) {
-            dto.setExchangeDate(adjustDate);
+            dto.setAdjustDate(adjustDate);
         }
 
         dto.setTimeNumber(timeNumber);
@@ -366,7 +366,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
         }
         dto.setAdjustType(adjustType);
         //查询正在进行中或者已经完成
-        List<Long> courseIds = courseTableMapper.getExceptCourseIds(dto.getTeacherId());
+        List<Long> courseIds = courseTableMapper.getExceptCourseIds(dto.getApplicantTeacherId());
         dto.setExceptCourseList(courseIds);
         List<CourseListVo> list = courseTableMapper.getAdjustList1(dto);
         for (CourseListVo courseListVo : list) {

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

@@ -79,12 +79,12 @@
         left join class_time t4 on t1.time_number = t4.number and t1.time_period = t4.time_period
         WHERE t1.status = 1
         <if test="dto.adjustType != null and dto.adjustType == 'course_exchange'">
-            AND t1.teacher_id = #{dto.teacherId}
+            AND t1.teacher_id = #{dto.applicantTeacherId}
         </if>
         <if test="dto.adjustType != null and dto.adjustType == 'course_substitute'">
-            AND t1.teacher_id like concat('%', #{dto.teacherId},'%')
+            AND t1.teacher_id like concat('%', #{dto.applicantTeacherId},'%')
         </if>
-        AND t1.weeks = #{dto.week} AND t1.schedule_date = #{dto.adjustDate}
+        AND t1.weeks = #{dto.week} AND t1.schedule_date = #{dto.exchangeDate}
         <if test="dto.classId != null and dto.classId != ''">
             and t1.class_id = #{dto.classId}
         </if>
@@ -95,11 +95,11 @@
             </foreach>
         </if>
 
-        <if test="dto.applicantTeacherId != null and dto.applicantTeacherId != '' and dto.exchangeDate != null and dto.exchangeDate != '' and dto.timeNumber != null and dto.timeNumber != ''">
+        <if test="dto.adjustDate != null and dto.adjustDate != '' and dto.timeNumber != null and dto.timeNumber != ''">
             AND NOT EXISTS (
             SELECT 1
             FROM course_table t_prev
-            WHERE DATE(t_prev.schedule_date) = #{dto.exchangeDate}
+            WHERE DATE(t_prev.schedule_date) = #{dto.adjustDate}
             AND t_prev.time_number in
             <foreach item="timeNumber" collection="dto.timeNumbers" open="(" separator="," close=")">
                 #{timeNumber}