课表调整

src/main/java/com/xjrsoft/module/courseTable/entity/CourseTable.java

@@ -92,4 +92,7 @@ public class CourseTable implements Serializable {
     @ApiModelProperty("上课日期")
     private LocalDate scheduleDate;
 
+    @ApiModelProperty("调课顶课(顶课:course_substitute 调课:course_exchange)")
+    private String adjustType;
+
 }

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

@@ -357,6 +357,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             courseTable.setWeek(swapCourseTableBak.getWeek());
             courseTable.setWeeks(swapCourseTableBak.getWeeks());
             courseTable.setWeeksCn(swapCourseTableBak.getWeeksCn());
+            courseTable.setAdjustType(courseAdjust.getAdjustType());
             courseTableMapper.updateById(courseTable);
 
             swapCourseTable.setScheduleDate(courseTableBak.getScheduleDate());
@@ -365,13 +366,14 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             swapCourseTable.setWeek(courseTableBak.getWeek());
             swapCourseTable.setWeeks(courseTableBak.getWeeks());
             swapCourseTable.setWeeksCn(courseTableBak.getWeeksCn());
+            swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
             courseTableMapper.updateById(swapCourseTable);
             //提交调课接口
             sendExchange(courseTableBak, swapCourseTableBak, courseAdjust);
 
         } else if (CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())) {
             CourseTable courseTable = courseTableMapper.selectById(courseAdjust.getCourseId());
-
+            courseTable.setAdjustType(courseAdjust.getAdjustType());
             courseTable.setTeacherId(courseAdjust.getExchangeTeacherId());
             courseTableMapper.updateById(courseTable);
             //提交顶课接口

src/main/java/com/xjrsoft/module/schedule/vo/CourseDetailVo.java

@@ -35,4 +35,7 @@ public class CourseDetailVo {
 
     @ApiModelProperty("上课日期")
     private LocalDate scheduleDate;
+
+    @ApiModelProperty("调课顶课(顶课:course_substitute 调课:course_exchange)")
+    private String adjustType;
 }

src/main/java/com/xjrsoft/module/student/dto/StudentReportRecordPageDto.java

@@ -24,4 +24,7 @@ public class StudentReportRecordPageDto extends PageInput {
 
     @ApiModelProperty("年级id")
     private Long gradeId;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
 }

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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, t2.name AS 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 FROM course_table t1
+        SELECT t1.course_name, t2.name AS 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
         LEFT JOIN xjr_user t2 ON t1.teacher_id = t2.id
         LEFT JOIN base_classroom t3 ON t1.site_id = t3.id
         LEFT JOIN base_office_build t4 ON t3.office_build_id = t4.id