增加乐器采购清单确认接口

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

@@ -59,15 +59,15 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     @Override
     public List<SubjectApplyDetailDto> findSubApplyDetail(String musicGroupId) {
         List<SubjectApplyDetailDto> subApplyDetail = subjectDao.findSubApplyDetail(musicGroupId);
-        //统计当前乐团不同声部的报名人数
-        Map<Long,Long> applyNum = MapUtil.convertMybatisMap(studentRegistrationDao.countApplyNum(musicGroupId));
-        Map<Integer, Long> payNumMap = MapUtil.convertMybatisMap(studentRegistrationDao.countPayNum(musicGroupId));
-        subApplyDetail.forEach(detail ->{
-            Long num = payNumMap.get(detail.getSubjectId());
-            detail.setPayNum(num == null?0:num.intValue());
-            num = applyNum.get(detail.getSubjectId().longValue());
-            detail.setApplyStudentNum(num == null?0:num.intValue());
-        });
+//        //统计当前乐团不同声部的报名人数
+//        Map<Long,Long> applyNum = MapUtil.convertMybatisMap(studentRegistrationDao.countApplyNum(musicGroupId));
+//        Map<Integer, Long> payNumMap = MapUtil.convertMybatisMap(studentRegistrationDao.countPayNum(musicGroupId));
+//        subApplyDetail.forEach(detail ->{
+//            Long num = payNumMap.get(detail.getSubjectId());
+//            detail.setPayNum(num == null?0:num.intValue());
+//            num = applyNum.get(detail.getSubjectId().longValue());
+//            detail.setApplyStudentNum(num == null?0:num.intValue());
+//        });
         return subApplyDetail;
     }
 

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

@@ -110,7 +110,7 @@
         <result column="not_part_class_num_" property="notPartClassNum"/>
     </resultMap>
     <select id="findSubApplyDetail" resultMap="subApplyDetail">
-        SELECT mgsp.subject_id_,s.name_,mgsp.expected_student_num_,mgsp.id_ music_group_subject_plan_id_
+        SELECT mgsp.subject_id_,s.name_,mgsp.expected_student_num_,mgsp.apply_student_num_,mgsp.paid_student_num_ pay_num_,mgsp.id_ music_group_subject_plan_id_
         FROM music_group_subject_plan mgsp
         LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_
         WHERE mgsp.music_group_id_ = #{musicGroupId} AND s.del_flag_ = 0