zouxuan 5 سال پیش
والد
کامیت
89267e5c9a

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -39,7 +39,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param musicGroupId
      * @return
      */
-    List<Map<Integer, Long>> countPayNum(@Param("musicGroupId") String musicGroupId);
+    List<Map<Integer, Integer>> countPayNum(@Param("musicGroupId") String musicGroupId);
 
     /**
      * 学生报名缴费金额详情
@@ -206,7 +206,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param musicGroupId
      * @return
      */
-    List<Map<Long, Long>> countApplyNum(String musicGroupId);
+    List<Map<Integer, Integer>> countApplyNum(String musicGroupId);
 
     /**
      * 根据家长手机号获取用户编号

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SubjectGoodsMapperDao;
@@ -60,14 +61,14 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     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<Integer,Integer> applyNum = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(studentRegistrationDao.countApplyNum(musicGroupId))),HashMap.class);
+        Map<Integer, Integer> payNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(studentRegistrationDao.countPayNum(musicGroupId))),HashMap.class);
+        subApplyDetail.forEach(detail ->{
+            Integer num = payNumMap.get(detail.getSubjectId());
+            detail.setPayNum(num == null?0:num);
+            num = applyNum.get(detail.getSubjectId());
+            detail.setApplyStudentNum(num == null?0:num);
+        });
         return subApplyDetail;
     }