update

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/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/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