Merge remote-tracking branch 'origin/master'

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

@@ -391,6 +391,14 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * 查询对应类型所有班级列表
      *
      * @param musicGroupId
+     * @return
+     */
+    List<ClassGroup> findClassGroups(@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 查询对应类型所有班级列表
+     *
+     * @param musicGroupId
      * @param type
      * @return
      */

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

@@ -674,43 +674,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ImGroupModel> queryUserGroups(Integer userId, String search) {
-        /*List<ImGroupModel> imGroupModels = musicGroupDao.queryUserGroups(userId, search);
-
-        if (imGroupModels != null && imGroupModels.size() > 0) {
-            //获取相关的所有乐团
-            Set<String> musicGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
-            List<MusicGroup> musicGroups = musicGroupDao.queryListByIds(musicGroupIds);
-
-            //获取乐团群用户总数map
-            List<Map<String, BigDecimal>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(StringUtils.join(musicGroupIds, ","));
-            Map<String, BigDecimal> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
-            MusicGroup musicGroup;
-            Set<Integer> teachers;
-            for (ImGroupModel e : imGroupModels) {
-                teachers = e.getName() == null ? new HashSet<>() : new HashSet(Arrays.asList(e.getName().split(",")));
-                musicGroup = musicGroups.stream().filter(mg -> mg.getId().equals(e.getId())).findFirst().get();
-                //获取教学老师id列表
-                teachers.add(musicGroup.getTeamTeacherId());
-                teachers.add(musicGroup.getEducationalTeacherId());
-                teachers.add(musicGroup.getOperatorUserId());
-                teachers.add(musicGroup.getDirectorUserId());
-                teachers.removeAll(Collections.singleton(null));
-                //获取乐团群用户总数
-                BigDecimal count = musicGroupUserNumMap.get(e.getId());
-                e.setCount(count == null ? 0 : count.intValue() + teachers.size());
-            }
-        } else {
-            imGroupModels = new ArrayList<>();
-        }*/
         List<ImGroupModel> imGroupModels = classGroupDao.queryUserGroups(userId, search);
         if (imGroupModels != null && imGroupModels.size() > 0) {
             Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
             Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))), HashMap.class);
             imGroupModels.forEach(e -> {
-                if(StringUtils.isNotEmpty(e.getGroupName())){
-                    e.setName(e.getGroupName() + " " + e.getName());
-                }
                 Integer num = numsMap.get(Integer.parseInt(e.getId()));
                 e.setCount((num == null ? 0 : num) + e.getCount());
             });

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

@@ -2537,11 +2537,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         oldCourseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(),practiceCourseMinutes));
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(oldCourseSchedule);
-//        courseSchedules.forEach(e->{
-//            e.setId(null);
-//        });
         checkNewCourseSchedules(courseSchedules,false);
-        oldCourseSchedule.setId(courseSchedule.getId());
+        teacherAttendanceDao.batchUpdateTeacher(courseSchedules.stream().map(e->e.getId()).collect(Collectors.toSet()),oldCourseSchedule.getActualTeacherId());
         courseScheduleDao.update(oldCourseSchedule);
     }
 

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

@@ -1856,7 +1856,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     private void updateTeamTeacher(MusicGroup oldMusicGroup, MusicGroup newMusicGroup) {
-        List<ClassGroup> classGroups = classGroupDao.findClassGroupByMusicGroupIdAndType(newMusicGroup.getId(), null);
+        //获取当前乐团所有班级
+        List<ClassGroup> classGroups = classGroupDao.findClassGroups(newMusicGroup.getId());
         if (classGroups == null || classGroups.size() == 0) {
             return;
         }

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

@@ -142,9 +142,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			//获取班级老师总数map
 			Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))),HashMap.class);
 			imGroupModels.forEach(e -> {
-				if(StringUtils.isNotEmpty(e.getGroupName())){
-					e.setName(e.getGroupName() + " " + e.getName());
-				}
 				Integer num = numsMap.get(Integer.parseInt(e.getId()));
 				e.setCount((num == null ? 0 : num) + e.getCount());
 			});
@@ -181,9 +178,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(musicGroupIds != null && musicGroupIds.size() > 0){
 				Map<String, String> musicGroupNameMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
 				userDtos.forEach(e->{
-					if(StringUtils.isNotEmpty(musicGroupNameMap.get(e.getMusicGroupId()))){
-						e.setName(musicGroupNameMap.get(e.getMusicGroupId()) + " " + e.getName());
-					}
+					e.setMusicGroupName(musicGroupNameMap.get(e.getMusicGroupId()));
 				});
 			}
 		}

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

@@ -774,6 +774,11 @@
         AND del_flag_='0'
     </select>
 
+    <select id="findClassGroups" resultMap="ClassGroup">
+        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}
+        AND del_flag_='0' AND group_type_ NOT IN ('PRACTICE','VIP','HIGH')
+    </select>
+
     <!-- 根据合奏班id获取子班及老师 -->
     <select id="findClassGroupByMixClassGroupId" resultMap="ClassGroupTeachers">
         SELECT * FROM class_group WHERE id_ IN

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

@@ -711,7 +711,8 @@
         LEFT JOIN organization o ON su.organ_id_ = o.id_
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_ AND cssp.music_group_id_ = sr.music_group_id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
-        WHERE cssp.id_ IS NOT NULL AND su.user_type_ LIKE '%STUDENT%' AND (sr.music_group_status_ != 'QUIT' OR sr.id_ IS NULL)
+        WHERE cssp.id_ IS NOT NULL AND su.user_type_ LIKE '%STUDENT%'
+        AND (sr.music_group_status_ != 'QUIT' OR sr.id_ IS NULL)
         AND (mg.status_ = 'PROGRESS' OR vg.group_status_ IN (2,4))
         <if test="organId != null and organId != ''">
             AND FIND_IN_SET(su.organ_id_,#{organId})

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

@@ -362,12 +362,11 @@
     </update>
     <update id="batchUpdateTeacher">
         UPDATE teacher_attendance
-        SET teacher_id_ = #{teacherId}
+        SET teacher_id_ = #{teacherId},sign_in_time_ = null,sign_in_status_ = null,sign_out_status_ = null,sign_out_time_= null
         WHERE course_schedule_id_ IN
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
         </foreach>
-        AND sign_in_status_ IS NULL AND sign_out_status_ IS NULL
     </update>
 
     <delete id="deleteByMusicGroupId" parameterType="map" >