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

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

@@ -24,7 +24,7 @@ public class SysMusicScoreController extends BaseController {
     @GetMapping("/queryPage2")
     public Object queryPage2(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
-        queryInfo.setShowFlag(1);
+        queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         return succeed(sysMusicScoreService.queryMusicScorePageInfo(queryInfo));
     }

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

@@ -24,7 +24,7 @@ public class SysMusicScoreController extends BaseController {
     @GetMapping("/queryPage2")
     public Object queryPage2(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
-        queryInfo.setShowFlag(1);
+        queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         return succeed(sysMusicScoreService.queryMusicScorePageInfo(queryInfo));
     }

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

@@ -47,7 +47,7 @@ public class SysMusicScoreController extends BaseController {
     @GetMapping("/queryPage2")
     public Object queryPage2(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
-        queryInfo.setShowFlag(1);
+        queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         return succeed(sysMusicScoreService.queryMusicScorePage(queryInfo));
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysExamSongQueryInfo.java

@@ -44,6 +44,10 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     private Integer showFlag;
 
+    private Integer clientShowFlag;
+
+    private Boolean clientFlag;
+
     private Boolean enable;
 
     private String organId;

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

@@ -26,7 +26,8 @@
 		<result column="create_user_name_" property="createUserName" />
 		<result column="is_open_metronome_" property="isOpenMetronome" />
 		<result column="del_flag_" property="delFlag" />
-		<result column="show_flag_" property="clientShowFlag" />
+		<result column="client_show_flag_" property="clientShowFlag" />
+		<result column="show_flag_" property="showFlag" />
 		<result column="order_" property="order" />
 		<result column="rank_ids_" property="rankIds" />
 		<result column="render_from_" property="renderFrom" />
@@ -232,7 +233,7 @@
 		score_type_,is_convertible_score_,is_all_subject_)
 		values
 		<foreach collection="vos" item="item" separator=",">
-			(#{item.musicSheetCategoryId},
+			(#{item.musicSheetUpdate.musicCategoryId},
 			'SMART_PRACTICE','COMMON',
 			CASE WHEN #{item.paymentType} = 'FREE' THEN NULL ELSE '1' END,
 			#{item.sortNo},
@@ -268,9 +269,12 @@
 			</if>
 			<if test="showFlag != null">
 				AND ses.show_flag_ = #{showFlag}
-				<if test="showFlag == true">
-					AND ses.client_show_flag_ = #{showFlag}
-				</if>
+			</if>
+			<if test="clientShowFlag != null">
+				AND ses.client_show_flag_ = #{clientShowFlag}
+			</if>
+			<if test="clientFlag != null and clientFlag == true">
+				AND ses.client_show_flag_ = true AND ses.show_flag_ = true
 			</if>
 			<if test="isConvertibleScore != null">
 				AND ses.is_convertible_score_ = #{isConvertibleScore}