1、调课顶课查询课程逻辑调整

2、新生报到页面和导出增加毕业中学字段

src/main/java/com/xjrsoft/module/courseTable/service/ICourseTableService.java

@@ -33,7 +33,7 @@ public interface ICourseTableService extends IService<CourseTable> {
 
     CourseTableVo getList(CourseTableDto dto);
 
-    List<CourseListVo> getAdjustList(String teacherId, String adjustDate, String classId);
+    List<CourseListVo> getAdjustList(String teacherId, String adjustDate, String classId, String adjustType);
 
     String getPreCheck(String preCheckType, String courseId, String swapCourseId, String swapDate, String subTeacherId);
 

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

@@ -285,7 +285,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
      * 调课顶课查询
      */
     @Override
-    public List<CourseListVo> getAdjustList(String teacherId, String adjustDate, String classId) {
+    public List<CourseListVo> getAdjustList(String teacherId, String adjustDate, String classId, String adjustType) {
         CourseTableAdjustDto dto = new CourseTableAdjustDto();
         if (adjustDate != null && !"".equals(adjustDate)) {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -298,6 +298,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
         if(teacherId != null && !"".equals(teacherId)){
             dto.setTeacherId(Long.parseLong(teacherId));
         }
+        dto.setAdjustType(adjustType);
 
         List<CourseListVo> list = courseTableMapper.getAdjustList(dto);
         for (CourseListVo courseListVo : list) {

src/main/java/com/xjrsoft/module/schedule/dto/CourseTableAdjustDto.java

@@ -27,4 +27,7 @@ public class CourseTableAdjustDto implements Serializable {
     @ApiModelProperty("班级id")
     private String classId;
 
+    @ApiModelProperty("调课类型")
+    private String adjustType;
+
 }

src/main/java/com/xjrsoft/module/student/vo/BaseNewStudentExportVo.java

@@ -26,6 +26,11 @@ public class BaseNewStudentExportVo {
     @ExcelProperty("学生姓名")
     private String name;
 
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("毕业学校")
+    @ApiModelProperty("毕业学校")
+    private String graduateSchool;
+
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("性别")
     private String genderCn;

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

@@ -49,7 +49,13 @@
         SELECT t1.time_period,t1.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
-        WHERE t1.status = 1 AND t1.teacher_id like concat('%', #{dto.teacherId},'%')
+        WHERE t1.status = 1
+        <if test="dto.adjustType != null and dto.adjustType == 'course_exchange'">
+            AND t1.teacher_id = #{dto.teacherId}
+        </if>
+        <if test="dto.adjustType != null and dto.adjustType == 'course_substitute'">
+            AND t1.teacher_id like concat('%', #{dto.teacherId},'%')
+        </if>
         AND t1.weeks = #{dto.week} AND t1.schedule_date = #{dto.adjustDate}
         <if test="dto.classId != null and dto.classId != ''">
             and t1.class_id = #{dto.classId}