Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -207,7 +207,13 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 				head = userTrainStat.get(i);
 			}
 		}
-		head.setStudentNum(studentDao.countStudentsWithOrgan(null));
+		Map<String,Object> params = new HashMap<String, Object>();
+		params.put("tenantId", queryInfo.getTenantId());
+		List<Integer> organIds = new ArrayList<Integer>();
+		organIds.add(queryInfo.getOrganId());
+		params.put("organIds", organIds);
+		
+		head.setStudentNum(studentDao.countStudentsWithOrgan(params));
 		if(StringUtils.isBlank(head.getAvatar())){
 			SysUser user = sysUserFeignService.queryUserById(queryInfo.getUserId());
 			if(user != null){

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

@@ -418,9 +418,9 @@
 			COUNT(smcr.id_) trainNum,
 			COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
 			SUM(smcr.play_time_) trainTime,
-			MAX(IF(heard_level_='BEGINNER' AND source_time_ <= play_time_, smcr.score_, 0)) beginnerMaxScore,
-			MAX(IF(heard_level_='ADVANCED' AND source_time_ <= play_time_, smcr.score_, 0)) advancedMaxScore,
-			MAX(IF(heard_level_='PERFORMER' AND source_time_ <= play_time_, smcr.score_, 0)) performerMaxScore
+			MAX(IF(heard_level_='BEGINNER' AND source_time_ >= play_time_, smcr.score_, 0)) beginnerMaxScore,
+			MAX(IF(heard_level_='ADVANCED' AND source_time_ >= play_time_, smcr.score_, 0)) advancedMaxScore,
+			MAX(IF(heard_level_='PERFORMER' AND source_time_ >= play_time_, smcr.score_, 0)) performerMaxScore,smcr.tenant_id_ tenantId
 		FROM sys_music_compare_record smcr
 		WHERE user_id_=#{userId} AND monday_ = #{monday}
 	</select>