zouxuan 5 rokov pred
rodič
commit
bcc2630241

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -212,7 +212,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param classGroupIds
      * @return
      */
-    List<Map<Integer, Integer>> countTeacherNums(@Param("classGroupIds") String classGroupIds);
+    List<Map<Integer, Long>> countTeacherNums(@Param("classGroupIds") String classGroupIds);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>

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

@@ -506,11 +506,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (imGroupModels != null && imGroupModels.size() > 0) {
             Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
-            List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
-            Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
+            List<Map<Integer, Long>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
+            Map<Integer, Long> numsMap = MapUtil.convertMybatisMap(nums);
             imGroupModels.forEach(e -> {
-                Integer num = numsMap.get(e.getId());
-                e.setCount(num == null ? 0 : num + e.getCount());
+                Long num = numsMap.get(Integer.parseInt(e.getId()));
+                e.setCount((int)(num == null ? 0L : num) + e.getCount());
             });
         }
         return imGroupModels;

+ 4 - 5
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -158,12 +158,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(imGroupModels != null && imGroupModels.size() > 0){
 			Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			//获取班级老师总数map
-			List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds,","));
-			Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
+			List<Map<Integer, Long>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
+			Map<Integer, Long> numsMap = MapUtil.convertMybatisMap(nums);
 			imGroupModels.forEach(e -> {
-				//获取当前班级老师总数
-				Integer num = numsMap.get(e.getId());
-				e.setCount(num == null?0:num + e.getCount());
+				Long num = numsMap.get(Integer.parseInt(e.getId()));
+				e.setCount((int)(num == null ? 0L : num) + e.getCount());
 			});
 		}
 		return imGroupModels;