调课顶课规则调整

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

@@ -393,6 +393,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                             .eq(CourseTableBak::getWfCourseAdjustId, courseAdjust.getId())
             );
             Map<Long, String> bakKeyInfoMap = bakList.stream().collect(Collectors.toMap(CourseTableBak::getId, CourseTableBak::getKeyInfo));
+            Map<Long, CourseTableBak> bakCourseMap = bakList.stream().collect(Collectors.toMap(CourseTableBak::getId, x -> x));
 
             if (CourseAdjustTypeEnum.courseExchange.getCode().equals(courseAdjust.getAdjustType())) {
                 for (int i = 0; i < courseIds.length; i ++){
@@ -404,25 +405,37 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
 
                     CourseTable swapCourseTable = courseMap.get(bakKeyInfoMap.get(Long.parseLong(exchangeCourseId)));
 
-                    CourseTable courseTableBak = BeanUtil.toBean(courseTable, CourseTable.class);
-                    CourseTable swapCourseTableBak = BeanUtil.toBean(swapCourseTable, CourseTable.class);
+                    CourseTableBak courseTableBak = bakCourseMap.get(Long.parseLong(courseId));
+                    CourseTableBak swapCourseTableBak = bakCourseMap.get(Long.parseLong(exchangeCourseId));
 
-                    courseTable.setScheduleDate(swapCourseTableBak.getScheduleDate());
-                    courseTable.setTimePeriod(swapCourseTableBak.getTimePeriod());
-                    courseTable.setTimeNumber(swapCourseTableBak.getTimeNumber());
-                    courseTable.setWeek(swapCourseTableBak.getWeek());
-                    courseTable.setWeeks(swapCourseTableBak.getWeeks());
-                    courseTable.setWeeksCn(swapCourseTableBak.getWeeksCn());
                     courseTable.setAdjustType(courseAdjust.getAdjustType());
+                    courseTable.setCourseName(swapCourseTableBak.getCourseName());
+                    courseTable.setCourseId(swapCourseTableBak.getCourseId());
+                    courseTable.setTeacherId(swapCourseTableBak.getTeacherId());
+                    courseTable.setSiteId(swapCourseTableBak.getSiteId());
+                    courseTable.setTeacherName(swapCourseTableBak.getTeacherName());
+                    courseTable.setKeyInfo(courseTable.getTeacherId() + "_"
+                            + courseTable.getClassId() + "_"
+                            + courseTable.getScheduleDate() + "_"
+                            + courseTable.getCourseId() + "_"
+                            + courseTable.getSiteId() + "_"
+                            + courseTable.getTimeNumber()
+                    );
                     courseTableMapper.updateById(courseTable);
 
-                    swapCourseTable.setScheduleDate(courseTableBak.getScheduleDate());
-                    swapCourseTable.setTimePeriod(courseTableBak.getTimePeriod());
-                    swapCourseTable.setTimeNumber(courseTableBak.getTimeNumber());
-                    swapCourseTable.setWeek(courseTableBak.getWeek());
-                    swapCourseTable.setWeeks(courseTableBak.getWeeks());
-                    swapCourseTable.setWeeksCn(courseTableBak.getWeeksCn());
                     swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
+                    swapCourseTable.setKeyInfo(swapCourseTable.getTeacherId() + "_"
+                            + swapCourseTable.getClassId() + "_"
+                            + swapCourseTable.getScheduleDate() + "_"
+                            + swapCourseTable.getCourseId() + "_"
+                            + swapCourseTable.getSiteId() + "_"
+                            + swapCourseTable.getTimeNumber()
+                    );
+                    swapCourseTable.setCourseId(courseTableBak.getCourseId());
+                    swapCourseTable.setCourseName(courseTableBak.getCourseName());
+                    swapCourseTable.setTeacherId(courseTableBak.getTeacherId());
+                    swapCourseTable.setSiteId(courseTableBak.getSiteId());
+                    swapCourseTable.setTeacherName(courseTableBak.getTeacherName());
                     courseTableMapper.updateById(swapCourseTable);
                 }
                 //提交调课接口
@@ -460,18 +473,15 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                         continue;
                     }
 
-
-
                     CourseTable courseTableBak = BeanUtil.toBean(courseTable, CourseTable.class);
                     CourseTable swapCourseTableBak = BeanUtil.toBean(swapCourseTable, CourseTable.class);
 
-                    courseTable.setScheduleDate(swapCourseTableBak.getScheduleDate());
-                    courseTable.setTimePeriod(swapCourseTableBak.getTimePeriod());
-                    courseTable.setTimeNumber(swapCourseTableBak.getTimeNumber());
-                    courseTable.setWeek(swapCourseTableBak.getWeek());
-                    courseTable.setWeeks(swapCourseTableBak.getWeeks());
-                    courseTable.setWeeksCn(swapCourseTableBak.getWeeksCn());
                     courseTable.setAdjustType(courseAdjust.getAdjustType());
+                    courseTable.setCourseName(swapCourseTableBak.getCourseName());
+                    courseTable.setCourseId(swapCourseTableBak.getCourseId());
+                    courseTable.setTeacherId(swapCourseTableBak.getTeacherId());
+                    courseTable.setSiteId(swapCourseTableBak.getSiteId());
+                    courseTable.setTeacherName(swapCourseTableBak.getTeacherName());
                     courseTable.setKeyInfo(courseTable.getTeacherId() + "_"
                             + courseTable.getClassId() + "_"
                             + courseTable.getScheduleDate() + "_"
@@ -481,12 +491,6 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                     );
                     courseTableMapper.updateById(courseTable);
 
-                    swapCourseTable.setScheduleDate(courseTableBak.getScheduleDate());
-                    swapCourseTable.setTimePeriod(courseTableBak.getTimePeriod());
-                    swapCourseTable.setTimeNumber(courseTableBak.getTimeNumber());
-                    swapCourseTable.setWeek(courseTableBak.getWeek());
-                    swapCourseTable.setWeeks(courseTableBak.getWeeks());
-                    swapCourseTable.setWeeksCn(courseTableBak.getWeeksCn());
                     swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
                     swapCourseTable.setKeyInfo(swapCourseTable.getTeacherId() + "_"
                             + swapCourseTable.getClassId() + "_"
@@ -495,6 +499,11 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                             + swapCourseTable.getSiteId() + "_"
                             + swapCourseTable.getTimeNumber()
                     );
+                    swapCourseTable.setCourseId(courseTableBak.getCourseId());
+                    swapCourseTable.setCourseName(courseTableBak.getCourseName());
+                    swapCourseTable.setTeacherId(courseTableBak.getTeacherId());
+                    swapCourseTable.setSiteId(courseTableBak.getSiteId());
+                    swapCourseTable.setTeacherName(courseTableBak.getTeacherName());
                     courseTableMapper.updateById(swapCourseTable);
                 }
                 //提交调课接口