小小训练营改造

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

@@ -39,7 +39,10 @@ public class CloudTeacherSumDto {
     @ApiModelProperty(value = "练习时长＞60分钟的人数")
     private BigDecimal train0 = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "<60分钟")
+    @ApiModelProperty(value = "<10分钟")
+    private Integer train;
+
+    @ApiModelProperty(value = "10~60分钟")
     private Integer train1;
 
     @ApiModelProperty(value = "60~120分钟")
@@ -51,6 +54,14 @@ public class CloudTeacherSumDto {
     @ApiModelProperty(value = "＞=240分钟")
     private Integer train4;
 
+    public Integer getTrain() {
+        return train;
+    }
+
+    public void setTrain(Integer train) {
+        this.train = train;
+    }
+
     public BigDecimal getTrainAvgTrainTime() {
         return trainAvgTrainTime;
     }

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

@@ -1174,6 +1174,7 @@
         <result property="teacherName" column="teacher_name_"/>
         <result property="normalNum" column="normal_num_"/>
         <result property="train0" column="train0"/>
+        <result property="train" column="train"/>
         <result property="train1" column="train1"/>
         <result property="train2" column="train2"/>
         <result property="train3" column="train3"/>
@@ -1183,11 +1184,13 @@
     </resultMap>
     <select id="cloudTeacherSum" resultMap="CloudTeacherSumDto">
         select o.id_ organ_id_,o.name_ organ_name_,COUNT(distinct s.user_id_) normal_num_,COUNT(distinct smcr.user_id_) train_student_num_,
-        COUNT(distinct CASE WHEN smcr.train_time_ &lt; 60 OR smcr.train_time_ IS NULL THEN s.user_id_ END) 'train1',
+        COUNT(distinct CASE WHEN smcr.train_time_ &lt; 10 OR smcr.train_time_ IS NULL THEN s.user_id_ END) 'train',
+        COUNT(distinct CASE WHEN smcr.train_time_ >= 10 AND smcr.train_time_ &lt; 60 THEN s.user_id_ END) 'train1',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 60 AND smcr.train_time_ &lt; 120 THEN s.user_id_ END) 'train2',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 120 AND smcr.train_time_ &lt; 240 THEN s.user_id_ END) 'train3',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 240 THEN s.user_id_ END) 'train4',
-        ROUND(SUM(smcr.train_time_),2) train_total_time_,COUNT(distinct CASE WHEN smcr.train_time_ >= 60 THEN s.user_id_ END) 'train0'
+        ROUND(SUM(smcr.train_time_),2) train_total_time_,
+        COUNT(distinct CASE WHEN smcr.train_time_ >= 60 THEN s.user_id_ END) 'train0'
         from (select distinct sr.user_id_ from music_group mg
         left join student_registration sr ON mg.id_ = sr.music_group_id_
         where mg.status_ IN ('PROGRESS','PAUSE') AND sr.music_group_status_ = 'NORMAL') mg

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

@@ -323,8 +323,8 @@ headColumns = ["分部", "在读人数", "应有课耗", "实际课耗","课耗
 fieldColumns = ["organName","normalNum","courseConsumerNum","courseSum","courseConsumerRate+'%'","num5","num4","num3","num2","num1","num0","standRate+'%'"]
 
 [云教练统计导出]
-headColumns = ["分部", "会员人数","练习人数","练习率","<60分钟", "60~120分钟","120~240分钟","＞=240分钟","平均练习时长（会员）","平均练习时长（练习）","练习达标占比"]
-fieldColumns = ["organName","normalNum","trainStudentNum","trainRate+'%'","train1","train2","train3","train4","avgTrainTime","trainAvgTrainTime","trainStandRate+'%'"]
+headColumns = ["分部", "会员人数","练习人数","练习率","<10分钟","10~60分钟", "60~120分钟","120~240分钟","＞=240分钟","平均练习时长（会员）","平均练习时长（练习）","练习达标占比"]
+fieldColumns = ["organName","normalNum","trainStudentNum","trainRate+'%'","train","train1","train2","train3","train4","avgTrainTime","trainAvgTrainTime","trainStandRate+'%'"]
 
 [云教练统计详情导出]
 headColumns = ["声部老师", "会员人数","练习人数","练习率","<60分钟", "60~120分钟","120~240分钟","＞=240分钟","平均练习时长（会员）","平均练习时长（练习）","练习达标占比"]