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

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

@@ -86,4 +86,12 @@ public interface SubjectService extends BaseService<Integer, Subject> {
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 
     List<Subject> findBySubjectByIdList(String subjectIdList);
+
+    /**
+     * 根据声部id字符串查询
+     *
+     * @param subIds
+     * @return
+     */
+    List<String> findBySubIds(String subIds);
 }

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

@@ -332,7 +332,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
             }
             //检测新排课冲突
-            courseScheduleService.checkNewCourseSchedules(courseScheduleList,false);
+            courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
             courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
             List<ImGroupMember> groupMembers = musicGroupService.queryMusicGroupTeachers(highClassGroup.getMusicGroupId());
             groupMembers.add(new ImGroupMember(classGroupTeacherMapper.getUserId().toString()));
@@ -564,7 +564,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
             List<Map<Integer, Long>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
-            Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(nums)),HashMap.class);
+            Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(nums)), HashMap.class);
             imGroupModels.forEach(e -> {
                 Integer num = numsMap.get(e.getId());
                 e.setCount((num == null ? 0 : num) + e.getCount());
@@ -1587,14 +1587,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ClassGroup> highClassGroupList(String musicGroupId) {
-        List<Subject> subjectList = subjectService.findAll(new HashMap<>());
         List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
         for (ClassGroup classGroup : classGroupList) {
-            for (Subject subject : subjectList) {
-                if (classGroup.getSubjectIdList().equals(subject.getId().toString())) {
-                    classGroup.setSubjectName(subject.getName());
-                }
-            }
+            List<String> subjects = subjectService.findBySubIds(classGroup.getSubjectIdList());
+            String subjectName = StringUtils.join(subjects, "/");
+            classGroup.setSubjectName(subjectName);
         }
         return classGroupList;
     }

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

@@ -175,4 +175,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     public List<Subject> findBySubjectByIdList(String subjectIdList) {
         return subjectDao.findBySubjectByIdList(subjectIdList);
     }
+
+    @Override
+    public List<String> findBySubIds(String subIds) {
+        return subjectDao.findBySubIds(subIds);
+    }
 }