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

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

@@ -355,11 +355,5 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     List<Map<Integer, String>> getStudentSubjectMapList(@Param("studentIds") List<Integer> studentIds);
 
-    /**
-     * 获取新增人数占比（已上乐团课小于等于4）
-     * @return
-     */
-    List<BaseMapDto<Integer,Long>> getOrganCloudNewStudentNum(@Param("musicGroupIds") List<String> musicGroupIds, @Param("userIds") List<Integer> userIds);
-
     List<IndexBaseMonthData> groupOrganId(@Param("organIds") List<Integer> organIds, @Param("userIds") List<Integer> userIds);
 }

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

@@ -681,6 +681,4 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     List<Integer> findStudentIds();
-
-    List<Integer> findNoCourseStudentIds();
 }

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

@@ -542,19 +542,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		//云教练新用户人数
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_NEW_STUDENT_NUM)) {
-			//获取新增人数占比（已上乐团课小于等于4）
-			//获取有在读学员的乐团编号
-			//获取有在读学员的学员编号
 			List<Integer> studentIdList = studentRegistrationDao.findStudentIds();
-//			List<BaseMapDto<Integer, Long>> studentMusicCourseNum = studentDao.getOrganCloudNewStudentNum(musicGroupIds,studentIdList);
-//			//获取有乐团没排课的数据
-//			List<Integer> noCourseStudentIdList = studentRegistrationDao.findNoCourseStudentIds();
-//			List<Integer> userIdList = new ArrayList<>();
-//			if(!CollectionUtils.isEmpty(studentMusicCourseNum)){
-//				List<BaseMapDto<Integer, Long>> collect = studentMusicCourseNum.stream().filter(e -> e.getValue() < 5).collect(Collectors.toList());
-//				userIdList = collect.stream().map(e -> e.getKey()).collect(Collectors.toList());
-//			}
-//			userIdList.addAll(noCourseStudentIdList);
 			saveData(studentDao.groupOrganId(null,studentIdList),LocalDate.now().toString(),IndexDataType.CLOUD_NEW_STUDENT_NUM);
 		}
 

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

@@ -1186,24 +1186,6 @@
             #{studentId}
         </foreach>
     </select>
-    <select id="getOrganCloudNewStudentNum" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
-        SELECT cssp.`user_id_` 'key',count(cs.`id_`) 'value' FROM `course_schedule_student_payment` cssp
-        LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
-        WHERE cs.`status_` = 'OVER' AND cs.`group_type_` = 'MUSIC' AND cs.`del_flag_` = 0
-        <if test="musicGroupIds != null and musicGroupIds.size() > 0">
-            AND cs.music_group_id_ IN
-            <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
-                #{musicGroupId}
-            </foreach>
-        </if>
-        <if test="userIds != null and userIds.size() > 0">
-            AND cssp.user_id_ IN
-            <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-                #{userId}
-            </foreach>
-        </if>
-        GROUP BY cssp.`user_id_`
-    </select>
     <select id="groupOrganId" resultMap="com.ym.mec.biz.dal.dao.IndexBaseMonthDataDao.IndexBaseMonthData">
         SELECT su.organ_id_,CURDATE() month_,
                COUNT(DISTINCT su.id_) total_num_ ,

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

@@ -1689,19 +1689,12 @@
     </select>
     <select id="findStudentIds" resultType="java.lang.Integer">
         SELECT DISTINCT sr.user_id_ FROM student_registration sr
-                                             LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         WHERE sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
           AND sr.user_id_ NOT IN (SELECT DISTINCT(cssp.`user_id_`)  FROM `course_schedule_student_payment` cssp
-                                                                             LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
-                                                                             LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
-                                  WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
-                                  GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) > 4)
-    </select>
-    <select id="findNoCourseStudentIds" resultType="java.lang.Integer">
-        SELECT DISTINCT sr.user_id_ FROM student_registration sr
-                                             LEFT JOIN sys_user su ON su.id_ = sr.user_id_
-        WHERE sr.music_group_id_ IN (SELECT mg.id_ FROM music_group mg
-                                     WHERE mg.id_ NOT IN (SELECT DISTINCT music_group_id_ FROM course_schedule WHERE group_type_ = 'MUSIC')
-                                       AND mg.status_ = 'PROGRESS') AND sr.music_group_status_ = 'NORMAL'
+                                                 LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
+                                                 LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
+      WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
+      GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) > 4) AND sr.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
     </select>
 </mapper>