|
@@ -4016,9 +4016,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//创建缴费项目
|
|
|
MusicGroup musicGroup = musicGroupDao.findByClassGroupId(masterClassGroupId);
|
|
|
//主班是否有报名状态的学员
|
|
|
- Integer applyStudentNum = studentRegistrationDao.findApplyStudent(musicGroup.getId(), studentIds);
|
|
|
- if (applyStudentNum != null && applyStudentNum > 0) {
|
|
|
- throw new BizException("操作失败: 学员{学员姓名/学员编号}在主班所属乐团中为报名状态不可合并,请将该学员退团处理后再次合并");
|
|
|
+ StudentRegistration studentRegistration = studentRegistrationDao.findApplyStudent(musicGroup.getId(), studentIds);
|
|
|
+ if (studentRegistration != null) {
|
|
|
+ throw new BizException("操作失败: 学员 {}/{} 在 {} 中为报名状态不可合并,请将该学员退团处理后再次合并",
|
|
|
+ studentRegistration.getName(),studentRegistration.getUserId(),musicGroup.getName());
|
|
|
}
|
|
|
//获取缴费状态在审核中或者已拒绝的缴费项目的学员
|
|
|
String studentId = musicGroupPaymentCalenderDao.queryCalenderStudentIds(musicGroup.getId(), null);
|