Merge branch 'zx_2021-09-06' of http://git.dayaedu.com/yonge/mec into online1

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentSubTotalCourseTimesDto.java

@@ -9,8 +9,18 @@ public class StudentSubTotalCourseTimesDto{
 
     private String phone;
 
+    private String classGroupId;
+
     private List<MapDto> MapDtos;
 
+    public String getClassGroupId() {
+        return classGroupId;
+    }
+
+    public void setClassGroupId(String classGroupId) {
+        this.classGroupId = classGroupId;
+    }
+
     public String getUsername() {
         return username;
     }

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

@@ -60,6 +60,17 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	//是否显示
+	private Integer showFlag = 0;
+
+	public Integer getShowFlag() {
+		return showFlag;
+	}
+
+	public void setShowFlag(Integer showFlag) {
+		this.showFlag = showFlag;
+	}
+
 	public String getRankIds() {
 		return rankIds;
 	}

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

@@ -33,6 +33,16 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     private List<Integer> categoriesIdList;
 
+    private Integer showFlag;
+
+    public Integer getShowFlag() {
+        return showFlag;
+    }
+
+    public void setShowFlag(Integer showFlag) {
+        this.showFlag = showFlag;
+    }
+
     public Integer getRankType() {
         return rankType;
     }

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

@@ -249,6 +249,7 @@
         <result property="userId" column="user_id_"/>
         <result property="username" column="username_"/>
         <result property="phone" column="phone_"/>
+        <result property="classGroupId" column="class_group_id_"/>
         <collection property="mapDtos" ofType="com.ym.mec.biz.dal.dto.MapDto">
             <result property="key" column="key"/>
             <result property="value" column="value"/>
@@ -256,9 +257,10 @@
     </resultMap>
     <select id="queryStudentSubTotalCourseTimes" resultMap="StudentSubTotalCourseTimesDto">
         SELECT mgpscd.user_id_,su.username_,su.phone_,mgpscd.course_type_ 'key',
-               SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value'
+               SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value',GROUP_CONCAT(DISTINCT cgsm.class_group_id_) class_group_id_
         FROM music_group_payment_student_course_detail mgpscd
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
+        LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = mgpc.music_group_id_ AND cgsm.status_ = 'NORMAL' AND mgpscd.user_id_ = cgsm.user_id_
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
         WHERE mgpc.music_group_id_ = #{musicGroupId}
         GROUP BY mgpscd.user_id_,mgpscd.course_type_

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

@@ -187,6 +187,9 @@
 			<if test="sysMusicScoreId != null">
 				AND sesa.exam_song_id_ = #{sysMusicScoreId}
 			</if>
+			<if test="showFlag != null">
+				AND ses.show_flag_ = #{showFlag}
+			</if>
 			<if test="categoriesIdList != null">
 				AND sesc.id_ IN
 				<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">

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

@@ -18,6 +18,7 @@
 		<result column="create_user_id_" property="createUserId" />
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="show_flag_" property="showFlag" />
 		<result column="order_" property="order" />
 		<result column="rank_ids_" property="rankIds" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -37,14 +38,17 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_,client_type_,rank_ids_)
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_,client_type_,rank_ids_,show_flag_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds})
+		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds},#{showFlag})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore">
 		UPDATE sys_music_score <set>
+		<if test="showFlag != null">
+			show_flag_ = #{showFlag},
+		</if>
 		<if test="clientType != null">
 			client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
@@ -113,6 +117,9 @@
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="showFlag != null">
+				AND ses.show_flag_ = #{showFlag}
+			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -59,6 +59,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
         queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
 
@@ -77,6 +78,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
         queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }
 }

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

@@ -34,6 +34,7 @@ public class SysMusicScoreController extends BaseController {
         if(sysMusicScore.getClientType() == null){
             sysMusicScore.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
+        sysMusicScore.setShowFlag(1);
         sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }
@@ -60,6 +61,7 @@ public class SysMusicScoreController extends BaseController {
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
         queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreService.queryPage(queryInfo));
     }
 }

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

@@ -1,9 +1,11 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,19 @@ public class SysMusicScoreController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "启用/停用")
+    @PostMapping("/show")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScore/show')")
+    public Object update(Integer sysMusicScoreId,Integer showFlag) {
+        SysMusicScore sysMusicScore = sysMusicScoreService.get(sysMusicScoreId);
+        if(sysMusicScore == null){
+            throw new BizException("曲目信息不存在");
+        }
+        sysMusicScore.setShowFlag(showFlag);
+        sysMusicScoreService.update(sysMusicScore);
+        return succeed();
+    }
+
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/add')")