违纪名单导出，增加身份证号

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/ExamAuditEntityConvert.java

@@ -97,18 +97,19 @@ public class ExamAuditEntityConvert {
 			 */
 			excel.setExamStageId(e.getExamStageId());
 			if(excel.getExamStageId()!=null) {
-    			ExamStageCacheBean stage=CacheHelper.getExamStage(excel.getExamId(), excel.getExamStageId());
-    			excel.setExamStageOrder(stage.getStageOrder());
-    			excel.setStartTime(stage.getStartTime());
-    			excel.setEndTime(stage.getEndTime());
-    			excel.setExamStage(stage.getStageOrder() + "("
+				ExamStageCacheBean stage=CacheHelper.getExamStage(excel.getExamId(), excel.getExamStageId());
+				excel.setExamStageOrder(stage.getStageOrder());
+				excel.setStartTime(stage.getStartTime());
+				excel.setEndTime(stage.getEndTime());
+				excel.setExamStage(stage.getStageOrder() + "("
 						+ DateUtil.format(stage.getStartTime(), DateUtil.DatePatterns.CHINA_DEFAULT) + "至"
 						+ DateUtil.format(stage.getEndTime(), DateUtil.DatePatterns.CHINA_DEFAULT) + ")");
-    		}
+			}
 			excel.setOrgName(e.getOrgName());
 			excel.setDisciplineType(e.getDisciplineType());
 			excel.setExamName(e.getExamName());
 			excel.setStudentCode(e.getStudentCode());
+			excel.setIdentityNumber(e.getIdentityNumber());
 			excel.setStudentName(e.getStudentName());
 			excel.setCourseCode(e.getCourseCode());
 			excel.setCourseName(e.getCourseName());

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/ExamAuditExcel.java

@@ -20,9 +20,6 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  */
 public class ExamAuditExcel implements JsonSerializable {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1269194645888320744L;
 
     @ExcelProperty(name = "考试记录ID", index = 2)
@@ -37,10 +34,13 @@ public class ExamAuditExcel implements JsonSerializable {
     @ExcelProperty(name = "批次名称", index = 1)
     private String examName;
 
-    @ExcelProperty(name = "学号", index = 7)
+    @ExcelProperty(name = "身份证号", index = 7)
+    private String identityNumber;
+
+    @ExcelProperty(name = "学号", index = 8)
     private String studentCode;
 
-    @ExcelProperty(name = "姓名", index = 8)
+    @ExcelProperty(name = "姓名", index = 9)
     private String studentName;
 
     @ExcelProperty(name = "科目代码", index = 4)
@@ -52,41 +52,41 @@ public class ExamAuditExcel implements JsonSerializable {
     @ExcelProperty(name = "课程层次", index = 6)
     private String courseLevel;
 
-    @ExcelProperty(name = "成功次数", index = 10)
+    @ExcelProperty(name = "成功次数", index = 11)
     private Integer faceSuccessCount;
 
-    @ExcelProperty(name = "陌生人记录", index = 11)
+    @ExcelProperty(name = "陌生人记录", index = 12)
     private Integer faceStrangerCount;
 
-    @ExcelProperty(name = "校验次数", index = 9)
+    @ExcelProperty(name = "校验次数", index = 10)
     private Integer faceTotalCount;
 
-    @ExcelProperty(name = "成功率", index = 12)
+    @ExcelProperty(name = "成功率", index = 13)
     private Double faceSuccessPercent;
 
     @ExcelProperty(name = "客观题总分", index = 5)
     private Double objectiveScore;
 
-    @ExcelProperty(name = "违纪描述", index = 14)
+    @ExcelProperty(name = "违纪描述", index = 15)
     private String disciplineDetail;
 
-    @ExcelProperty(name = "Ip", index = 15)
+    @ExcelProperty(name = "Ip", index = 16)
     private String ip;
-    
+
     private Long examId;
-    
-    @ExcelProperty(name = "场次", width = 30, index = 16)
+
+    @ExcelProperty(name = "场次", width = 30, index = 17)
     private String examStage;
-    
+
     private Long examStageId;
-    
+
     private Integer examStageOrder;
-    
+
     /**
      * 场次开始时间
      */
     private Date startTime;
-    
+
     /**
      * 场次结束时间
      */
@@ -116,6 +116,14 @@ public class ExamAuditExcel implements JsonSerializable {
         this.examName = examName;
     }
 
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
+
     public String getStudentCode() {
         return studentCode;
     }
@@ -220,54 +228,54 @@ public class ExamAuditExcel implements JsonSerializable {
         this.ip = ip;
     }
 
-	public Integer getExamStageOrder() {
-		return examStageOrder;
-	}
+    public Integer getExamStageOrder() {
+        return examStageOrder;
+    }
 
-	public void setExamStageOrder(Integer examStageOrder) {
-		this.examStageOrder = examStageOrder;
-	}
+    public void setExamStageOrder(Integer examStageOrder) {
+        this.examStageOrder = examStageOrder;
+    }
 
-	public String getExamStage() {
-		return examStage;
-	}
+    public String getExamStage() {
+        return examStage;
+    }
 
-	public void setExamStage(String examStage) {
-		this.examStage = examStage;
-	}
+    public void setExamStage(String examStage) {
+        this.examStage = examStage;
+    }
 
-	public Long getExamStageId() {
-		return examStageId;
-	}
+    public Long getExamStageId() {
+        return examStageId;
+    }
 
-	public void setExamStageId(Long examStageId) {
-		this.examStageId = examStageId;
-	}
+    public void setExamStageId(Long examStageId) {
+        this.examStageId = examStageId;
+    }
 
-	public Date getStartTime() {
-		return startTime;
-	}
+    public Date getStartTime() {
+        return startTime;
+    }
 
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
 
-	public Date getEndTime() {
-		return endTime;
-	}
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
 
-	public Long getExamId() {
-		return examId;
-	}
 
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
 
-	
-    
 }