Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -359,4 +359,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     void updateClassGroupInfo(Integer classGroupId);
 
+    /**
+     * 清除班级未开始课程
+     * @param classGroupId
+     * @return
+     */
+    boolean delClassNoStartCourse(Integer classGroupId);
+
 }

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

@@ -2093,4 +2093,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         classGroupDao.update(classGroup);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delClassNoStartCourse(Integer classGroupId) {
+        Date date = new Date();
+        ClassGroup classGroup = classGroupDao.get(classGroupId);
+        if (classGroup == null) {
+            throw new BizException("班级不存在");
+        }
+
+        List<CourseSchedule> noStartCourses = courseScheduleService.findNoStartCoursesByClassGroupId(classGroup.getId());
+        if (noStartCourses == null || noStartCourses.size() <= 0) {
+            return true;
+        }
+        List<Long> courseScheduleIds = noStartCourses.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
+        courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
+        courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+        teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
+        courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
+        return true;
+    }
 }

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

@@ -279,4 +279,12 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult getClassGroupTeachers(Integer classGroupId){
         return succeed(classGroupTeacherMapperService.getClassGroupTeachers(classGroupId));
     }
+
+    @ApiOperation(value = "清除班级未上课程")
+    @PostMapping("/delClassNoStartCourse")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/delClassNoStartCourse')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
+    public HttpResponseResult delClassNoStartCourse(Integer classGroupId) throws Exception {
+        return succeed(classGroupService.delClassNoStartCourse(classGroupId));
+    }
 }