Просмотр исходного кода

Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_export_0814

zouxuan 1 год назад
Родитель
Сommit
4da7701de2
2 измененных файлов с 19 добавлено и 6 удалено
  1. 18 5
      mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml
  2. 1 1
      pom.xml

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

@@ -155,7 +155,7 @@
         <if test="recentFlag !=null and recentFlag == true">
              max(sms.create_time_) desc,
         </if>
-		 ses.cbs_music_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
+        ses.sort_group_, ses.sort_num_, ses.sort_num2_, ses.alias_
 		<include refid="global.limit"/>
 	</select>
 	
@@ -205,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>
@@ -229,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>
 
@@ -237,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},
@@ -250,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>

+ 1 - 1
pom.xml

@@ -26,7 +26,7 @@
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.8-RC1</com.microsvc.toolkit.version>
-		<cbs.version>1.0.20</cbs.version>
+		<cbs.version>1.0.22</cbs.version>
 	</properties>
 
 	<dependencyManagement>