Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherHomeController.java

@@ -171,7 +171,7 @@ public class TeacherHomeController extends BaseController {
         StringBuffer sb = new StringBuffer("/tmp/klx/studentPractice/");
         sb.append(dateFormat1.format(date)).append("/练习记录")
                 .append(studentSearch.getStartTime()).append("~")
-                .append(studentSearch.getEndTime())
+                .append(studentSearch.getEndTime()).append("_")
                 .append(studentSearch.getTeacherId()).append("_")
                 .append(System.currentTimeMillis()).append(".xlsx");
         String filePath = sb.toString();

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

@@ -506,9 +506,7 @@ public class HomeServiceImpl implements HomeService {
             for (TeacherIndexWrapper.StudentPracticeSummaryDto dto : result) {
                 if(dto.getTotalPracticeTime() > 0){
                     dto.setTotalPracticeTimeStr(DateUtil.secondToTime(dto.getTotalPracticeTime()));
-                    if (dto.getAveragePracticeTime() > 0){
-                        dto.setAveragePracticeTimeStr(DateUtil.secondToTime(dto.getAveragePracticeTime()));
-                    }
+                    dto.setAveragePracticeTimeStr(DateUtil.secondToTime(dto.getAveragePracticeTime()));
                 }
             }
         }

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

@@ -15,7 +15,6 @@ import com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
-import com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.toolset.base.page.PageInfo;
@@ -375,20 +374,21 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 		userTrainChartResult.add(new IndexBaseDto(IndexDataType.CLOUD_STUDY_TRAIN_TIME, trainTimeData));
 		userTrainChartResult.add(new IndexBaseDto(IndexDataType.CLOUD_STUDY_TRAIN_NUM, trainNumData));
-		//获取学员基本信息
-		SysUser sysUser = sysUserService.findUserById(queryInfo.getUserId());
-		StudentWrapper.BasicUserInfo basicUserInfo = new StudentWrapper.BasicUserInfo();
-		basicUserInfo.setUsername(sysUser.getUsername());
-		basicUserInfo.setAvatar(sysUser.getAvatar());
-		Student student = studentService.getById(queryInfo.getUserId());
-		if(Objects.nonNull(student) && StringUtils.isNotEmpty(student.getSubjectId())){
-			Subject subject = subjectService.get(Long.parseLong(student.getSubjectId()));
-			basicUserInfo.setSubjectName(subject.getName());
+		if(StringUtils.equals(queryInfo.getClientId(),"student")){
+			//获取学员基本信息
+			SysUser sysUser = sysUserService.findUserById(queryInfo.getUserId());
+			StudentWrapper.BasicUserInfo basicUserInfo = new StudentWrapper.BasicUserInfo();
+			basicUserInfo.setUsername(sysUser.getUsername());
+			basicUserInfo.setAvatar(sysUser.getAvatar());
+			Student student = studentService.getById(queryInfo.getUserId());
+			if(Objects.nonNull(student) && StringUtils.isNotEmpty(student.getSubjectId())){
+				Subject subject = subjectService.get(Long.parseLong(student.getSubjectId()));
+				basicUserInfo.setSubjectName(subject.getName());
+			}
+			result.put("userInfo",basicUserInfo);
 		}
-
 		result.put("userTrainChartData", userTrainChartResult);
 		result.put("detail",pageInfo);
-		result.put("userInfo",basicUserInfo);
 		return result;
 	}