Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_subject_1122

mec-application/src/main/resources/exportColumnMapper.ini

@@ -359,8 +359,8 @@ headColumns = ["分部","课程编号","课程收入"]
 fieldColumns = ["organName","courseId","amount"]
 
 [云教练激活明细]
-headColumns = ["分部","学员编号","学员姓名","激活时间","激活月份","金额"]
-fieldColumns = ["organName","studentId","studentName","createTime","time","amount"]
+headColumns = ["分部","学员编号","学员姓名","激活时间","激活月份","金额","激活版本"]
+fieldColumns = ["organName","studentId","studentName","createTime","time","amount","memberRankName"]
 
 [乐团梯队数据导出]
 headColumns = ["乐团","长笛","单簧管","萨克斯","小号","圆号","长号","上低音号","大号","小军鼓","合计"]

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

@@ -17,4 +17,6 @@ public class CloudCoachActivationDetailsDto {
     private String time;
 
     private BigDecimal amount;
+
+    private String memberRankName;
 }

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

@@ -591,8 +591,9 @@
         WHEN cto.type_ = 'YEAR' THEN CONCAT(cto.time_ * 12,'月')
         WHEN cto.type_ = 'YEAR_HALF' THEN CONCAT(cto.time_ * 6,'月')
         WHEN cto.type_ = 'QUARTERLY' THEN CONCAT(cto.time_ * 3,'月')
-        ELSE CONCAT(cto.time_,'天') END AS time
+        ELSE CONCAT(cto.time_,'天') END AS time,mrs.name_ memberRankName
         from cloud_teacher_order cto
+        left join member_rank_setting mrs ON mrs.id_ = cto.level_
         left join organization o ON o.id_ = cto.organ_id_
         left join sys_user su ON su.id_ = cto.student_id_
         where cto.status_ = 2