Merge remote-tracking branch 'origin/master'

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

@@ -13,6 +13,8 @@ public class MusicGroupQuitQueryInfo extends QueryInfo {
     private ApprovalStatus status;
 
     private Integer educationUserId;
+    
+    private String currentApproveRole;
 
     public Integer getEducationUserId() {
         return educationUserId;
@@ -53,4 +55,12 @@ public class MusicGroupQuitQueryInfo extends QueryInfo {
     public void setIds(String ids) {
         this.ids = ids;
     }
+
+	public String getCurrentApproveRole() {
+		return currentApproveRole;
+	}
+
+	public void setCurrentApproveRole(String currentApproveRole) {
+		this.currentApproveRole = currentApproveRole;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/handler/WebSocketHandler.java

@@ -96,12 +96,6 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
         String phone = session.getPrincipal().getName().split(":")[1];
         session.close();
         LOGGER.info("{}异常: {}", phone, exception);
-//        appMap.values().forEach(e->e.afterConnectionClosed(session, phone));
-//        exception.printStackTrace();
-//        if(!WS_CLIENTS.containsKey(phone)){
-//            return;
-//        }
-//        WS_CLIENTS.remove(phone);
     }
 
     @Override

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

@@ -136,6 +136,9 @@
             <if test="educationUserId != null">
                 AND mg.educational_teacher_id_ = #{educationUserId}
             </if>
+            <if test="currentApproveRole != null">
+                AND mgq.current_approve_role_ = #{currentApproveRole}
+            </if>
             <if test="status != null">
                 AND mgq.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -130,6 +130,20 @@
 		</if>
 		WHERE smcwd.monday_ = #{monday}
 			AND stu.user_id_=smcwd.user_id_
+			<if test="orderType==1">
+				<if test="heardLevel==null">
+					AND smcwd.advanced_max_score_ > 0
+				</if>
+				<if test="heardLevel=='BEGINNER'">
+					AND smcwd.beginner_max_score_ > 0
+				</if>
+				<if test="heardLevel=='ADVANCED'">
+					AND smcwd.advanced_max_score_ > 0
+				</if>
+				<if test="heardLevel=='PERFORMER'">
+					AND smcwd.performer_max_score_ > 0,
+				</if>
+			</if>
 			ORDER BY
 			<if test="orderType==null">
 				smcwd.train_time_ DESC,