Prechádzať zdrojové kódy

Merge branch 'zx_saas_cbs_category' of http://git.dayaedu.com/yonge/mec into test

zouxuan 11 mesiacov pred
rodič
commit
667e3cd347

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

@@ -186,7 +186,7 @@
 			update sys_music_score set music_score_categories_id_ = #{item.musicSheetCategoryId},
 			client_type_ = 'SMART_PRACTICE',type_ = 'COMMON',
 			rank_ids_ = CASE WHEN #{item.paymentType} = 'FREE' THEN NULL ELSE '1' END,
-			order_ = #{item.sortNo},del_flag_ = 0,show_flag_ = #{item.status},
+			order_ = #{item.sortNo},del_flag_ = 0,client_show_flag_ = #{item.status},
 			score_type_ = #{item.scoreType},is_convertible_score_ = #{item.isConvertibleScore}
 			<if test="item.musicSheetUpdate != null">
 				,name_ = #{item.musicSheetUpdate.name},
@@ -197,7 +197,7 @@
 				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType},
 				is_all_subject_ = #{item.musicSheetUpdate.isAllSubject},
 				cbs_music_categories_id_ = #{item.musicSheetUpdate.musicCategoryId},
-				client_show_flag_ = #{item.musicSheetUpdate.platformStatus}
+				show_flag_ = #{item.musicSheetUpdate.platformStatus}
 			</if>
 			where cbs_music_sheet_id_ = #{item.musicSheetId}
 		</foreach>
@@ -220,7 +220,7 @@
 		play_mode_ = #{param.playMode},
 		music_sheet_type_ = #{param.musicSheetType},
 		is_all_subject_ = #{param.isAllSubject},
-		client_show_flag_ = #{param.platformStatus},
+		show_flag_ = #{param.platformStatus},
 		cbs_music_categories_id_ = #{param.musicCategoryId}
 		where cbs_music_sheet_id_ = #{param.id}
 	</update>
@@ -228,7 +228,7 @@
 	<insert id="batchInsert">
 		insert into sys_music_score
 		(cbs_music_categories_id_,client_type_,type_,rank_ids_,order_
-		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,client_show_flag_,cbs_music_sheet_id_,music_sheet_type_,
+		,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_)
 		values
 		<foreach collection="vos" item="item" separator=",">