zouxuan преди 2 години
родител
ревизия
3d5caba432
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CloudTeacherSumDto.java
  2. 2 2
      mec-web/src/main/resources/exportColumnMapper.ini

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

@@ -45,7 +45,7 @@ public class CloudTeacherSumDto {
     @ApiModelProperty(value = "120~240分钟")
     @ApiModelProperty(value = "120~240分钟")
     private Integer train3;
     private Integer train3;
 
 
-    @ApiModelProperty(value = ">240分钟")
+    @ApiModelProperty(value = ">=240分钟")
     private Integer train4;
     private Integer train4;
 
 
     public Integer getOrganId() {
     public Integer getOrganId() {

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

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