Merge branch 'music_score'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -353,4 +353,12 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
                                                                      @Param("organId") Integer organId);
 
     List<Map<Integer, String>> getStudentSubjectMapList(@Param("studentIds") List<Integer> studentIds);
+
+    /**
+     * 获取新增人数占比（已上乐团课小于等于4）
+     * @return
+     */
+    List<BaseMapDto<Integer,Long>> getOrganCloudNewStudentNum();
+
+    List<Map<Long, Long>> groupOrganId(@Param("organIds") List<Integer> organIds, @Param("userIds") List<Integer> userIds);
 }

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

@@ -45,6 +45,28 @@ public class EduOrganStudentDataDto {
     @ApiModelProperty("云教练新增人数")
     private int newCloudStudyStudentNum;
 
+    @ApiModelProperty("新用户人数")
+    private int newStudentNum;
+
+    @ApiModelProperty("新用户占比")
+    private float newStudentDuty;
+
+    public int getNewStudentNum() {
+        return newStudentNum;
+    }
+
+    public void setNewStudentNum(int newStudentNum) {
+        this.newStudentNum = newStudentNum;
+    }
+
+    public float getNewStudentDuty() {
+        return newStudentDuty;
+    }
+
+    public void setNewStudentDuty(float newStudentDuty) {
+        this.newStudentDuty = newStudentDuty;
+    }
+
     public int getIndex() {
         return index;
     }

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

@@ -39,6 +39,28 @@ public class OrganCloudStudyStudentDataQueryInfo extends QueryInfo {
     @ApiModelProperty("云教练新增人数")
     private String newCloudStudyStudentNum;
 
+    @ApiModelProperty("新用户人数")
+    private String newStudentNum;
+
+    @ApiModelProperty("新用户人数占比")
+    private String newStudentDuty;
+
+    public String getNewStudentNum() {
+        return newStudentNum;
+    }
+
+    public void setNewStudentNum(String newStudentNum) {
+        this.newStudentNum = newStudentNum;
+    }
+
+    public String getNewStudentDuty() {
+        return newStudentDuty;
+    }
+
+    public void setNewStudentDuty(String newStudentDuty) {
+        this.newStudentDuty = newStudentDuty;
+    }
+
     public String getDate() {
         return date;
     }

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

@@ -542,6 +542,15 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if(!CollectionUtils.isEmpty(organsNewCloudStudyNumMapList)){
             organsNewCloudStudyNumMap = MapUtil.convertIntegerMap(organsNewCloudStudyNumMapList);
         }
+        //获取新增人数占比（已上乐团课小于等于4）
+        List<BaseMapDto<Integer, Long>> studentMusicCourseNum = studentDao.getOrganCloudNewStudentNum();
+        Map<String, Long> organsNewCloudNewStudentNumMap = new HashMap<>();
+        if(!CollectionUtils.isEmpty(studentMusicCourseNum)){
+            List<BaseMapDto<Integer, Long>> collect = studentMusicCourseNum.stream().filter(e -> e.getValue() < 5).collect(Collectors.toList());
+            List<Integer> userIdList = collect.stream().map(e -> e.getKey()).collect(Collectors.toList());
+            List<Map<Long, Long>> organsNewCloudNewStudentNumMapList = studentDao.groupOrganId(organIds,userIdList);
+            organsNewCloudNewStudentNumMap = MapUtil.convertIntegerMap(organsNewCloudNewStudentNumMapList);
+        }
 
         List<EduOrganStudentDataDto> result = new ArrayList<>();
 
@@ -573,6 +582,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if(organsNewCloudStudyNumMap.containsKey(organ.getId().toString())){
                 organStudentVipData.setNewCloudStudyStudentNum(organsNewCloudStudyNumMap.get(organ.getId().toString()).intValue());
             }
+            if(organsNewCloudNewStudentNumMap.containsKey(organ.getId().toString())){
+                organStudentVipData.setNewStudentNum(organsNewCloudNewStudentNumMap.get(organ.getId().toString()).intValue());
+                organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
+            }
             result.add(organStudentVipData);
         }
         return result;
@@ -624,6 +637,16 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             organsNewCloudStudyNumMap = MapUtil.convertIntegerMap(organsNewCloudStudyNumMapList);
         }
 
+        //获取新增人数占比（已上乐团课小于等于4）
+        List<BaseMapDto<Integer, Long>> studentMusicCourseNum = studentDao.getOrganCloudNewStudentNum();
+        Map<String, Long> organsNewCloudNewStudentNumMap = new HashMap<>();
+        if(!CollectionUtils.isEmpty(studentMusicCourseNum)){
+            List<BaseMapDto<Integer, Long>> collect = studentMusicCourseNum.stream().filter(e -> e.getValue() < 5).collect(Collectors.toList());
+            List<Integer> userIdList = collect.stream().map(e -> e.getKey()).collect(Collectors.toList());
+            List<Map<Long, Long>> organsNewCloudNewStudentNumMapList = studentDao.groupOrganId(organIds,userIdList);
+            organsNewCloudNewStudentNumMap = MapUtil.convertIntegerMap(organsNewCloudNewStudentNumMapList);
+        }
+
         List<EduOrganStudentDataDto> result = new ArrayList<>();
 
         for (Organization organ : organs) {
@@ -654,6 +677,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if(organsNewCloudStudyNumMap.containsKey(organ.getId().toString())){
                 organStudentVipData.setNewCloudStudyStudentNum(organsNewCloudStudyNumMap.get(organ.getId().toString()).intValue());
             }
+            if(organsNewCloudNewStudentNumMap.containsKey(organ.getId().toString())){
+                organStudentVipData.setNewStudentNum(organsNewCloudNewStudentNumMap.get(organ.getId().toString()).intValue());
+                organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
+            }
             result.add(organStudentVipData);
         }
         Comparator<EduOrganStudentDataDto> comparing = null;
