fix:评测统计

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMusicCompareRecordDao.java

@@ -25,24 +25,27 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
 	SysMusicCompareRecord getUserLastEvaluationData(@Param("userId") Long userId);
 
 	/**
+	 * @param userId   :
+	 * @param clientId
+	 * @return com.ym.mec.biz.dal.dto.StudentTrainOverviewDto
 	 * @describe 获取用户训练总览
 	 * @author Joburgess
 	 * @date 2021/8/11 0011
-	 * @param userId:
-	 * @return com.ym.mec.biz.dal.dto.StudentTrainOverviewDto
 	 */
-	StudentTrainOverviewDto getUserTrainOverView(@Param("userId") Long userId);
+	StudentTrainOverviewDto getUserTrainOverView(@Param("userId") Long userId, @Param("clientId") String clientId);
 
 	/**
+	 * @param userId    :
+	 * @param startTime :
+	 * @param endTime   :
+	 * @param clientId
+	 * @return java.util.List<com.ym.mec.biz.dal.dto.StudentTrainChartDto>
 	 * @describe 获取用户训练图表数据
 	 * @author Joburgess
 	 * @date 2021/8/12 0012
-	 * @param userId:
-	 * @param startTime:
-	 * @param endTime:
-	 * @return java.util.List<com.ym.mec.biz.dal.dto.StudentTrainChartDto>
 	 */
-	List<StudentTrainChartDto> getUserTrainChartData(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+	List<StudentTrainChartDto> getUserTrainChartData(@Param("userId") Long userId, @Param(
+			"startTime") String startTime, @Param("endTime") String endTime, @Param("clientId") String clientId);
 
 	int countMusicGroupStudentTrainData(Map<String, Object> params);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/SysMusicCompareRecordQueryInfo.java

@@ -35,6 +35,16 @@ public class SysMusicCompareRecordQueryInfo extends QueryInfo {
 
     private Integer organId;
 
+    private String clientId;
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -636,7 +636,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     public boolean saveMusicSheet(MusicSheetDto musicSheetDto, Long userId) {
 
         String[] split = musicSheetDto.getMusicTag().split(",");
-        if (split!= null  && split.length >3) {
+        if (split.length >3) {
             throw new BizException("曲目标签数不能超过3个");
         }
         MusicSheet oldMusicSheet = null;
@@ -1170,6 +1170,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 musicSheetWebsiteDetailVo.setFavorite(YesOrNoEnum.YES);
             }
         }
+        musicSheetWebsiteDetailVo.setFavoriteNum(Long.valueOf(detail.getFavoriteCount()));
 
         // 老师的曲目
         MusicSheetSearch musicSheetSearch = new MusicSheetSearch();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -260,8 +260,9 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 		List<StudentTrainChartDto> userTrainChartData = new ArrayList<>();
 		if(queryInfo.getPage()==1){
-			userTrainOverView = sysMusicCompareRecordDao.getUserTrainOverView(queryInfo.getUserId());
-			userTrainChartData = sysMusicCompareRecordDao.getUserTrainChartData(queryInfo.getUserId(), queryInfo.getStartTime(), queryInfo.getEndTime());
+			userTrainOverView = sysMusicCompareRecordDao.getUserTrainOverView(queryInfo.getUserId(),queryInfo.getClientId());
+			userTrainChartData = sysMusicCompareRecordDao.getUserTrainChartData(queryInfo.getUserId(), queryInfo.getStartTime(),
+																				queryInfo.getEndTime(),queryInfo.getClientId());
 		}
 
 		if(CollectionUtils.isEmpty(userTrainChartData)||userTrainChartData.size()!=7){

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -129,6 +129,9 @@
 	<sql id="queryCondition">
 		<where>
 			smcr.score_data_ is not null and smcr.score_data_ != ''
+			<if test="clientId != null and clientId != ''">
+				and smcr.client_id_ = #{clientId}
+			</if>
 			<if test="userId!=null">
 				AND smcr.user_id_=#{userId}
 			</if>
@@ -174,7 +177,7 @@
 			COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
 			SUM(smcr.play_time_) trainTime
 		FROM sys_music_compare_record smcr
-		WHERE smcr.user_id_=#{userId} and smcr.client_id_ = 'student'
+		WHERE smcr.user_id_=#{userId} and smcr.client_id_ = #{clientId}
 	</select>
 
 	<select id="getUserTrainChartData" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto">
@@ -183,7 +186,7 @@
 			COUNT(DISTINCT smcr.behavior_id_) trainNum,
 			SUM(smcr.play_time_) trainTime
 		FROM sys_music_compare_record smcr
-		WHERE smcr.user_id_=#{userId}  and smcr.client_id_ = 'student'
+		WHERE smcr.user_id_=#{userId}  and smcr.client_id_ = #{clientId}
 		  AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
 		GROUP BY DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')
 		ORDER BY trainDate;

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SysMusicCompareRecordController.java

@@ -75,6 +75,7 @@ public class SysMusicCompareRecordController extends BaseController {
         if (StringUtils.isEmpty(queryInfo.getStartTime())) {
             return failed("时间不能为空");
         }
+        queryInfo.setClientId("teacher");
         LocalDate localDate = LocalDate.parse(queryInfo.getStartTime() + "-01",
                                               DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         queryInfo.setStartTime(localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysMusicCompareRecordController.java

@@ -69,6 +69,7 @@ public class SysMusicCompareRecordController extends BaseController {
             return failed("获取用户信息失败");
         }
         queryInfo.setUserId(sysUser.getId());
+        queryInfo.setClientId("teacher");
         if (StringUtils.isEmpty(queryInfo.getStartTime())) {
             return failed("时间不能为空");
         }

service.md

@@ -1,9 +1,9 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [x] admin-server
+- [ ] admin-server
 - [ ] teacher-server
-- [ ] student-server
-- [ ] website-server
+- [x] student-server
+- [x] website-server
 - [ ] task-server
 - [ ] websocket-server
 - [ ] audio-analysis