Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseScheduleQueryInfo.java

@@ -35,6 +35,17 @@ public class CourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程编号")
     private Integer courseScheduleId;
 
+    @ApiModelProperty(value = "是否获取班级所有课程（不限制老师）")
+    private boolean findTotal = false;
+
+    public boolean getFindTotal() {
+        return findTotal;
+    }
+
+    public void setFindTotal(boolean findTotal) {
+        this.findTotal = findTotal;
+    }
+
     public Integer getCourseScheduleId() {
         return courseScheduleId;
     }

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

@@ -2080,7 +2080,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 TeachingTeachers.addAll(currentCourseTeachingTeachers);
                 dataList.get(i).setTeachingTeachers(TeachingTeachers);
                 dataList.get(i).setTeacherNum(TeachingTeachers.size());
-                Long studentNum = studentNumCourseMap.get(scheduleDto.getCourseScheduleId());
+                Long studentNum = studentNumCourseMap.get(scheduleDto.getCourseScheduleId().longValue());
                 if (Objects.nonNull(studentNum)) {
                     scheduleDto.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
                 } else {

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

@@ -2584,7 +2584,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if (null == user) {
             throw new BizException("请登录");
         }
-        queryInfo.setUserId(user.getId().longValue());
+        if(!queryInfo.getFindTotal()){
+            queryInfo.setUserId(user.getId().longValue());
+        }
         PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
         if (Objects.isNull(queryInfo.getDate())) {

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

@@ -1883,20 +1883,30 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         Integer teamTeacherId = newMusicGroup.getTeamTeacherId();
         Integer educationalTeacherId = newMusicGroup.getEducationalTeacherId();
-        Integer directorUserId = newMusicGroup.getDirectorUserId();
+
         ImGroupMember[] oldImGroupMembers1 = {new ImGroupMember(oldMusicGroup.getTeamTeacherId().toString())};
         ImGroupMember[] nowImGroupMembers1 = {new ImGroupMember(teamTeacherId.toString())};
         ImGroupMember[] oldImGroupMembers2 = {new ImGroupMember(oldMusicGroup.getEducationalTeacherId().toString())};
         ImGroupMember[] nowImGroupMembers2 = {new ImGroupMember(educationalTeacherId.toString())};
-        ImGroupMember[] oldImGroupMembers3 = {new ImGroupMember(oldMusicGroup.getDirectorUserId().toString())};
+
+        Integer oldDirectorUserId = oldMusicGroup.getDirectorUserId();
+        if(oldDirectorUserId == null){
+            oldDirectorUserId = teamTeacherId;
+        }
+        Integer directorUserId = newMusicGroup.getDirectorUserId();
+        if(directorUserId == null){
+            directorUserId = teamTeacherId;
+        }
+
+        ImGroupMember[] oldImGroupMembers3 = {new ImGroupMember(oldDirectorUserId.toString())};
         ImGroupMember[] nowImGroupMembers3 = {new ImGroupMember(directorUserId.toString())};
         classGroups.forEach(e -> {
-            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers1, e.getName()));
-            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers1, e.getName()));
-            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers2, e.getName()));
-            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers2, e.getName()));
             imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers3, e.getName()));
             imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers3, e.getName()));
+            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers2, e.getName()));
+            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers2, e.getName()));
+            imFeignService.groupQuit(new ImGroupModel(e.getId().toString(), oldImGroupMembers1, e.getName()));
+            imFeignService.groupJoin(new ImGroupModel(e.getId().toString(), nowImGroupMembers1, e.getName()));
         });
     }
 

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

@@ -1137,7 +1137,9 @@
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             AND cs.class_group_id_ = #{classGroupId}
-            AND csts.user_id_ = #{userId}
+            <if test="userId != null">
+                AND csts.user_id_ = #{userId}
+            </if>
             <if test="onlyHistory!=null and onlyHistory==1">
                 AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ )&lt;now()
             </if>
@@ -1196,7 +1198,10 @@
         LEFT JOIN sys_user ssu ON sa.user_id_=ssu.id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
+        AND sa.class_group_id_=#{classGroupId}
+        <if test="userId != null">
+            AND sa.teacher_id_=#{userId}
+        </if>
         GROUP BY sa.course_schedule_id_
         ORDER BY cs.id_
         <include refid="global.limit"/>
@@ -1218,7 +1223,10 @@
             LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
+        AND sa.class_group_id_=#{classGroupId}
+        <if test="userId != null">
+            AND sa.teacher_id_=#{userId}
+        </if>
     </select>
     <select id="countClassCourseNumByMusicGroup" resultType="java.util.Map">
         SELECT
@@ -1767,7 +1775,7 @@
         SELECT COUNT(*) FROM course_schedule WHERE class_group_id_=#{classGroupId} AND CONCAT(class_date_,' ',end_class_time_)&lt;#{currentCourseDate} AND del_flag_ = 0
     </select>
     <select id="countCourseScheduleByMusicGroupId" resultType="java.lang.Integer">
-        SELECT count(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{musicGroupId} and cs.group_type_ = 'MUSIC' and cs.status_ != 'OVER' LIMIT 1
+        SELECT count(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{musicGroupId} and cs.group_type_ = 'MUSIC' and cs.status_ != 'OVER' AND cs.del_flag_ = 0 LIMIT 1
     </select>
     <select id="findClassGroupCourseSchedules" resultMap="CourseSchedule">
         SELECT

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

@@ -428,7 +428,6 @@
             <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
                 #{courseScheduleId}
             </foreach>
-        AND (update_time_!='1970-01-01 00:00:00' OR update_time_ IS NULL)
         GROUP BY
             course_schedule_id_
     </select>

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

@@ -893,7 +893,7 @@
     <select id="queryUserVipNames" resultType="java.util.Map">
         SELECT cgsm.user_id_ 'key',GROUP_CONCAT(vg.name_)'value' FROM class_group_student_mapper cgsm
         LEFT JOIN vip_group vg ON cgsm.music_group_id_ = vg.id_
-        WHERE vg.group_status_ IN (2,4) AND cgsm.user_id_ IN
+        WHERE vg.group_status_ IN (2,4,6) AND cgsm.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
@@ -906,7 +906,7 @@
         WHEN cgsm.status_ = 'QUIT_SCHOOL' THEN '休学' END) 'value'
         FROM class_group_student_mapper cgsm
         LEFT JOIN vip_group vg ON cgsm.music_group_id_ = vg.id_
-        WHERE vg.group_status_ IN (2,4) AND cgsm.user_id_ IN
+        WHERE vg.group_status_ IN (2,4,6) AND cgsm.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>