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

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

@@ -363,7 +363,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             return pageInfo;
         }
 
-        Map<String, Group> groupMap = groups.stream().collect(Collectors.toMap(Group::getId, group -> group));
 
         List<CourseScheduleDto> dataList = null;
         int count = courseScheduleDao.countCourseSchedulesWithDate(params);
@@ -375,10 +374,21 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             List<Map<Integer, Integer>> courseStudentNumMaps = courseScheduleStudentPaymentDao.countCourseStudentNum(allCourseScheduleIds);
             Map<Long, Long> courseStudentNumMap = MapUtil.convertIntegerMap(courseStudentNumMaps);
 
+            List<Group> groupsT=new ArrayList<>();
+            groupsT.add(null);
+            List<Integer> teacherIds=new ArrayList<>();
+            for (CourseScheduleDto courseScheduleEndDto : dataList) {
+                Group group=new Group(courseScheduleEndDto.getMusicGroupId(),courseScheduleEndDto.getGroupType());
+                groupsT.add(group);
+                teacherIds.add(courseScheduleEndDto.getActualTeacherId());
+            }
+            groupsT = groupDao.findByGroupIds(groupsT);
+            Map<String, Group> idGroupMap = groupsT.stream().collect(Collectors.toMap(Group::getId, group -> group));
+
             for (int i=0;i<dataList.size();i++) {
                 Long studentNum=courseStudentNumMap.get(dataList.get(i).getId());
                 dataList.get(i).setTotalStudentNum(Objects.isNull(studentNum)?0:studentNum.intValue());
-                Group group = groupMap.get(dataList.get(i).getMusicGroupId());
+                Group group = idGroupMap.get(dataList.get(i).getMusicGroupId());
                 if(Objects.nonNull(group)){
                     dataList.get(i).setGroupName(group.getGroupName());
                 }
@@ -1564,22 +1574,22 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 //修改后的课程助教编号列表
                 List<Integer> newTeachingTeacherIdList = newCourseSchedule.getTeachingTeacherIdList();
                 List<Integer> newCreateSalaryTeachingTeacherIds = null;
-                if(!CollectionUtils.isEmpty(newTeachingTeacherIdList)){
-                    //找出重复的助教编号
-                    List<Integer> foundInCurrentCourseTeachingTeacherIds = newTeachingTeacherIdList.stream().filter(currentCourseTeachingTeacherIds::contains).collect(Collectors.toList());
 
-                    //需要重新生成课酬的助教列表
-                    newCreateSalaryTeachingTeacherIds = newTeachingTeacherIdList.stream()
-                            .filter(userId -> !foundInCurrentCourseTeachingTeacherIds.contains(userId))
-                            .collect(Collectors.toList());
-                    //被替换的助教列表
-                    List<Integer> beReplaceTeachingTeacherIds = currentCourseTeachingTeacherIds.stream()
-                            .filter(userId -> !foundInCurrentCourseTeachingTeacherIds.contains(userId))
-                            .collect(Collectors.toList());
-                    beReplaceTeacherIds.addAll(beReplaceTeachingTeacherIds);
+                //找出重复的助教编号
+                List<Integer> foundInCurrentCourseTeachingTeacherIds = newTeachingTeacherIdList.stream().filter(currentCourseTeachingTeacherIds::contains).collect(Collectors.toList());
+
+                //需要重新生成课酬的助教列表
+                newCreateSalaryTeachingTeacherIds = newTeachingTeacherIdList.stream()
+                        .filter(userId -> !foundInCurrentCourseTeachingTeacherIds.contains(userId))
+                        .collect(Collectors.toList());
+                //被替换的助教列表
+                List<Integer> beReplaceTeachingTeacherIds = currentCourseTeachingTeacherIds.stream()
+                        .filter(userId -> !foundInCurrentCourseTeachingTeacherIds.contains(userId))
+                        .collect(Collectors.toList());
+                beReplaceTeacherIds.addAll(beReplaceTeachingTeacherIds);
+
+                newCourseSchedule.setTeachingTeacherIdList(newCreateSalaryTeachingTeacherIds);
 
-                    newCourseSchedule.setTeachingTeacherIdList(newCreateSalaryTeachingTeacherIds);
-                }
 
                 if (!newCourseSchedule.isBishopTeacherSalaryNotCreate() || !CollectionUtils.isEmpty(newCreateSalaryTeachingTeacherIds)) {
                     newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());

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

@@ -448,6 +448,8 @@
             cs.student_num_,
             cs.leave_student_num_,
             cs.teach_mode_,
+            cs.music_group_id_,
+            cs.group_type_,
             cg.student_num_ total_student_num_,
             su.real_name_ teacher_name_,
             IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,