Bläddra i källkod

成绩导出中新增2列:是否缺考和是否违纪

nikang 6 år sedan
förälder
incheckning
455926f688

+ 26 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ExamStudentDTO.java

@@ -40,10 +40,16 @@ public class ExamStudentDTO {
     @ExcelField(title = "总分", align = 2, sort = 110)
     private double totalScore;
 
-    @ExcelField(title = "评分明细", align = 2, sort = 120)
+    @ExcelField(title = "是否缺考", align = 2, sort = 120)
+    private String absent;
+
+    @ExcelField(title = "是否违纪", align = 2, sort = 130)
+    private String breach;
+
+    @ExcelField(title = "评分明细", align = 2, sort = 140)
     private String subjectiveScoreList;
 
-    @ExcelField(title = "备注", align = 2, sort = 130)
+    @ExcelField(title = "备注", align = 2, sort = 150)
     private String remark;
 
     public ExamStudentDTO(ExamStudent student) {
@@ -59,6 +65,8 @@ public class ExamStudentDTO {
         setSubjectiveScore(student.getSubjectiveScore()!=null?student.getSubjectiveScore():0d);
         setSubjectiveScoreList(StringUtils.trimToEmpty(student.getSubjectiveScoreList()));
         setTotalScore(student.getTotalScore());
+        setAbsent(student.isAbsent() || !student.isUpload()?"是":"否");
+        setBreach(student.isBreach()?"是":"否");
         setRemark(StringUtils.trimToEmpty(student.getRemark()));
     }
 
@@ -165,4 +173,20 @@ public class ExamStudentDTO {
     public void setSubjectCategory(String subjectCategory) {
         this.subjectCategory = subjectCategory;
     }
+
+    public String getAbsent() {
+        return absent;
+    }
+
+    public void setAbsent(String absent) {
+        this.absent = absent;
+    }
+
+    public String getBreach() {
+        return breach;
+    }
+
+    public void setBreach(String breach) {
+        this.breach = breach;
+    }
 }