Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

@@ -1893,7 +1893,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param classGroupSet
      * @return
      */
-    List<Map<Integer, Integer>> countPreMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet);
+    List<Map<Integer, BigDecimal>> countPreMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet);
 
     /**
      * 获取进行中或已结束的预排课课程

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

@@ -3491,7 +3491,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroupSchoolTermCourseDetail termCourseDetail = musicGroupSchoolTermCourseDetailDao.findByCourseDateAndMusicGroupId(musicGroupId, null,0);
         Map<Integer, Long> preTotalNumMap = null;
         Map<Integer, Long> preSubMinutesMap = null;
-        Map<Integer, Integer> preMinutesMap = null;
+        Map<Integer, BigDecimal> preMinutesMap = null;
         if(termCourseDetail != null){
             preTotalNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreTotalNumByClassGroupId(classGroupSet));
             preSubMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreSubMinutesByClassGroupId(classGroupSet,termCourseDetail.getId()));
@@ -3517,7 +3517,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             if(preMinutesMap != null){
                 if (preMinutesMap.containsKey(classGroup.getId())) {
-                    classGroup.setPreMinutes(preMinutesMap.get(classGroup.getId()));
+                    BigDecimal bigDecimal = preMinutesMap.get(classGroup.getId());
+                    classGroup.setPreMinutes(bigDecimal==null?0:bigDecimal.intValue());
                 }
             }
             if(preTotalNumMap != null){