|
@@ -4116,7 +4116,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
if (sysUser == null) {
|
|
if (sysUser == null) {
|
|
throw new BizException("请登录");
|
|
throw new BizException("请登录");
|
|
}
|
|
}
|
|
- Map<String, Object> resultMap = new HashMap<>(7);
|
|
|
|
|
|
+ Map<String, Object> resultMap = new HashMap<>(8);
|
|
String username = sysUser.getUsername();
|
|
String username = sysUser.getUsername();
|
|
resultMap.put("username", StringUtils.isEmpty(username) ? sysUser.getRealName() : username);
|
|
resultMap.put("username", StringUtils.isEmpty(username) ? sysUser.getRealName() : username);
|
|
MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
@@ -4127,9 +4127,12 @@ 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 && musicGroupQuit.getStatus() == PROCESSING) {
|
|
|
|
- resultMap.put("memo", musicGroupQuit.getUserComment());
|
|
|
|
- resultMap.put("quitTime", musicGroupQuit.getCreateTime());
|
|
|
|
|
|
+ if (musicGroupQuit != null) {
|
|
|
|
+ resultMap.put("reasonEnum",musicGroupQuit.getReasonEnum());
|
|
|
|
+ if(musicGroupQuit.getStatus() == PROCESSING){
|
|
|
|
+ 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());
|