Pārlūkot izejas kodu

调课顶课查询

snihwxf 2 mēneši atpakaļ
vecāks
revīzija
f7fe22b455

+ 3 - 0
src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -353,6 +353,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
 
         dto.setTimeNumber(timeNumber);
 
+        List<String> timeNumbers = timeNumber == null ? Collections.emptyList() : Arrays.asList(timeNumber.split(","));
+        dto.setTimeNumbers(timeNumbers);
+
         if (applicantTeacherId != null && !"".equals(applicantTeacherId)) {
             dto.setApplicantTeacherId(Long.parseLong(applicantTeacherId));
         }

+ 3 - 0
src/main/java/com/xjrsoft/module/schedule/dto/CourseTableAdjustDto1.java

@@ -46,4 +46,7 @@ public class CourseTableAdjustDto1 implements Serializable {
     @ApiModelProperty("除外的id")
     private List<Long> exceptCourseList;
 
+    @ApiModelProperty("课次")
+    private  List<String> timeNumbers;
+
 }

+ 6 - 3
src/main/resources/mapper/courseTable/CourseTable.xml

@@ -99,9 +99,12 @@
             AND NOT EXISTS (
             SELECT 1
             FROM course_table t_prev
-            WHERE DATE(t_prev.schedule_date) = #{exchangeDate}
-            AND t_prev.time_number = #{timeNumber}
-            AND FIND_IN_SET(t_prev.teacher_id, #{applicantTeacherId}) > 0
+            WHERE DATE(t_prev.schedule_date) = #{dto.exchangeDate}
+            AND t_prev.time_number in
+            <foreach item="timeNumber" collection="dto.timeNumbers" open="(" separator="," close=")">
+                #{timeNumber}
+            </foreach>
+            AND FIND_IN_SET(t_prev.teacher_id, #{dto.applicantTeacherId}) > 0
             )
         </if>
         order by t4.number asc