乐团可排课时长列表新增根据班级编号

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentStudentCourseDetailDao.java

@@ -100,7 +100,7 @@ public interface MusicGroupPaymentStudentCourseDetailDao extends BaseDAO<Long, M
      * @param musicGroupId
      * @return
      */
-    List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(@Param("musicGroupId") String musicGroupId);
+    List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(@Param("musicGroupId") String musicGroupId,@Param("classGroupId") Integer classGroupId);
 
     List<MusicGroupPaymentStudentCourseDetail> findByCalenderAndUserId(@Param("calenderId") Long calenderId, @Param("userId") Integer userId);
 

mec-biz/src/main/java/com/ym/mec/biz/service/StudentManageService.java

@@ -205,7 +205,7 @@ public interface StudentManageService {
      * 乐团管理--乐团详情--学员列表--获取学员可排课时长
      * @return
      */
-    List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(String musicGroupId);
+    List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(String musicGroupId, Integer classGroupId);
 
     PageInfo<StudentErrorLeaveDto> queryStudentErrorLeaveList(StudentErrorLeaveQueryInfo queryInfo);
 

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

@@ -863,8 +863,8 @@ public class StudentManageServiceImpl implements StudentManageService {
     }
 
     @Override
-    public List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(String musicGroupId) {
-        return musicGroupPaymentStudentCourseDetailDao.queryStudentSubTotalCourseTimes(musicGroupId);
+    public List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(String musicGroupId, Integer classGroupId) {
+        return musicGroupPaymentStudentCourseDetailDao.queryStudentSubTotalCourseTimes(musicGroupId,classGroupId);
     }
 
     @Override

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

@@ -259,8 +259,12 @@
                SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value'
         FROM music_group_payment_student_course_detail mgpscd
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
+        LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = mgpc.music_group_id_ AND cgsm.status_ = 'NORMAL'
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
         WHERE mgpc.music_group_id_ = #{musicGroupId}
+        <if test="classGroupId != null">
+            AND cgsm.class_group_id_ = #{classGroupId}
+        </if>
         GROUP BY mgpscd.user_id_,mgpscd.course_type_
     </select>
     <select id="findByCalenderAndUserId" resultMap="MusicGroupPaymentStudentCourseDetail">

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -174,8 +174,8 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "乐团管理--乐团详情--学员列表--获取学员可排课时长")
     @GetMapping("/queryStudentSubTotalCourseTimes")
     @PreAuthorize("@pcs.hasPermissions('studentManage/queryStudentSubTotalCourseTimes')")
-    public Object queryStudentSubTotalCourseTimes(String musicGroupId){
-        return succeed(studentManageService.queryStudentSubTotalCourseTimes(musicGroupId));
+    public Object queryStudentSubTotalCourseTimes(String musicGroupId,Integer classGroupId){
+        return succeed(studentManageService.queryStudentSubTotalCourseTimes(musicGroupId,classGroupId));
     }
 
     @ApiOperation(value = "乐团修改--学员缴费记录--可新增学员列表")