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

mec-application/src/main/java/com/ym/mec/student/controller/SmsCodeController.java

@@ -34,13 +34,13 @@ public class SmsCodeController extends BaseController {
     @Autowired
     private RedissonClient redissonClient;
 
-    @ApiOperation(value = "发送登录短信验证码")
+    /*@ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String")
     @PostMapping(value = "/sendSms")
     public Object sendLoginVerifyCode(String mobile) throws Exception {
         smsCodeService.sendValidCode(mobile);
         return succeed();
-    }
+    }*/
 
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),

mec-application/src/main/java/com/ym/mec/teacher/controller/SmsCodeController.java

@@ -34,13 +34,13 @@ public class SmsCodeController extends BaseController {
     @Autowired
     private RedissonClient redissonClient;
 
-    @ApiOperation(value = "发送登录短信验证码")
+    /*@ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String")
     @PostMapping(value = "/sendSms")
     public Object sendLoginVerifyCode(String mobile) throws Exception {
         smsCodeService.sendValidCode(mobile);
         return succeed();
-    }
+    }*/
 
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),

mec-application/src/main/java/com/ym/mec/web/controller/SmsCodeController.java

@@ -34,13 +34,13 @@ public class SmsCodeController extends BaseController {
     @Autowired
     private RedissonClient redissonClient;
 
-    @ApiOperation(value = "发送登录短信验证码")
+    /*@ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String")
     @PostMapping(value = "/sendSms")
     public Object sendLoginVerifyCode(String mobile) throws Exception {
         smsCodeService.sendValidCode(mobile);
         return succeed();
-    }
+    }*/
 
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),

mec-application/src/main/resources/exportColumnMapper.ini

@@ -365,3 +365,7 @@ fieldColumns = ["organName","studentId","studentName","createTime","time","amoun
 [乐团梯队数据导出]
 headColumns = ["乐团","长笛","单簧管","萨克斯","小号","圆号","长号","上低音号","大号","小军鼓","合计"]
 fieldColumns = ["musicGroupName","flute","clarinet","saxophone","trumpet","horn","trombone","euphonium","tuba","snareDrum","total"]
+
+[云教练待激活明细]
+headColumns = ["分部","学员编号","学员姓名","手机号","学员声部","云教练类型","数量","缴费金额（元）","状态","取消原因","操作人","操作时间","获得资格时间"]
+fieldColumns = ["organName","studentId","name","phone","subjectName","type.msg","time","amount","status == 1 ? '待激活':'已取消'","cancelReason","operatorName","operateTime","createTime"]

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -261,7 +261,7 @@ public class TokenController extends BaseController {
 		return succeed("退出成功");
 	}
 
-	@GetMapping(value = "/checkToken",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	@GetMapping(value = "/checkToken")
 	@ApiOperation(value = "检查token")
 	public HttpResponseResult<Object> checkToken(HttpServletRequest request) throws IOException {
 

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

@@ -1941,6 +1941,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		//合并新课程和已存在的课程
 		List<CourseSchedule> allCourseSchedules;
 		if (!CollectionUtils.isEmpty(existCourseSchedules)) {
+			//如果是直播课，那么只校验同一个课程组的课程
+			CourseSchedule courseSchedule = courseSchedules.get(0);
+			if(courseSchedule.getType() == CourseScheduleType.LIVE){
+				existCourseSchedules = existCourseSchedules.stream().
+						filter(e -> e.getMusicGroupId().equals(courseSchedule.getMusicGroupId())).collect(Collectors.toList());
+			}
 			allCourseSchedules = ListUtils.sum(courseSchedules, existCourseSchedules);
 		} else {
 			allCourseSchedules = courseSchedules;

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

@@ -138,7 +138,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
-        	mgq.tenant_id_ = #{tenantId} AND (mgq.school_staff_audit_status_ IS NULL OR mgq.school_staff_audit_status_ = 'PASS')
+        	mgq.tenant_id_ = #{tenantId}
             <if test="ids != null and ids != ''">
                 AND FIND_IN_SET(mgq.id_,#{ids})
             </if>