|
@@ -4127,12 +4127,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
int daysBetween = DateUtil.daysBetween(studentRegistration.getCreateTime(), new Date());
|
|
int daysBetween = DateUtil.daysBetween(studentRegistration.getCreateTime(), new Date());
|
|
resultMap.put("days", daysBetween);
|
|
resultMap.put("days", daysBetween);
|
|
MusicGroupQuit musicGroupQuit = musicGroupQuitDao.queryByUserIdAndMusicGroupId(sysUser.getId(), musicGroupId);
|
|
MusicGroupQuit musicGroupQuit = musicGroupQuitDao.queryByUserIdAndMusicGroupId(sysUser.getId(), musicGroupId);
|
|
- if (musicGroupQuit != null) {
|
|
|
|
|
|
+ if (musicGroupQuit != null && musicGroupQuit.getStatus() == PROCESSING) {
|
|
resultMap.put("reasonEnum",musicGroupQuit.getReasonEnum());
|
|
resultMap.put("reasonEnum",musicGroupQuit.getReasonEnum());
|
|
- if(musicGroupQuit.getStatus() == PROCESSING){
|
|
|
|
- resultMap.put("memo", musicGroupQuit.getUserComment());
|
|
|
|
- resultMap.put("quitTime", musicGroupQuit.getCreateTime());
|
|
|
|
- }
|
|
|
|
|
|
+ resultMap.put("memo", musicGroupQuit.getUserComment());
|
|
|
|
+ resultMap.put("quitTime", musicGroupQuit.getCreateTime());
|
|
}
|
|
}
|
|
if (musicGroup.getEducationalTeacherId() != null) {
|
|
if (musicGroup.getEducationalTeacherId() != null) {
|
|
SysUser user = sysUserFeignService.queryUserById(musicGroup.getEducationalTeacherId());
|
|
SysUser user = sysUserFeignService.queryUserById(musicGroup.getEducationalTeacherId());
|