feat:新增教师端乐团查询条件及乐团课表查询条件

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

@@ -300,7 +300,8 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [teacherId]
      * @describe 获取老师乐团班级
      */
-    List<TeacherClassGroupDto> findTeacherMusicClassGroup(@Param("teacherId") Long teacherId);
+    List<TeacherClassGroupDto> findTeacherMusicClassGroup(@Param("teacherId") Long teacherId,
+                                                          @Param("groupName") String groupName);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>

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

@@ -38,6 +38,28 @@ public class CourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否获取班级所有课程（不限制老师）")
     private boolean findTotal = false;
 
+    @ApiModelProperty(value = "开始上课日期")
+    private String startClassDate;
+
+    @ApiModelProperty(value = "结束上课日期")
+    private String endClassDate;
+
+    public String getStartClassDate() {
+        return startClassDate;
+    }
+
+    public void setStartClassDate(String startClassDate) {
+        this.startClassDate = startClassDate;
+    }
+
+    public String getEndClassDate() {
+        return endClassDate;
+    }
+
+    public void setEndClassDate(String endClassDate) {
+        this.endClassDate = endClassDate;
+    }
+
     public boolean getFindTotal() {
         return findTotal;
     }

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

@@ -234,7 +234,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>
      * @describe 获取老师所在班级列表
      */
-    List<TeacherClassGroupDto> findTeacherClassGroups(String type,String status);
+    List<TeacherClassGroupDto> findTeacherClassGroups(String type,String status, String groupName);
 
     /**
      * @Author: Joburgess

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

@@ -1455,7 +1455,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<TeacherClassGroupDto> findTeacherClassGroups(String type,String status) {
+    public List<TeacherClassGroupDto> findTeacherClassGroups(String type,String status, String groupName) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(user)) {
             throw new BizException("请登录");
@@ -1471,7 +1471,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue(),status);
                 break;
             case "MUSIC_GROUP":
-                teacherMusicClassGroup = classGroupDao.findTeacherMusicClassGroup(user.getId().longValue());
+                teacherMusicClassGroup = classGroupDao.findTeacherMusicClassGroup(user.getId().longValue(),groupName);
                 break;
             case "PRACTICE":
                 teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue(),status);

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

@@ -629,6 +629,9 @@
             AND cg.del_flag_ = 0
             AND cs.del_flag_ = 0
             AND mg.status_ = 'PROGRESS'
+            <if test="groupName!=null and groupName!=''">
+                AND mg.name_ LIKE CONCAT('%', #{groupName}, '%')
+            </if>
         GROUP BY cg.id_
     </select>
     <select id="findTeacherPracticeClassGroup" resultMap="TeacherClassGroupDto">

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

@@ -1484,6 +1484,12 @@
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
         </if>
+        <if test="startClassDate!=null">
+            AND cs.class_date_ &gt;= #{startClassDate}
+        </if>
+        <if test="endClassDate!=null">
+            AND cs.class_date_ &lt;= #{endClassDate}
+        </if>
         GROUP BY sa.course_schedule_id_
         ORDER BY cs.id_
         <include refid="global.limit"/>
@@ -1509,6 +1515,12 @@
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
         </if>
+        <if test="startClassDate!=null">
+            AND cs.class_date_ &gt;= #{startClassDate}
+        </if>
+        <if test="endClassDate!=null">
+            AND cs.class_date_ &lt;= #{endClassDate}
+        </if>
     </select>
     <select id="countClassCourseNumByMusicGroup" resultType="java.util.Map">
         SELECT cg.id_        as 'key',

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ClassGroupController.java

@@ -45,8 +45,8 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "教师关联班级获取")
     @GetMapping("/findTeacherClassGroups")
-    public Object findTeacherClassGroups(String type,String status){
-        return succeed(classGroupService.findTeacherClassGroups(type,status));
+    public Object findTeacherClassGroups(String type,String status, String groupName){
+        return succeed(classGroupService.findTeacherClassGroups(type,status,groupName));
     }
 
     @ApiOperation(value = "获取教师班级详情界面头部信息")