Browse Source

监考明细和详情加入班级字段

wangliang 1 year ago
parent
commit
f7ea304d2d

+ 1 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateController.java

@@ -332,7 +332,7 @@ public class TIeInvigilateController {
         InvigilateListDetailBean invigilateListDetailBean = new InvigilateListDetailBean(examCacheBean.getName(),
         InvigilateListDetailBean invigilateListDetailBean = new InvigilateListDetailBean(examCacheBean.getName(),
                 examActivityCacheBean.getCode(), examId, examActivityId, examStudentId, examRecordId, identity,
                 examActivityCacheBean.getCode(), examId, examActivityId, examStudentId, examRecordId, identity,
                 examStudentName, courseNameCode, status, roomCode, roomName, breachStatus, basePhotoPath,
                 examStudentName, courseNameCode, status, roomCode, roomName, breachStatus, basePhotoPath,
-                examActivityCacheBean.getStartTime(), examActivityCacheBean.getFinishTime(), invigilateUsers);
+                examActivityCacheBean.getStartTime(), examActivityCacheBean.getFinishTime(), invigilateUsers, examStudentCacheBean.getClassNo());
 
 
         //考生轨迹
         //考生轨迹
         QueryWrapper<TEExamStudentLog> teExamStudentLogQueryWrapper = new QueryWrapper<>();
         QueryWrapper<TEExamStudentLog> teExamStudentLogQueryWrapper = new QueryWrapper<>();

+ 14 - 1
themis-business/src/main/java/com/qmth/themis/business/bean/admin/InvigilateListDetailBean.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.entity.TEExamStudentLog;
 import com.qmth.themis.business.entity.TEExamStudentLog;
 import com.qmth.themis.business.enums.ExamRecordStatusEnum;
 import com.qmth.themis.business.enums.ExamRecordStatusEnum;
+import com.qmth.themis.business.excel.ExcelProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 
@@ -99,6 +100,17 @@ public class InvigilateListDetailBean implements Serializable {
     @ApiModelProperty(name = "监考老师")
     @ApiModelProperty(name = "监考老师")
     private String invigilateUsers;
     private String invigilateUsers;
 
 
+    @ApiModelProperty(name = "班级")
+    private String classNo;
+
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+
     public Long getExamActivityStartTime() {
     public Long getExamActivityStartTime() {
         return examActivityStartTime;
         return examActivityStartTime;
     }
     }
@@ -159,7 +171,7 @@ public class InvigilateListDetailBean implements Serializable {
                                     Long examStudentId, Long examRecordId, String identity, String examStudentName,
                                     Long examStudentId, Long examRecordId, String identity, String examStudentName,
                                     String courseNameCode, ExamRecordStatusEnum statusCode, String roomCode, String roomName,
                                     String courseNameCode, ExamRecordStatusEnum statusCode, String roomCode, String roomName,
                                     Integer breachStatus, String basePhotoPath, Long examActivityStartTime,
                                     Integer breachStatus, String basePhotoPath, Long examActivityStartTime,
-                                    Long examActivityEndTime, String invigilateUsers) {
+                                    Long examActivityEndTime, String invigilateUsers, String classNo) {
         this.examName = examName;
         this.examName = examName;
         this.examActivityCode = examActivityCode;
         this.examActivityCode = examActivityCode;
         this.examId = examId;
         this.examId = examId;
@@ -177,6 +189,7 @@ public class InvigilateListDetailBean implements Serializable {
         this.examActivityStartTime = examActivityStartTime;
         this.examActivityStartTime = examActivityStartTime;
         this.examActivityEndTime = examActivityEndTime;
         this.examActivityEndTime = examActivityEndTime;
         this.invigilateUsers = invigilateUsers;
         this.invigilateUsers = invigilateUsers;
+        this.classNo = classNo;
     }
     }
 
 
     public String getMonitorRecord() {
     public String getMonitorRecord() {

+ 20 - 8
themis-business/src/main/java/com/qmth/themis/business/bean/admin/InvigilateListHistoryBean.java

@@ -64,8 +64,12 @@ public class InvigilateListHistoryBean implements Serializable {
     @ExcelProperty(name = "姓名", width = 30, index = 6)
     @ExcelProperty(name = "姓名", width = 30, index = 6)
     private String name;
     private String name;
 
 
+    @ApiModelProperty(name = "班级")
+    @ExcelProperty(name = "班级", width = 30, index = 7)
+    private String classNo;
+
     @ApiModelProperty(name = "考生状态")
     @ApiModelProperty(name = "考生状态")
-    @ExcelProperty(name = "状态", width = 30, index = 9)
+    @ExcelProperty(name = "状态", width = 30, index = 10)
     private String status;
     private String status;
 
 
     @ApiModelProperty(name = "考生状态值")
     @ApiModelProperty(name = "考生状态值")
@@ -75,39 +79,47 @@ public class InvigilateListHistoryBean implements Serializable {
     private FinishTypeEnum finishType;
     private FinishTypeEnum finishType;
 
 
     @ApiModelProperty(name = "交卷原因")
     @ApiModelProperty(name = "交卷原因")
-    @ExcelProperty(name = "交卷方式", width = 30, index = 10)
+    @ExcelProperty(name = "交卷方式", width = 30, index = 11)
     private String finishTypeStr;
     private String finishTypeStr;
 
 
     @ApiModelProperty(name = "预警量")
     @ApiModelProperty(name = "预警量")
-    @ExcelProperty(name = "预警数", width = 30, index = 13)
+    @ExcelProperty(name = "预警数", width = 30, index = 14)
     private Integer warningCount;
     private Integer warningCount;
 
 
     @ApiModelProperty(name = "陌生人脸")
     @ApiModelProperty(name = "陌生人脸")
-    @ExcelProperty(name = "陌生人脸", width = 30, index = 11)
+    @ExcelProperty(name = "陌生人脸", width = 30, index = 12)
     private Integer multipleFaceCount;
     private Integer multipleFaceCount;
 
 
     @ApiModelProperty(name = "异常处理")
     @ApiModelProperty(name = "异常处理")
-    @ExcelProperty(name = "异常处理", width = 30, index = 12)
+    @ExcelProperty(name = "异常处理", width = 30, index = 13)
     private Integer exceptionCount;
     private Integer exceptionCount;
 
 
     @ApiModelProperty(name = "是否违纪")
     @ApiModelProperty(name = "是否违纪")
     private Integer breachStatus;
     private Integer breachStatus;
 
 
     @ApiModelProperty(name = "是否违纪")
     @ApiModelProperty(name = "是否违纪")
-    @ExcelProperty(name = "违纪", width = 30, index = 14)
+    @ExcelProperty(name = "违纪", width = 30, index = 15)
     private String breachStatusStr;
     private String breachStatusStr;
 
 
     @ApiModelProperty(name = "更新时间")
     @ApiModelProperty(name = "更新时间")
     private Long updateTime;
     private Long updateTime;
 
 
     @ApiModelProperty(name = "科目代码")
     @ApiModelProperty(name = "科目代码")
-    @ExcelProperty(name = "科目代码", width = 30, index = 8)
+    @ExcelProperty(name = "科目代码", width = 30, index = 9)
     private String courseCode;
     private String courseCode;
 
 
     @ApiModelProperty(name = "联系电话")
     @ApiModelProperty(name = "联系电话")
-    @ExcelProperty(name = "联系电话", width = 30, index = 7)
+    @ExcelProperty(name = "联系电话", width = 30, index = 8)
     private String mobileNumber;
     private String mobileNumber;
 
 
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+
     public String getBreachStatusStr() {
     public String getBreachStatusStr() {
         if (Objects.nonNull(breachStatus)) {
         if (Objects.nonNull(breachStatus)) {
             return breachStatus.intValue() == 1 ? "正常" : "违纪";
             return breachStatus.intValue() == 1 ? "正常" : "违纪";

+ 2 - 1
themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -782,7 +782,8 @@
         toer.client_last_sync_time as updateTime,
         toer.client_last_sync_time as updateTime,
         toer.monitor_video_source as monitorVideoSource,
         toer.monitor_video_source as monitorVideoSource,
         toer.monitor_record as monitorRecord,
         toer.monitor_record as monitorRecord,
-        toer.finish_type as finishType
+        toer.finish_type as finishType,
+        s.class_no as classNo
         ,(select count(1) from t_ie_invigilate_warn_info tiiwi where 1 = 1
         ,(select count(1) from t_ie_invigilate_warn_info tiiwi where 1 = 1
         <if test="examId != null and examId != ''">
         <if test="examId != null and examId != ''">
             and tiiwi.exam_id = #{examId}
             and tiiwi.exam_id = #{examId}