只统计生成评测结果数据

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

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.entity.MusicCompareRecordStat;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.entity.SysMusicCompareRecord;
 import com.yonge.cooleshow.biz.dal.enums.EQueryOp;
+import com.yonge.cooleshow.biz.dal.enums.FeatureType;
 import com.yonge.cooleshow.biz.dal.mapper.MusicCompareRecordStatMapper;
 import com.yonge.cooleshow.biz.dal.service.MusicCompareRecordStatService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -215,7 +216,11 @@ public class MusicCompareRecordStatServiceImp extends ServiceImpl<MusicCompareRe
     @Override
     public IPage<MusicCompareWrapper.RecordEvaluate> findMusicCompareRecordEvaluatePage(IPage<MusicCompareWrapper.RecordEvaluate> page,
                                                                                         MusicCompareWrapper.EvaluteQueryInfo query) {
+        if (FeatureType.CLOUD_STUDY_EVALUATION == query.getFeature()) {
 
+            // 只查询生成评测试报告数据
+            query.setScoreData(true);
+        }
         // 分页查询条件
         List<MusicCompareWrapper.RecordEvaluate> evaluates = getBaseMapper().selectMusicCompareEvaluatePage(page, query);
 

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

@@ -127,6 +127,11 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 							.feature(dataType)
 							.build();
 
+					if (FeatureType.CLOUD_STUDY_EVALUATION == dataType) {
+						// 只统计生成评测报告数据
+						queryInfo.setScoreData(true);
+					}
+
 					// 曲目统计
 					List<StatGroupWrapper> musicWrappers = sysMusicCompareRecordDao.selectMusicCompareRecordStatInfo(queryInfo);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/music/MusicCompareWrapper.java

@@ -258,6 +258,9 @@ public class MusicCompareWrapper {
 
         @ApiModelProperty("功能类型 ")
         private FeatureType feature;
+
+        @ApiModelProperty("评测结果数据 ")
+        private Boolean scoreData;
     }
 
     /**
@@ -285,6 +288,9 @@ public class MusicCompareWrapper {
         @ApiModelProperty("评测类型")
         private FeatureType feature;
 
+        @ApiModelProperty("评测结果数据 ")
+        private Boolean scoreData;
+
         @ApiModelProperty("开始时间")
         private Date startTime;
 

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

@@ -115,6 +115,9 @@
             <if test="record.heardLevel != null">
                 AND t1.heard_level_ = #{record.heardLevel}
             </if>
+            <if test="record.scoreData != null">
+                AND t1.score_data_ != ''
+            </if>
             <if test="record.feature != null">
                 AND t1.feature_ = #{record.feature}
             </if>

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

@@ -328,6 +328,9 @@
 			<if test="record.feature != null">
 				AND t1.feature_ = #{record.feature}
 			</if>
+			<if test="record.scoreData != null">
+				AND t1.score_data_ != ''
+			</if>
 		</where>
 		GROUP BY t1.music_sheet_id_ <if test="record.userId != null">, t1.user_id_</if>
 	</select>