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

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

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

@@ -197,13 +197,6 @@ public class StudentManageController extends BaseController {
 			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getSubjectIdList());
 			student.setSubjectNames(subjectList.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
 		}
-		
-		if(StringUtils.isNotBlank(student.getExtSubjectIds())){
-			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
-			
-			student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
-		}
-
         List<CloudTeacherOrder> dataList = cloudTeacherOrderDao.queryByUserIdAndStatus(user.getId(),1);
         if(dataList != null && dataList.size() > 0){
         	datas.put("isExistPendingMember", true);

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

@@ -1332,6 +1332,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         // 学员会员信息
         datas.put("vipInfo", cloudTeacherOrderService.getEffectiveCloudTeacherOrder(Lists.newArrayList(student.getUserId())));
 
+        if(StringUtils.isNotBlank(student.getExtSubjectIds())){
+            List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
+
+            student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
+        }
 
         // 通过学生声部换乐器ID
         if (StringUtils.isNotBlank(student.getSubjectIdList())) {

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

@@ -155,9 +155,7 @@
         <if test="recentFlag !=null and recentFlag == true">
              max(sms.create_time_) desc,
         </if>
-        CONVERT(ses.name_ USING gbk) COLLATE gbk_chinese_ci,
-        ses.name_ COLLATE utf8mb4_bin,
-        ses.name_ REGEXP '^[0-9]' DESC, ses.create_time_ DESC
+        ses.sort_group_, ses.sort_num_, ses.sort_num2_, ses.alias_
 		<include refid="global.limit"/>
 	</select>
 	
@@ -207,7 +205,11 @@
 				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType},
 				is_all_subject_ = #{item.musicSheetUpdate.isAllSubject},
 				cbs_music_categories_id_ = #{item.musicSheetUpdate.musicCategoryId},
-				show_flag_ = #{item.musicSheetUpdate.platformStatus}
+				show_flag_ = #{item.musicSheetUpdate.platformStatus},
+				alias_ = #{item.musicSheetUpdate.alias},
+				sort_num_ = #{item.musicSheetUpdate.sortNum},
+				sort_group_ = #{item.musicSheetUpdate.sortGroup},
+				sort_num2_ = #{item.musicSheetUpdate.sortNum2}
 			</if>
 			where cbs_music_sheet_id_ = #{item.musicSheetId}
 		</foreach>
@@ -231,7 +233,11 @@
 		music_sheet_type_ = #{param.musicSheetType},
 		is_all_subject_ = #{param.isAllSubject},
 		show_flag_ = #{param.platformStatus},
-		cbs_music_categories_id_ = #{param.musicCategoryId}
+		cbs_music_categories_id_ = #{param.musicCategoryId},
+		alias_ = #{param.alias},
+		sort_num_ = #{param.sortNum},
+		sort_group_ = #{param.sortGroup},
+		sort_num2_ = #{param.sortNum2}
 		where cbs_music_sheet_id_ = #{param.id}
 	</update>
 
@@ -239,7 +245,7 @@
 		insert into sys_music_score
 		(cbs_music_categories_id_,client_type_,type_,rank_ids_,order_
 		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,client_show_flag_,show_flag_,cbs_music_sheet_id_,music_sheet_type_,
-		score_type_,is_convertible_score_,is_all_subject_)
+		score_type_,is_convertible_score_,is_all_subject_,alias_,sort_num_,sort_group_,sort_num2_)
 		values
 		<foreach collection="vos" item="item" separator=",">
 			(#{item.musicSheetUpdate.musicCategoryId},
@@ -252,7 +258,12 @@
 			#{item.musicSheetUpdate.canEvaluate},
 			#{item.musicSheetUpdate.playMode},#{item.status},#{item.musicSheetUpdate.platformStatus},
 			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType},
-			#{item.scoreType},#{item.isConvertibleScore},#{item.musicSheetUpdate.isAllSubject}
+			#{item.scoreType},#{item.isConvertibleScore},
+			#{item.musicSheetUpdate.isAllSubject},
+			#{item.musicSheetUpdate.alias},
+			#{item.musicSheetUpdate.sortNum},
+			#{item.musicSheetUpdate.sortGroup},
+			#{item.musicSheetUpdate.sortNum2}
 			)
 		</foreach>
 	</insert>