|
@@ -15,6 +15,7 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatus
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
|
|
|
import com.ym.mec.biz.dal.enums.*;
|
|
|
+import com.ym.mec.biz.dal.enums.school.EQuitGroupAuditStatusEnum;
|
|
|
import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.MusicMemberQueryInfo;
|
|
|
import com.ym.mec.biz.dal.vo.MusicGroupDeliveryVo;
|
|
@@ -2487,6 +2488,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
boolean hasPaid = studentRegistration.getMusicGroupStatus().equals(StudentMusicGroupStatusEnum.NORMAL);
|
|
|
|
|
|
+ if(musicGroupQuit.getSchoolStaffAuditStatus() != null){
|
|
|
+ musicGroupQuit.setSchoolStaffAuditStatus(status==APPROVED? EQuitGroupAuditStatusEnum.PASS:EQuitGroupAuditStatusEnum.REJECT);
|
|
|
+ musicGroupQuit.setSchoolStaffAuditReason(reason);
|
|
|
+ }
|
|
|
musicGroupQuit.setStatus(status);
|
|
|
musicGroupQuit.setReason(reason);
|
|
|
musicGroupQuit.setQuitDate(date);
|