调课顶课调整

pom.xml

@@ -75,6 +75,14 @@
     </properties>
 
     <dependencies>
+        <!-- 引入解决人脸照片方向问题 -->
+        <dependency>
+            <groupId>com.drewnoakes</groupId>
+            <artifactId>metadata-extractor</artifactId>
+            <version>2.16.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

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

@@ -46,6 +46,7 @@ import com.xjrsoft.module.schedule.dto.ClassOptionDto;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
 import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
+import com.xjrsoft.module.schedule.entity.CourseTableBak;
 import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.mapper.CourseTableBakMapper;
 import com.xjrsoft.module.schedule.util.ScheduleUtil;
@@ -355,7 +356,14 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
 
                 //调课，将双方课程的日期（schedule_date）、时段（time_period）、节次（time_number）、周（week）、星期几(1-7)（weeks）、星期中文（weeks_cn）对调
                 CourseTable courseTable = courseTableMapper.selectById(courseId);
+                CourseTableBak courseBak = BeanUtil.toBean(courseTable, CourseTableBak.class);
+                courseBak.setWfCourseAdjustId(courseAdjust.getId());
+                courseTableBakMapper.insert(courseBak);
+
                 CourseTable swapCourseTable = courseTableMapper.selectById(exchangeCourseId);
+                CourseTableBak swapCourseBak = BeanUtil.toBean(swapCourseTable, CourseTableBak.class);
+                swapCourseBak.setWfCourseAdjustId(courseAdjust.getId());
+                courseTableBakMapper.insert(swapCourseBak);
 
                 CourseTable courseTableBak = BeanUtil.toBean(courseTable, CourseTable.class);
                 CourseTable swapCourseTableBak = BeanUtil.toBean(swapCourseTable, CourseTable.class);
@@ -378,16 +386,20 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
                 courseTableMapper.updateById(swapCourseTable);
             }
-
             //提交调课接口
             //sendExchange(courseTableBak, swapCourseTableBak, courseAdjust);
-
         } else if (CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())) {
             String[] courseIds = courseAdjust.getCourseId().split(",");
             for (String courseId : courseIds) {
                 CourseTable courseTable = courseTableMapper.selectById(courseId);
+
+                CourseTableBak courseBak = BeanUtil.toBean(courseTable, CourseTableBak.class);
+                courseBak.setWfCourseAdjustId(courseAdjust.getId());
+                courseTableBakMapper.insert(courseBak);
+
+                String teacherId = courseTable.getTeacherId().replace(courseAdjust.getUserId().toString(), courseAdjust.getExchangeTeacherId().toString());
                 courseTable.setAdjustType(courseAdjust.getAdjustType());
-                courseTable.setTeacherId(courseAdjust.getExchangeTeacherId().toString());
+                courseTable.setTeacherId(teacherId);
                 courseTableMapper.updateById(courseTable);
             }
 

src/main/java/com/xjrsoft/module/schedule/entity/CourseTableBak.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -91,6 +92,12 @@ public class CourseTableBak implements Serializable {
     @ApiModelProperty("简约课表的id")
     private String jianyueId;
 
+    @ApiModelProperty("上课日期")
+    private LocalDate scheduleDate;
+
+    @ApiModelProperty("调课顶课(顶课:course_substitute 调课:course_exchange)")
+    private String adjustType;
+
     @ApiModelProperty("调顶课申请的id")
     private Long wfCourseAdjustId;
 }