Merge branch 'course_adjust'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BatchCourseAdjustDto.java

@@ -53,6 +53,16 @@ public class BatchCourseAdjustDto {
     @ApiModelProperty(value = "确认生成课程")
     private Boolean confirmGenerate = false;
 
+    private Integer operatorId;
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
     public String getPauseDate() {
         return pauseDate;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2845,6 +2845,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}
 
+		Date now = new Date();
+
+		//获取修改日志
+		List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseAdjustInfo.getCourseScheduleIds(),oldCourses,courseAdjustInfo.getOperatorId(),now);
+
 		List<CourseScheduleTeacherSalary> oldCourseScheduleTeacherSalaryList = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseAdjustInfo.getCourseScheduleIds());
 		Map<Long, List<CourseScheduleTeacherSalary>> courseSalaryListMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(oldCourseScheduleTeacherSalaryList)){
@@ -2864,7 +2869,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		if(CollectionUtils.isEmpty(courseAdjustInfo.getClassGroupTeacherMapperList())){
-			courseAdjustInfo.setClassGroupTeacherMapperList(Collections.EMPTY_LIST);
+			courseAdjustInfo.setClassGroupTeacherMapperList(new ArrayList<>());
 		}
 
 		//获取主教编号
@@ -2905,8 +2910,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			startTime = LocalTime.parse(courseAdjustInfo.getStartTime(), DateUtil.timeFormatter);
 		}
 
-		Date now = new Date();
-
 		List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();
 
 		oldCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
@@ -2959,6 +2962,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				if(VIP.equals(oldCourses.get(i).getGroupType())){
 					changeSalaryTeachTypes.add(TeachTypeEnum.BISHOP);
 					courseScheduleTeacherSalaryDao.deleteWithCourseAndTeachRole(Arrays.asList(oldCourses.get(i).getId()), TeachTypeEnum.BISHOP);
+					if(CollectionUtils.isEmpty(courseAdjustInfo.getClassGroupTeacherMapperList())){
+						ClassGroupTeacherMapper cgtm = new ClassGroupTeacherMapper();
+						cgtm.setUserId(oldCourses.get(i).getActualTeacherId());
+						cgtm.setTeacherRole(TeachTypeEnum.BISHOP);
+						courseAdjustInfo.getClassGroupTeacherMapperList().add(cgtm);
+					}
 				}
 			}
 
@@ -3066,6 +3075,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		courseScheduleDao.batchUpdate(oldCourses);
 
+		saveModifyLog(modifyLogs, courseAdjustInfo.getCourseScheduleIds());
+
 		return BaseController.succeed();
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -386,6 +386,11 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/batchCourseAdjust")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchCourseAdjust')")
     public Object batchCourseAdjust(@RequestBody BatchCourseAdjustDto batchCourseAdjustInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        batchCourseAdjustInfo.setOperatorId(sysUser.getId());
         return courseScheduleService.batchCourseAdjust(batchCourseAdjustInfo);
     }