deason 11 сар өмнө
parent
commit
3c2f43f137

+ 2 - 1
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentEntityConvert.java

@@ -90,7 +90,7 @@ public class ExamStudentEntityConvert {
 
 	public static List<ExamStudentExcel> ofExcel(List<ExamStudentInfo> examStudentInfoList) {
 		List<ExamStudentExcel> list = new ArrayList<>();
-		if (examStudentInfoList == null || examStudentInfoList.size() == 0) {
+		if (examStudentInfoList == null || examStudentInfoList.isEmpty()) {
 			return list;
 		}
 		examStudentInfoList.forEach(e -> {
@@ -106,6 +106,7 @@ public class ExamStudentEntityConvert {
 			excel.setSpecialtyName(e.getSpecialtyName());
 			excel.setOrgName(e.getOrgName());
 			excel.setFinished(e.getFinishedStatus());
+			excel.setUsedNum(e.getUsedNum());
 			excel.setExamStageId(e.getExamStageId());
 			excel.setExamId(e.getExamId());
 			list.add(excel);

+ 13 - 2
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentExcel.java

@@ -53,10 +53,13 @@ public class ExamStudentExcel implements Serializable {
 
     @ExcelProperty(name = "完成状态", index = 11)
     private String finished;
+
+    @ExcelProperty(name = "已考次数", index = 12)
+    private Integer usedNum;
     
     private Long examId;
     
-    @ExcelProperty(name = "场次", width = 30, index = 12)
+    @ExcelProperty(name = "场次", width = 30, index = 13)
     private String examStage;
     
     private Long examStageId;
@@ -161,7 +164,15 @@ public class ExamStudentExcel implements Serializable {
         this.finished = finished;
     }
 
-	public Integer getExamStageOrder() {
+    public Integer getUsedNum() {
+        return usedNum;
+    }
+
+    public void setUsedNum(Integer usedNum) {
+        this.usedNum = usedNum;
+    }
+
+    public Integer getExamStageOrder() {
 		return examStageOrder;
 	}