导出和汇总

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java

@@ -37,6 +37,10 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
 
     private Long teacherOpenCourseId ;
 
+    @UpdateIgnore
+    @InsertIgnore
+    private String teacherOpenCourseIdText;
+	
     //班级ID集合
     private String schoolClassIds ;
 
@@ -79,6 +83,10 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
 
     private String teacherOpenCourseStudentSigninSettingType ;
 
+    @UpdateIgnore
+    @InsertIgnore
+    private String teacherOpenCourseStudentSigninSettingTypeText ;
+
     //设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置
 
     private String teacherOpenCourseStudentSigninSettingValue ;
@@ -379,4 +387,20 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     public void setSchoolClassIdsText(String schoolClassIdsText) {
         this.schoolClassIdsText = schoolClassIdsText;
     }
+
+    public String getTeacherOpenCourseStudentSigninSettingTypeText() {
+        return teacherOpenCourseStudentSigninSettingTypeText;
+    }
+
+    public void setTeacherOpenCourseStudentSigninSettingTypeText(String teacherOpenCourseStudentSigninSettingTypeText) {
+        this.teacherOpenCourseStudentSigninSettingTypeText = teacherOpenCourseStudentSigninSettingTypeText;
+    }
+
+    public String getTeacherOpenCourseIdText() {
+        return teacherOpenCourseIdText;
+    }
+
+    public void setTeacherOpenCourseIdText(String teacherOpenCourseIdText) {
+        this.teacherOpenCourseIdText = teacherOpenCourseIdText;
+    }
 }

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

@@ -1,16 +1,12 @@
 package com.ibeetl.jlw.entity.vo;
 
-import cn.hutool.core.util.StrUtil;
 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 com.ibeetl.jlw.entity.IpAddress;
-import com.ibeetl.jlw.web.IpAddressController;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import static cn.hutool.core.util.ObjectUtil.defaultIfBlank;
+import java.util.Date;
 
 /**
  * 功能描述: <br>
@@ -25,87 +21,39 @@ import static cn.hutool.core.util.ObjectUtil.defaultIfBlank;
 @ExcelIgnoreUnannotated
 @EqualsAndHashCode(callSuper=false)
 @HeadFontStyle(fontName = "仿宋", fontHeightInPoints = 12)
-public class SigninSettingSummaryVO extends BaseEntity {
+public class SigninSettingSummaryVO {
 
-    /**
+    // 签到场次（时间）
-     * 姓名
+    @ExcelProperty("签到日期")
-     */
+    private Date teacherOpenCourseStudentSigninSettingSessionTime;
-    @ExcelProperty(value = "姓名", index = 0)
-    private String name;
 
-    /**
+    //开课ID
-     * 用户名
+    @ExcelProperty("开课名称")
-     */
+    private String teacherOpenCourseIdText ;
-    @ExcelProperty(value = "用户名", index = 1)
-    private String code;
-    /**
-     * 学生学号
-     */
-//    @ExcelProperty(value = "学生学号", index = 2)
-//    private String studentSn;
 
-    /**
+    // 班级ID集合
-     * 所属院校
+    @ExcelProperty("班级")
-     */
+    private String schoolClassIdsText;
-    @ExcelProperty(value = "所属院校", index = 2)
-    private String universitiesCollegesName;
-    /**
-     * 所属省份
-     */
-    @ExcelProperty(value = "所属省份", index = 3)
-    private String universitiesCollegesProvince;
-    /**
-     * 班级名称
-     */
-    @ExcelProperty(value = "班级名称", index = 4)
-    private String className;
-    /**
-     * 登入时间
-     */
-    @ExcelProperty(value = "登入时间", index = 5)
-    private String loginTime;
-    /**
-     * 登出时间
-     */
-    @ExcelProperty(value = "登出时间", index = 6)
-    private String logoutTime;
-    /**
-     * 指定时间内的，在线时长
-     */
-    @ExcelProperty(value = "在线时长", index = 7)
-    private String onlineDuration;
-    /**
-     * 是否在线
-     */
-    @ExcelProperty(value = "是否在线", index = 8)
-    private Boolean isOnLine;
 
-    /**
+    //签到方式 (数据字典 student_signin_type)
-     * 登录IP
+    @ExcelProperty("签到方式")
-     */
+    private String teacherOpenCourseStudentSigninSettingTypeText ;
-    @ExcelProperty(value = "登录IP", index = 9)
+
-    private String ip;
+    // 学生总人数
-    /**
+    @ExcelProperty("学生总人数")
-     * IP所属地
+    private Integer signinStudentTotalCount;
-     */
+
-    @ExcelProperty(value = "IP所属地", index = 10)
+    // 签到总人数
-    private String ipAddress;
+    @ExcelProperty("签到数")
-    /**
+    // teacher_open_course_student_signin_log_tag：10签到  20缺勤
-     * 登录次数
+    private Integer signinTotalCount;
-     */
-    @ExcelProperty(value = "登录次数", index = 11)
-    private Integer loginCount;
 
+    // 缺勤数
+    @ExcelProperty("缺勤数")
+    private Integer unsigninCount;
 
-    public void setIp(String ip) {
+    // 合计到课率 100为单位
-        this.ip = ip;
+    @ExcelProperty("到课率")
-        if(StrUtil.isNotBlank(ip)) {
+    private Float signinTotalRate;
-            IpAddress tempIpAddress = IpAddressController.ipAddressMap.get(ip);
-            if (null != tempIpAddress) {
-                String ipAddressAppend = tempIpAddress.getProvince() + tempIpAddress.getCity() + tempIpAddress.getDistrict();
-                setIpAddress(defaultIfBlank(ipAddressAppend, "本地局域网"));
-            }
-        }
-    }
 
 }

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java

@@ -172,6 +172,13 @@ public class TeacherOpenCourseStudentSigninSettingController{
         return JsonResult.success(page);
     }
 
+    /**
+     * 签到汇总导出
+     * @param condition
+     * @param response
+     * @return
+     * @throws IOException
+     */
     @GetMapping(MODEL + "/exportSummary.json")
     @ResponseBody
     public String exportSummary(TeacherOpenCourseStudentSigninSettingQuery condition, HttpServletResponse response) throws IOException {
@@ -180,7 +187,7 @@ public class TeacherOpenCourseStudentSigninSettingController{
         page.setPageNumber(1L);
         teacherOpenCourseStudentSigninSettingService.queryByCondition(page);
 
-        String filename = StrUtil.format("题目统计分析导出{}.xlsx", DateUtil.now());
+        String filename = StrUtil.format("开课签到汇总导出{}.xlsx", DateUtil.now());
         write(response, filename,"Sheet1", SigninSettingSummaryVO.class, page.getList());
         return null;
     }