update

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

@@ -1936,6 +1936,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuit.setUserId(userId);
         musicGroupQuit.setUserComment(reason);
         musicGroupQuit.setApplyUserId(userId);
+        musicGroupQuit.setReason(reason);
         
         MusicGroupReturnFeeDto returnFeeDto = reqMusicGroupQuit.getReturnFeeDto();
         musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
@@ -1957,7 +1958,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         		throw new BizException("只能乐团主管操作退团申请");
     		}
         	if (currentOperatorRoleIds.contains(SysUserRole.SECTION_MANAGER) && currentOperatorRoleIds.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
-        		musicGroupQuit.setStatus(musicGroupQuit.getStatus());
+        		musicGroupQuit.setStatus(reqMusicGroupQuit.getStatus());
     		}
         	
         	BigDecimal returnTotalFee = BigDecimal.ZERO;

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

@@ -423,7 +423,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 			map.put(OrderDetailTypeEnum.ACCESSORIES.getCode(), BigDecimal.ZERO);
 		}
 
-		StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(studentId, musicGroupId);
+		StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(musicGroupId, studentId);
 		if (studentRegistration == null) {
 			throw new BizException("学生报名信息查询失败");
 		}

mec-biz/src/main/resources/config/mybatis/MusicGroupQuitMapper.xml

@@ -114,7 +114,7 @@
         LEFT JOIN sys_user su ON su.id_ = mgq.user_id_
         LEFT JOIN music_group mg ON mg.id_ = mgq.music_group_id_
         <include refid="queryPageSql"/>
-        ORDER BY id_
+        ORDER BY id_ desc
         <include refid="global.limit"/>
     </select>
     <sql id="queryPageSql">