@@ -713,6 +740,20 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 comparing.thenComparing(EduOrganStudentDataDto::getCloudStudyLivelyStudentDuty, "ASC".equals(queryInfo.getCloudStudyLivelyStudentDuty())?Comparator.naturalOrder():Comparator.reverseOrder());
             }
         }
+        if(StringUtils.isNotBlank(queryInfo.getNewStudentNum())){
+            if(Objects.isNull(comparing)){
+                comparing = Comparator.comparing(EduOrganStudentDataDto::getNewStudentNum, "ASC".equals(queryInfo.getNewStudentNum())?Comparator.naturalOrder():Comparator.reverseOrder());
+            }else{
+                comparing.thenComparing(EduOrganStudentDataDto::getNewStudentNum, "ASC".equals(queryInfo.getNewStudentNum())?Comparator.naturalOrder():Comparator.reverseOrder());
+            }
+        }
+        if(StringUtils.isNotBlank(queryInfo.getNewStudentDuty())){
+            if(Objects.isNull(comparing)){
+                comparing = Comparator.comparing(EduOrganStudentDataDto::getNewStudentDuty, "ASC".equals(queryInfo.getNewStudentDuty())?Comparator.naturalOrder():Comparator.reverseOrder());
+            }else{
+                comparing.thenComparing(EduOrganStudentDataDto::getNewStudentDuty, "ASC".equals(queryInfo.getNewStudentDuty())?Comparator.naturalOrder():Comparator.reverseOrder());
+            }
+        }
 
         if(Objects.isNull(comparing)){
             comparing = Comparator.comparing(EduOrganStudentDataDto::getOrganId);

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

@@ -111,13 +111,13 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		List<MusicCompareRankingDto> detail = new ArrayList<>();
 		switch (queryInfo.getOrderType()){
 			case 1:
-				userTrainStat.sort(Comparator.comparing(m->m.getScore(), Comparator.reverseOrder()));
+				userTrainStat.sort(Comparator.comparing(MusicCompareRankingDto::getScore, Comparator.reverseOrder()).thenComparing(MusicCompareRankingDto::getUserId));
 				break;
 			case 2:
-				userTrainStat.sort(Comparator.comparing(m->m.getTrainDays(), Comparator.reverseOrder()));
+				userTrainStat.sort(Comparator.comparing(MusicCompareRankingDto::getTrainDays, Comparator.reverseOrder()).thenComparing(MusicCompareRankingDto::getUserId));
 				break;
 			default:
-				userTrainStat.sort(Comparator.comparing(m->m.getTrainTime(), Comparator.reverseOrder()));
+				userTrainStat.sort(Comparator.comparing(MusicCompareRankingDto::getTrainTime, Comparator.reverseOrder()).thenComparing(MusicCompareRankingDto::getUserId));
 				break;
 		}
 

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

@@ -1189,6 +1189,29 @@
             #{studentId}
         </foreach>
     </select>
+    <select id="getOrganCloudNewStudentNum" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
+        SELECT cssp.`user_id_` 'key',count(cs.`id_`) 'value' FROM `course_schedule_student_payment` cssp
+        STRAIGHT_JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
+        WHERE cs.`status_` = 'OVER' AND cs.`group_type_` = 'MUSIC' AND cs.`del_flag_` = 0
+        GROUP BY cssp.`user_id_`
+    </select>
+    <select id="groupOrganId" resultType="java.util.Map">
+        SELECT su.organ_id_ 'key',COUNT(DISTINCT su.id_) 'value' FROM sys_user su
+        WHERE 1 = 1
+        <if test="userIds!=null and userIds.size() > 0">
+            AND su.id_ IN
+            <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                #{userId}
+            </foreach>
+        </if>
+        <if test="organIds!=null and organIds.size() > 0">
+            AND su.organ_id_ IN
+            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+                #{organId}
+            </foreach>
+        </if>
+        GROUP BY su.organ_id_
+    </select>
 
     <update id="updateGrade"><![CDATA[
         UPDATE student SET current_grade_num_=current_grade_num_+1

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

@@ -144,7 +144,7 @@
 		    su.username_ studentName,
 		    sms.name_ musicScoreName,
 			COUNT(smcr.id_) trainNum,
-		    SUM(smcr.score_)/COUNT(smcr.id_) score,
+		    MAX(smcr.score_) score,
 			COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
 			SUM(smcr.play_time_) trainTime
 		FROM sys_music_compare_record smcr