云教练导出优化

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

@@ -33,6 +33,8 @@ public class EduOrganStudentListExportDto {
 
     private String currentGradeNum;
 
+    private String currentClass;
+
     @ApiModelProperty("乐团名称")
     private String musicGroupNames;
 
@@ -90,6 +92,14 @@ public class EduOrganStudentListExportDto {
     @ApiModelProperty("会员有效期")
     private String membershipEndTime;
 
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
     public String getCurrentGradeNum() {
         return currentGradeNum;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -525,7 +525,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             dataList1 = studentDao.queryCloudStudyStudentData(params);
             List<Integer> studentIds = dataList1.stream().map(EduOrganStudentListDto::getStudentId).collect(Collectors.toList());
 
-
             List<Map<Integer, String>> studentGroupNamesMapList = studentRegistrationDao.queryStudentMusicGroupNamesMap(studentIds);
             Map<Integer, String> studentGroupNamesMap = MapUtil.convertIntegerMap(studentGroupNamesMapList);
 
@@ -573,11 +572,15 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 EduOrganStudentListExportDto data = new EduOrganStudentListExportDto();
                 BeanUtils.copyProperties(eduOrganStudentListDto, data);
                 if (StringUtils.isNotEmpty(eduOrganStudentListDto.getCurrentGradeNum())) {
+                    data.setCurrentGradeNum(eduOrganStudentListDto.getCurrentGradeNum());
                     String grade = gradeList.get(Integer.parseInt(eduOrganStudentListDto.getCurrentGradeNum()));
                     if (StringUtils.isNotEmpty(grade)) {
                         data.setCurrentGradeNum(grade);
                     }
                 }
+                if (StringUtils.isNotEmpty(eduOrganStudentListDto.getCurrentClass())) {
+                    data.setCurrentClass(eduOrganStudentListDto.getCurrentClass());
+                }
                 if(activeAmountMap.containsKey(data.getStudentId())){
                     data.setActiveAmount(activeAmountMap.get(data.getStudentId()));
                 }

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

@@ -1049,7 +1049,7 @@
             SUM(CASE WHEN smcr.play_time_ IS NULL THEN 0 ELSE play_time_ END) cloudStudyUseTime,
             COUNT(DISTINCT DATE(smcr.create_time_)) cloudStudyUseDays,
             stu.membership_end_time_ membershipEndTime,
-            stu.current_grade_num_,stu.current_class_,stu.count_flag_
+            stu.current_grade_num_ currentGradeNum,stu.current_class_ currentClass,stu.count_flag_ countFlag
         FROM (SELECT DISTINCT t1.user_id_ FROM ((
                 SELECT
                 sr.user_id_