进度查询加入班级字段

themis-business/src/main/java/com/qmth/themis/business/bean/admin/InvigilateListProgressBean.java

@@ -86,6 +86,17 @@ public class InvigilateListProgressBean implements Serializable {
     @ApiModelProperty(name = "是否违纪")
     private String breachStatusStr;
 
+    @ApiModelProperty(name = "班级")
+    private String classNo;
+
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+
     public Integer getBreachStatus() {
         return breachStatus;
     }

themis-business/src/main/java/com/qmth/themis/business/bean/admin/InvigilateListProgressExcelBean.java

@@ -35,26 +35,38 @@ public class InvigilateListProgressExcelBean implements Serializable {
     @ExcelProperty(name = "姓名", width = 30, index = 5)
     private String name;
 
+    @ApiModelProperty(name = "班级")
+    @ExcelProperty(name = "班级", width = 30, index = 6)
+    private String classNo;
+
 //    @ApiModelProperty(name = "联系电话")
 //    @ExcelProperty(name = "联系电话", width = 30, index = 6)
 //    private String mobileNumber;
 
     @ApiModelProperty(name = "科目名称")
-    @ExcelProperty(name = "科目(代码)", width = 30, index = 6)
+    @ExcelProperty(name = "科目(代码)", width = 30, index = 7)
     private String courseName;
 
     @ApiModelProperty(value = "剩余考试次数")
-    @ExcelProperty(name = "剩余考试次数", width = 30, index = 7)
+    @ExcelProperty(name = "剩余考试次数", width = 30, index = 8)
     private Integer leftExamCount;
 
     @ApiModelProperty(name = "考生状态")
-    @ExcelProperty(name = "完成状态", width = 30, index = 8)
+    @ExcelProperty(name = "完成状态", width = 30, index = 9)
     private String status;
 
     @ApiModelProperty(name = "违纪状态")
-    @ExcelProperty(name = "违纪状态", width = 30, index = 9)
+    @ExcelProperty(name = "违纪状态", width = 30, index = 10)
     private String breachStatus;
 
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+
     public String getBreachStatus() {
         return breachStatus;
     }

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -600,7 +600,8 @@
         t.monitor_record as monitorRecord,
         (select GROUP_CONCAT(tmtvm.video_source) from t_m_tencent_video_message tmtvm where tmtvm.exam_record_id = t.id) as videoSource,
         t.tencent_video_url as tencentVideoUrl,
-        IFNULL(t.breach_status,1) as breachStatus
+        IFNULL(t.breach_status,1) as breachStatus,
+        tees.class_no as classNo
         from
         t_e_exam_student tees
         left join t_e_exam tee on
@@ -688,7 +689,8 @@
         tees.id and (toer.status = 'FINISHED' or toer.status = 'PERSISTED') and toer.first_start_time is not null) as
         statusTemp,
         <!--tes.mobile_number as mobileNumber,-->
-        t.breach_status as breachStatusTemp
+        t.breach_status as breachStatusTemp,
+        tees.class_no as classNo
         from
         t_e_exam_student tees
         left join t_e_exam tee on