1、统计报表导出、教师开课置顶bug修复

web/src/main/java/com/ibeetl/jlw/entity/vo/SystemUseLogsAnalysisVO.java

@@ -1,7 +1,11 @@
 package com.ibeetl.jlw.entity.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -14,6 +18,9 @@ import java.util.Date;
  * @version: 1.0
  */
 @Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper=false)
+@HeadFontStyle(fontName = "仿宋", fontHeightInPoints = 12)
 public class SystemUseLogsAnalysisVO extends BaseEntity {
 
     /**
@@ -23,10 +30,12 @@ public class SystemUseLogsAnalysisVO extends BaseEntity {
     /**
      * 归属模块
      */
+    @ExcelProperty(value = "模块名称",index = 0)
     private String firstName;
     /**
      * 院校名称
      */
+    @ExcelProperty(value = "使用院校",index = 1)
     private String universitiesCollegesName;
     /**
      * 院校ID
@@ -35,18 +44,22 @@ public class SystemUseLogsAnalysisVO extends BaseEntity {
     /**
      * 所属省份
      */
+    @ExcelProperty(value = "所属省份",index = 2)
     private String province;
     /**
      * 使用人数
      */
+    @ExcelProperty(value = "使用人数",index = 3)
     private Long usePeopleCount;
     /**
      * 使用总时长
      */
+    @ExcelProperty(value = "使用时长(分钟)",index = 4)
     private Long sumUseDuration;
     /**
      * 使用日期
      */
+    @ExcelProperty(value = "使用日期",index = 5)
     private Date dayTime;
 
 }

web/src/main/resources/sql/jlw/teacherOpenCourse.md

@@ -70,7 +70,7 @@ queryByCondition
   and find_in_set(tc.course_label_id, #courseLabelIdPlural#)
   @}
   @pageIgnoreTag(){
-  order by ta.teacher_open_course_merge_teacher_order_index asc
+  order by ta.teacher_open_course_merge_teacher_order_index desc
   @}