Merge branch 'yonge' of http://git.dayaedu.com/yonge/mec into yonge

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

@@ -968,7 +968,7 @@
         <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},subject_id_list_)
         </if>
-        AND type_='HIGH' AND del_flag_='0';
+        AND type_ IN ('HIGH','HIGH_ONLINE') AND del_flag_='0';
     </select>
     <select id="findByMusicGroupAndType" resultMap="ClassGroup">
         SELECT
@@ -1229,7 +1229,7 @@
         WHERE su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.id_=#{search}
     </select>
     <select id="countClassNumByType" resultType="java.lang.Integer">
-        SELECT COUNT(id_) FROM class_group WHERE type_ = 'HIGH' AND del_flag_ = '0'
+        SELECT COUNT(id_) FROM class_group WHERE type_ IN ('HIGH','HIGH_ONLINE') AND del_flag_ = '0'
     </select>
 
     <select id="findClassGroupSubjectNameMaps" resultType="java.util.Map">

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

@@ -49,7 +49,7 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult highReg(Integer classGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         ClassGroup classGroup = classGroupService.get(classGroupId);
-        if (classGroup == null || !classGroup.getType().equals(ClassGroupTypeEnum.HIGH) || classGroup.getDelFlag().equals(1)) {
+        if (classGroup == null || (!classGroup.getType().equals(ClassGroupTypeEnum.HIGH)&&!classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)) || classGroup.getDelFlag().equals(1)) {
             return failed("报名的班级不存在");
         }
         if (classGroup.getStudentNum().compareTo(classGroup.getExpectStudentNum()) >= 0) {
@@ -76,11 +76,16 @@ public class ClassGroupController extends BaseController {
         Map<String, Object> classGroupAndStatusMap = new HashMap<>();
         List<HighClassGroupDto> highClassGroups = classGroupService.findClassGroupByMusicGroupIdAndSubjectId(musicGroupId, studentRegistration.getActualSubjectId());
         List<ClassGroupStudentMapper> ClassGroupStudentMapper = classGroupStudentMapperDao.findHighClassGroupHasUser(musicGroupId, userId,ClassGroupTypeEnum.HIGH);
+        List<ClassGroupStudentMapper> highOnlineClassGroupStudentMapper = classGroupStudentMapperDao.findHighClassGroupHasUser(musicGroupId, userId,ClassGroupTypeEnum.HIGH_ONLINE);
         classGroupAndStatusMap.put("highClassGroups", highClassGroups);
         classGroupAndStatusMap.put("hasReg", false);
+        classGroupAndStatusMap.put("onlineHasReg", false);
         if (ClassGroupStudentMapper.size() > 0) {
             classGroupAndStatusMap.put("hasReg", true);
         }
+        if (highOnlineClassGroupStudentMapper.size() > 0) {
+            classGroupAndStatusMap.put("onlineHasReg", true);
+        }
         return succeed(classGroupAndStatusMap);
     }
 }