|
@@ -40,10 +40,16 @@ public class ExamStudentDTO {
|
|
@ExcelField(title = "总分", align = 2, sort = 110)
|
|
@ExcelField(title = "总分", align = 2, sort = 110)
|
|
private double totalScore;
|
|
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;
|
|
private String subjectiveScoreList;
|
|
|
|
|
|
- @ExcelField(title = "备注", align = 2, sort = 130)
|
|
|
|
|
|
+ @ExcelField(title = "备注", align = 2, sort = 150)
|
|
private String remark;
|
|
private String remark;
|
|
|
|
|
|
public ExamStudentDTO(ExamStudent student) {
|
|
public ExamStudentDTO(ExamStudent student) {
|
|
@@ -59,6 +65,8 @@ public class ExamStudentDTO {
|
|
setSubjectiveScore(student.getSubjectiveScore()!=null?student.getSubjectiveScore():0d);
|
|
setSubjectiveScore(student.getSubjectiveScore()!=null?student.getSubjectiveScore():0d);
|
|
setSubjectiveScoreList(StringUtils.trimToEmpty(student.getSubjectiveScoreList()));
|
|
setSubjectiveScoreList(StringUtils.trimToEmpty(student.getSubjectiveScoreList()));
|
|
setTotalScore(student.getTotalScore());
|
|
setTotalScore(student.getTotalScore());
|
|
|
|
+ setAbsent(student.isAbsent() || !student.isUpload()?"是":"否");
|
|
|
|
+ setBreach(student.isBreach()?"是":"否");
|
|
setRemark(StringUtils.trimToEmpty(student.getRemark()));
|
|
setRemark(StringUtils.trimToEmpty(student.getRemark()));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -165,4 +173,20 @@ public class ExamStudentDTO {
|
|
public void setSubjectCategory(String subjectCategory) {
|
|
public void setSubjectCategory(String subjectCategory) {
|
|
this.subjectCategory = 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;
|
|
|
|
+ }
|
|
}
|
|
}
|