Merge remote-tracking branch 'origin/master'

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

@@ -2062,6 +2062,14 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return teacherSalaryOverview;
         }
 
+        if(StringUtils.isBlank(queryInfo.getStartDay())){
+            LocalDate nowDate = LocalDate.now();
+            LocalDate monthFirstDay = nowDate.with(TemporalAdjusters.firstDayOfMonth());
+            LocalDate monthLastDay = nowDate.with(TemporalAdjusters.lastDayOfMonth());
+            queryInfo.setStartDay(monthFirstDay.toString());
+            queryInfo.setEndDay(monthLastDay.toString());
+        }
+
         TeacherIncomeReviewDto teacherSalaryOverview = courseScheduleTeacherSalaryDao.getTeacherSalaryOverview(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), "2021-03-01", null, queryInfo.getTeachIncomeType());
         if(Objects.isNull(teacherSalaryOverview)){
             teacherSalaryOverview = new TeacherIncomeReviewDto();

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

@@ -1351,8 +1351,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     + musicGroupId, "", PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "取消乐团", null);
         }*/
         //获取当前乐团所有已报名学员
+        List<StudentRegistration> registrations = studentRegistrationDao.findClassGroupStu(musicGroupId, null);
         if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
-            List<StudentRegistration> registrations = studentRegistrationDao.findClassGroupStu(musicGroupId, null);
             if (registrations != null && registrations.size() > 0) {
                 Map<Integer, String> map = new HashMap<>(registrations.size());
                 registrations.forEach(e -> {
@@ -1363,7 +1363,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             }
         }
         //将学生退团
-        if (studentRegistrationService.quitAllStudent(musicGroup.getId(), "退团（乐团关闭）") <= 0) {
+        if (registrations.size() > 0 && studentRegistrationService.quitAllStudent(musicGroup.getId(), "退团（乐团取消）") <= 0) {
             throw new BizException("处理学生退团失败，请重试");
         }
         //记录建团日志
@@ -2975,7 +2975,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         courseScheduleDao.logicDeleteCourseSchedulesByMusicGroupID(musicGroup.getId());
 
         //将学生退团
-        if (studentRegistrationService.quitAllStudent(musicGroup.getId(), "退团（乐团关闭）") <= 0) {
+        List<StudentRegistration> registrations = studentRegistrationDao.findClassGroupStu(musicGroup.getId(), null);
+        if (registrations.size() > 0 && studentRegistrationService.quitAllStudent(musicGroup.getId(), "退团（乐团关闭）") <= 0) {
             throw new BizException("处理学生退团失败，请重试");
         }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseScheduleTeacherSalaryController.java

@@ -91,9 +91,9 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
         }
         queryInfo.setTeacherId(sysUser.getId());
         queryInfo.setCourseStatus(CourseStatusEnum.OVER);
-        if(StringUtils.isBlank(queryInfo.getStartDay())){
-            queryInfo.setStartDay("2021-03-01");
-        }
+//        if(StringUtils.isBlank(queryInfo.getStartDay())){
+//            queryInfo.setStartDay("2021-03-01");
+//        }
         return succeed(courseScheduleTeacherSalaryService.getTeacherSalaryOverview(queryInfo));
     }