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

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

@@ -226,8 +226,12 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
 
+    //云教练作业开关0关1开
     String HOMEWORK_OPEN_FLAG = "homework_open_flag";
 
+    //云教练免费体验开关0关1开
+    String FREE_CLOUD_OPEN_FLAG = "free_cloud_open_flag";
+
     //乐团问卷调查编号
     String MUSIC_GROUP_TOPIC_ID = "music_group_topic_id";
 

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

@@ -114,7 +114,8 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
     @Override
     public List<String> queryCourseType(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		getCourseDetail(musicGroupTrainPlanSaveDto);
-		return courseScheduleDao.queryCourseTypeByClassGroupIds(musicGroupTrainPlanSaveDto);
+		List<String> strings = courseScheduleDao.queryCourseTypeByClassGroupIds(musicGroupTrainPlanSaveDto);
+		return strings;
     }
 
 	@Override

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

@@ -2362,6 +2362,7 @@
         GROUP BY cs.class_group_id_
     </select>
     <select id="queryCourseTypeByClassGroupIds" resultType="java.lang.String">
+        SELECT DISTINCT c.type_ FROM (
         SELECT DISTINCT cs.type_ FROM course_schedule cs
         WHERE cs.class_group_id_ = #{dto.classGroupId}
         <if test="dto.startSchoolTerm != null">
@@ -2371,6 +2372,15 @@
             AND cs.class_date_ &lt;= DATE_FORMAT(#{dto.endSchoolTerm}, '%Y%m%d')
         </if>
         AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+        UNION ALL
+        SELECT DISTINCT tp.course_type_ type_ FROM music_group_train_plan tp
+        WHERE tp.class_group_id_ = #{dto.classGroupId}
+        <if test="dto.startSchoolTerm != null">
+            AND tp.start_school_term_ = DATE_FORMAT(#{dto.startSchoolTerm}, '%Y%m%d')
+        </if>
+        <if test="dto.endSchoolTerm != null">
+            AND tp.end_school_term_ = DATE_FORMAT(#{dto.endSchoolTerm}, '%Y%m%d')
+        </if>) c
     </select>
     <select id="countCurrentNumByClassGroupId" resultType="java.util.Map">
         SELECT cs.class_group_id_ 'key',COUNT(cs.id_) 'value' FROM course_schedule cs

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

@@ -143,8 +143,9 @@
 		WHERE c.course_num_ > (CASE WHEN t.course_num_ IS NULL THEN 0 ELSE t.course_num_ END)
 	</select>
     <select id="queryWaitCourseTrainPlan1" resultMap="WaitCourseTrainPlanDto">
-		SELECT c.class_group_id_,c.type_,t.course_num_ - (CASE WHEN c.course_num_ IS NULL THEN 0 ELSE c.course_num_ END) num_,c.name_
-		FROM (SELECT tp.class_group_id_,tp.course_type_ type_,COUNT(tp.id_) course_num_,'' name_ FROM music_group_train_plan tp
+		SELECT t.class_group_id_,t.type_,t.course_num_ - (CASE WHEN c.course_num_ IS NULL THEN 0 ELSE c.course_num_ END) num_,t.name_
+		FROM (SELECT tp.class_group_id_,tp.course_type_ type_,COUNT(tp.id_) course_num_,cg.name_ FROM music_group_train_plan tp
+		LEFT JOIN class_group cg ON cg.id_ = tp.class_group_id_
 		WHERE tp.music_group_id_ = #{dto.musicGroupId}
 		<if test="dto.startSchoolTerm != null">
 			AND tp.start_school_term_ = #{dto.startSchoolTerm}
@@ -154,8 +155,7 @@
 		</if>
 		GROUP BY tp.class_group_id_,tp.course_type_) t
 		LEFT JOIN (
-		SELECT cs.class_group_id_,cs.type_,COUNT(cs.id_) course_num_,cg.name_ FROM course_schedule cs
-		LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+		SELECT cs.class_group_id_,cs.type_,COUNT(cs.id_) course_num_,'' name_ FROM course_schedule cs
 		WHERE cs.music_group_id_ = #{dto.musicGroupId} AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
 		<if test="dto.startSchoolTerm != null">
 			AND cs.class_date_ >= DATE_FORMAT(#{dto.startSchoolTerm}, '%Y%m%d')

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

@@ -1594,7 +1594,7 @@
         si.goods_brand_ goodsBrand,si.goods_name_ goodsName,si.specification_ specification,si.create_time_ goodsBuyTime,si.start_time_ insuranceStartTime,si.end_time_ insuranceEndTime
 		from student_registration sr LEFT JOIN sys_user u on sr.user_id_ = u.id_ 
 		LEFT JOIN student s on s.user_id_ = sr.user_id_ LEFT JOIN `subject` sub on sub.id_ = sr.actual_subject_id_
-		LEFT JOIN student_instrument si on si.student_id_ = sr.user_id_
+		LEFT JOIN (select * from student_instrument where id_ in ((select max(id_) from student_instrument group by student_id_))) si on si.student_id_ = sr.user_id_
 		WHERE sr.music_group_status_ = 'NORMAL' 
 		<if test="musicGroupId != null">
 			AND sr.music_group_id_ = #{musicGroupId}