fix 临时班课酬错误问题

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupTeacherMapperService.java

@@ -43,4 +43,11 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @return void
      */
     void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules, Map<Long, CourseSchedule> oldCourseSchedules);
+
+    /**
+     * 获取班级老师
+     * @param classGroupId
+     * @return
+     */
+    List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId);
 }

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

@@ -1083,6 +1083,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //计算每节课的课酬
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
         List<CourseScheduleStudentPayment> courseScheduleStudentPaymentList = new ArrayList<>();
+        List<CourseSchedule> courseScheduleList = new ArrayList<>();
+
         BigDecimal expectPrice = new BigDecimal("0");
         int times = 0;
 
@@ -1129,8 +1131,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
-
                 courseScheduleDao.insert(courseSchedule);
+                courseScheduleList.add(courseSchedule);
 
                 times++;
 
@@ -1207,6 +1209,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             now = now.plusDays(1);
         }
+
+        //检测新排课冲突
+        courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
         //老师结算表
         courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
 

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

@@ -411,4 +411,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
         return courseScheduleTeacherSalary;
     }
+
+    public List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId){
+        return classGroupTeacherMapperDao.findClassGroupTeachers(classGroupId.toString());
+    }
 }

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

@@ -268,4 +268,14 @@ public class ClassGroupController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserById(userId);
         return succeed(sysUser.getUsername());
     }
+
+    @ApiOperation(value = "查询班级老师")
+    @GetMapping("/getClassGroupTeachers")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/getClassGroupTeachers')")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")
+    })
+    public HttpResponseResult getClassGroupTeachers(Integer classGroupId){
+        return succeed(classGroupTeacherMapperService.getClassGroupTeachers(classGroupId));
+    }
 }