zouxuan 1 year ago
parent
commit
6b948aa1cf

+ 4 - 12
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/StudentTrainChartDto.java

@@ -19,18 +19,6 @@ public class StudentTrainChartDto {
     @ApiModelProperty("训练日期")
     private LocalDate trainDate;
 
-    @ApiModelProperty("训练日期")
-    private String trainDateStr;
-
-    public String getTrainDateStr() {
-        return trainDateStr;
-    }
-
-    public void setTrainDateStr(String trainDateStr) {
-        this.trainDateStr = trainDateStr;
-        this.trainDate = LocalDate.parse(trainDateStr);
-    }
-
     public StudentTrainChartDto() {
     }
 
@@ -59,4 +47,8 @@ public class StudentTrainChartDto {
     public LocalDate getTrainDate() {
         return trainDate;
     }
+
+    public void setTrainDate(LocalDate trainDate) {
+        this.trainDate = trainDate;
+    }
 }

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

@@ -183,14 +183,14 @@
 
 	<select id="getUserTrainChartData" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto">
 		SELECT
-			DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') trainDateStr,
+			DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') trainDate,
 			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_ = #{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 trainDateStr;
+		ORDER BY trainDate;
 	</select>
 
 	<sql id="queryMusicGroupStudentTrainDataConditon">