feat:教师端课程组及课程组班级查询条件

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

@@ -310,7 +310,9 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [teacherId]
      * @describe 获取老师陪练课班级
      */
-    List<TeacherClassGroupDto> findTeacherPracticeClassGroup(@Param("teacherId") Long teacherId, @Param("status") String status);
+    List<TeacherClassGroupDto> findTeacherPracticeClassGroup(@Param("teacherId") Long teacherId,
+                                                             @Param("status") String status,
+                                                             @Param("groupName") String groupName);
 
     /**
      * 根据老师编号列表获取小课数量
@@ -327,7 +329,9 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [teacherId]
      * @describe 获取老师vip课班级
      */
-    List<TeacherClassGroupDto> findTeacherVipClassGroup(@Param("teacherId") Long teacherId, @Param("status") String status);
+    List<TeacherClassGroupDto> findTeacherVipClassGroup(@Param("teacherId") Long teacherId,
+                                                        @Param("status") String status,
+                                                        @Param("groupName") String groupName);
 
     /**
      * 根据合奏班编号列表，获取单技班名称列表

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

@@ -1468,13 +1468,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<TeacherClassGroupDto> teacherMusicClassGroup;
         switch (type) {
             case "VIP":
-                teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue(),status);
+                teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue(),status,groupName);
                 break;
             case "MUSIC_GROUP":
                 teacherMusicClassGroup = classGroupDao.findTeacherMusicClassGroup(user.getId().longValue(),groupName);
                 break;
             case "PRACTICE":
-                teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue(),status);
+                teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue(),status, groupName);
                 break;
             default:
                 throw new BizException("课程类型错误");

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

@@ -1156,7 +1156,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		}
 
 		if(StringUtils.isBlank(user.getRealName())||StringUtils.isBlank(user.getIdCardNo())){
-			return BaseController.failed(HttpStatus.PARTIAL_CONTENT, "");
+			return BaseController.failed(HttpStatus.PARTIAL_CONTENT, user, "");
 		}
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);

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

@@ -665,6 +665,9 @@
             <if test="status == 'FINISH'">
                 AND pg.group_status_ = 'FINISH'
             </if>
+            <if test="groupName!=null and groupName!=''">
+                AND pg.name_ LIKE CONCAT('%', #{groupName}, '%')
+            </if>
     </select>
     <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
         SELECT
@@ -700,6 +703,9 @@
             <if test="status == 'FINISH'">
                 AND vg.group_status_ = 4
             </if>
+            <if test="groupName!=null and groupName!=''">
+                AND vg.name_ LIKE CONCAT('%', #{groupName}, '%')
+            </if>
         GROUP BY
         vg.id_,cg.id_
     </select>

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

@@ -23,6 +23,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -80,6 +81,9 @@ public class TeacherAttendanceController extends BaseController {
     public HttpResponseResult studentAttendanceNormalRemind(Long courseId){
         //获取正常签到的学生信息
         List<StudentAttendance> studentAttendances = studentAttendanceDao.findByCourseId(courseId);
+        if(CollectionUtils.isEmpty(studentAttendances)){
+            return succeed();
+        }
         List<StudentAttendance> normal = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.NORMAL).collect(Collectors.toList());
         if (normal != null && normal.size() > 0) {
             Map<Integer, String> receivers = new HashMap<>();