snihwxf 2 месяцев назад
Родитель
Сommit
c92f55ab26

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

@@ -340,7 +340,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
     public List<CourseListVo> getAdjustList1(String classId,String teacherId, String adjustDate,String timeNumber,String applicantTeacherId,  String exchangeDate,  String adjustType) {
         CourseTableAdjustDto1 dto = new CourseTableAdjustDto1();
         if (adjustDate != null && !"".equals(adjustDate)) {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") ;
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             LocalDate localDateTime = LocalDate.parse(adjustDate, formatter);
             DayOfWeek dayOfWeek = localDateTime.getDayOfWeek();
             dto.setAdjustDate(adjustDate);

+ 15 - 0
src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -181,6 +181,21 @@ public class ScheduleController {
         return RT.ok();
     }
 
+    @GetMapping(value = "/adjust-list1")
+    @ApiOperation(value = "可以调课的课程")
+    @SaCheckPermission("schedule:adjustlist")
+    @XjrLog(value = "可以调课的课程")
+    public RT<List<CourseListVo>> adjustList1(CourseTableAdjustDto1 dto) {
+        if (dto.getAdjustDate() == null || dto.getTeacherId() == null) {
+            return RT.error("请传入调整日期和教师id");
+        }
+        List<CourseListVo> list = courseTableService.getAdjustList1(dto.getClassId(), dto.getTeacherId().toString(), dto.getAdjustDate(),dto.getTimeNumber(),dto.getApplicantTeacherId().toString(), dto.getExchangeDate(), dto.getAdjustType());
+        if (list.isEmpty()) {
+            return RT.error("暂无可调课程");
+        }
+        return RT.ok();
+    }
+
     @GetMapping(value = "/pre-check")
     @ApiOperation(value = "预检查")
     @SaCheckPermission("schedule:precheck")

+ 1 - 1
src/main/resources/mapper/courseTable/CourseTable.xml

@@ -72,7 +72,7 @@
         order by t4.number asc
     </select>
 
-    <select id="getAdjustList1" parameterType="com.xjrsoft.module.schedule.dto.CourseTableAdjustDto" resultType="com.xjrsoft.module.schedule.vo.CourseListVo">
+    <select id="getAdjustList1" parameterType="com.xjrsoft.module.schedule.dto.CourseTableAdjustDto1" resultType="com.xjrsoft.module.schedule.vo.CourseListVo">
         SELECT t1.time_period,t4.short_name as time_number,t1.course_name,t2.name AS class_name,t3.name AS classroom_name,t1.id,t2.id as class_id FROM course_table t1
         LEFT JOIN base_class t2 ON t1.class_id = t2.id
         LEFT JOIN base_classroom t3 ON t1.site_id = t3.id