|
|
@@ -148,9 +148,7 @@
|
|
|
LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
|
|
|
<include refid="queryPageSql"/>
|
|
|
GROUP BY ses.id_
|
|
|
- ORDER BY CONVERT(ses.name_ USING gbk) COLLATE gbk_chinese_ci,
|
|
|
- ses.name_ COLLATE utf8mb4_bin,
|
|
|
- ses.name_ REGEXP '^[0-9]' DESC, ses.create_time_ DESC
|
|
|
+ ORDER BY ses.sort_group_, ses.sort_num_, ses.sort_num2_, ses.alias_
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
|
|
|
@@ -200,7 +198,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>
|
|
|
@@ -224,7 +226,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>
|
|
|
|
|
|
@@ -232,7 +238,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},
|
|
|
@@ -245,7 +251,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>
|
