Merge remote-tracking branch 'origin/master'

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

@@ -1459,7 +1459,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
         for (ClassGroup classGroup : classGroupList) {
             for (Subject subject : subjectList) {
-                if (classGroup.getSubjectIdList().equals(subject.getId())) {
+                if (classGroup.getSubjectIdList().equals(subject.getId().toString())) {
                     classGroup.setSubjectName(subject.getName());
                 }
             }

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

@@ -198,7 +198,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		SysConfig advance_leave_hours = sysConfigDao.findByParamName("advance_leave_hours");
 		Map<String,Object> result=new HashMap<>(3);
 		result.put("vipAppealDaysRange",vip_appeal_days_range.getParanValue());
-		result.put("advanceLeaveHours",advance_leave_hours.getParanValue());
+		result.put("advanceLeaveHours",Integer.parseInt(advance_leave_hours.getParanValue()));
 		result.put("list",courseScheduleDao.getStudentCourseSchedulesWithDate(classDate,user.getId().longValue()));
 		return result;
 	}

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

@@ -642,8 +642,8 @@
 
     <select id="findClassGroupByMusicGroupIdAndType" resultMap="ClassGroup">
         SELECT * FROM class_group  WHERE music_group_id_=#{musicGroupId}
-        <if test="type !=null and type!=''">
-           AND type_=#{type}
+        <if test="type !=null ">
+           AND type_=#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
          AND del_flag_='0'
     </select>

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

@@ -77,6 +77,6 @@
 	</select>
 	
 	<select id="findByParamName" resultMap="SysConfig">
-		SELECT * FROM sys_config WHERE param_name_=#{paramName}
+		SELECT * FROM sys_config WHERE param_name_ = #{paramName}
 	</select>
 </mapper>

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

@@ -229,7 +229,7 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "小班报名详情")
-    @PostMapping("/highClassGroups")
+    @GetMapping("/highClassGroups")
     @PreAuthorize("@pcs.hasPermissions('classGroup/highClassGroups')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
     public HttpResponseResult highClassGroups(String musicGroupId) throws Exception {
@@ -237,7 +237,7 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "合奏子班列表（班级调整）")
-    @PostMapping("/classGroupAndTeacher")
+    @GetMapping("/classGroupAndTeacher")
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupAndTeacher')")
     @ApiImplicitParams({@ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
     public HttpResponseResult classGroupAndTeacher(int classGroupId) throws Exception {