会员试用

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

@@ -9,12 +9,26 @@ public class CountStudentTrainDataDto {
 
     private String username;
 
+    //训练总时长
     private Integer totalPlayTime;
 
+    //训练天数
     private Integer trainDay;
 
+    //训练次数
     private Integer trainNum;
 
+    //评测次数
+    private Integer recordNum;
+
+    public Integer getRecordNum() {
+        return recordNum;
+    }
+
+    public void setRecordNum(Integer recordNum) {
+        this.recordNum = recordNum;
+    }
+
     public Integer getUserId() {
         return userId;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.FeatureType;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.ibatis.annotations.Param;
@@ -23,6 +24,16 @@ public class SysMusicCompareRecordQueryInfo extends QueryInfo {
     @ApiModelProperty("排序字段：TRAINDAYS(训练天数);TRAINTIME(训练时长);TRAINNUM(训练次数)")
     private String sortField = "TRAINDAYS";
 
+    private FeatureType featureType;
+
+    public FeatureType getFeatureType() {
+        return featureType;
+    }
+
+    public void setFeatureType(FeatureType featureType) {
+        this.featureType = featureType;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -103,6 +103,9 @@
 			<if test="userId!=null">
 				AND smcr.user_id_=#{userId}
 			</if>
+			<if test="featureType != null">
+				AND smcr.feature_ = #{featureType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
 			<if test="startTime!=null and endTime!=null">
 				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
 			</if>
@@ -118,7 +121,7 @@
 			sms.name_ sys_music_score_name_
 		FROM sys_music_compare_record smcr
 		LEFT JOIN sys_music_score sms on smcr.sys_music_score_id_ = sms.id_
-		<include refid="queryCondition"></include>
+		<include refid="queryCondition"/>
 		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
@@ -126,7 +129,7 @@
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_music_compare_record smcr
-		<include refid="queryCondition"></include>
+		<include refid="queryCondition"/>
 	</select>
 
     <select id="getUserTrainStat" resultType="com.ym.mec.biz.dal.dto.MusicCompareRankingDto">
@@ -220,7 +223,7 @@
 		LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
 		LEFT JOIN student stu ON stu.user_id_ = smcr.user_id_
 		LEFT JOIN student_registration sr ON sr.user_id_=smcr.user_id_
-		<include refid="queryMusicGroupStudentTrainDataConditon"></include>
+		<include refid="queryMusicGroupStudentTrainDataConditon"/>
 	</select>
 
 	<select id="queryStudentTrainData" resultType="com.ym.mec.biz.dal.dto.EduOrganStudentListDto">
@@ -245,6 +248,7 @@
 	</select>
 	<resultMap id="CountStudentTrainDataDto" type="com.ym.mec.biz.dal.dto.CountStudentTrainDataDto">
 		<result property="trainNum" column="train_num_"/>
+		<result property="recordNum" column="record_num_"/>
 		<result property="avatar" column="avatar_"/>
 		<result property="userId" column="user_id_"/>
 		<result property="username" column="username_"/>
@@ -255,7 +259,8 @@
 	<select id="queryStudentTrain" resultMap="CountStudentTrainDataDto">
 		SELECT s.user_id_,su.avatar_,su.phone_,su.username_,ROUND(SUM(mcr.play_time_) / 60) total_play_time_,
 			   COUNT(DISTINCT DATE_FORMAT(mcr.create_time_,"%Y-%m-%d")) train_day_,
-			   COUNT(DISTINCT mcr.behavior_id_) train_num_
+			   COUNT(DISTINCT mcr.behavior_id_) train_num_,
+			   COUNT(DISTINCT CASE WHEN mcr.feature_ = 'CLOUD_STUDY_EVALUATION' THEN mcr.behavior_id_ = NULL ELSE mcr.behavior_id_ END) record_num_
 		FROM teacher t
 				 LEFT JOIN student s ON t.id_ = s.teacher_id_
 				 LEFT JOIN sys_user su ON su.id_ = s.user_id_

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CloudStudyController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import static com.ym.mec.biz.dal.enums.FeatureType.CLOUD_STUDY_EVALUATION;
+
 /**
  * @Author Joburgess
  * @Date 2021/8/11 0011
@@ -55,4 +57,13 @@ public class CloudStudyController extends BaseController {
         return succeed(sysMusicCompareRecordService.countStudentTrain(queryInfo));
     }
 
+    @ApiOperation("学员评测列表")
+    @GetMapping("queryMusicCompareRecord")
+    public HttpResponseResult<PageInfo<SysMusicCompareRecord>> queryMusicCompareRecord(SysMusicCompareRecordQueryInfo queryInfo){
+        if(queryInfo.getFeatureType() == null){
+            queryInfo.setFeatureType(CLOUD_STUDY_EVALUATION);
+        }
+        return succeed(sysMusicCompareRecordService.queryPage(queryInfo));
+    }
+
 }