去掉曲目分类

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

@@ -6,7 +6,6 @@ import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -118,6 +118,8 @@ public class SysMusicScore {
 
 	private Integer showFlag = 0;
 
+	private Integer clientShowFlag = 0;
+
 	private String showName;
 
 	private Boolean isOpenMetronome;

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

@@ -210,6 +210,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
         record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         record.setExtStyleConfigJson(musicSheetApplication.getExtStyleConfigJson());
+        record.setClientShowFlag(musicSheetApplication.getStatus()?1:0);
 //        if(musicSheetApplication.getMusicSheetCategoryId() != null){
 //            record.setMusicScoreCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 //            record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());

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

@@ -54,7 +54,8 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_score (cbs_music_categories_id_,name_,type_,speed_,url_,metronome_url_,midi_url_,create_user_id_,order_,
-		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_,ext_config_json_,ext_style_config_json_)
+		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,
+		                             enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_,ext_config_json_,ext_style_config_json_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{speed},#{url},#{metronomeUrl},#{midiUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag},#{playMode},#{museScoreUrl},#{museScoreMemo},#{extConfigJson},#{extStyleConfigJson})
@@ -216,14 +217,15 @@
 		enable_evaluation_ = #{param.canEvaluate},
 		play_mode_ = #{param.playMode},
 		music_sheet_type_ = #{param.musicSheetType},
-		is_all_subject_ = #{param.isAllSubject}
+		is_all_subject_ = #{param.isAllSubject},
+		client_show_flag_ = #{param.platformStatus}
 		where cbs_music_sheet_id_ = #{param.id}
 	</update>
 
 	<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_,cbs_music_sheet_id_,music_sheet_type_,
+		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,client_show_flag_,cbs_music_sheet_id_,music_sheet_type_,
 		score_type_,is_convertible_score_,is_all_subject_)
 		values
 		<foreach collection="vos" item="item" separator=",">
@@ -235,7 +237,7 @@
 			#{item.musicSheetUpdate.subjectIds},
 			#{item.musicSheetUpdate.playSpeed},
 			#{item.musicSheetUpdate.canEvaluate},
-			#{item.musicSheetUpdate.playMode},0,
+			#{item.musicSheetUpdate.playMode},#{item.status},#{item.musicSheetUpdate.platformStatus},
 			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType},
 			#{item.scoreType},#{item.isConvertibleScore},#{item.musicSheetUpdate.isAllSubject}
 			)
@@ -263,6 +265,9 @@
 			</if>
 			<if test="showFlag != null">
 				AND ses.show_flag_ = #{showFlag}
+				<if test="showFlag == true">
+					AND ses.client_show_flag_ = #{showFlag}
+				</if>
 			</if>
 			<if test="isConvertibleScore != null">
 				AND ses.is_convertible_score_ = #{isConvertibleScore}