Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -19,6 +19,18 @@ 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() {
     }
 
@@ -47,8 +59,4 @@ public class StudentTrainChartDto {
     public LocalDate getTrainDate() {
         return trainDate;
     }
-
-    public void setTrainDate(LocalDate trainDate) {
-        this.trainDate = trainDate;
-    }
 }

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

@@ -183,7 +183,7 @@
 
 	<select id="getUserTrainChartData" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto">
 		SELECT
-			smcr.create_time_ trainDate,
+			DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') trainDateStr,
 			COUNT(DISTINCT smcr.behavior_id_) trainNum,
 			SUM(smcr.play_time_) trainTime
 		FROM sys_music_compare_record smcr