|
@@ -33,10 +33,10 @@ public class ExamStudentDTO {
|
|
|
private String name;
|
|
|
|
|
|
@ExcelField(title = "客观总分", align = 2, sort = 90)
|
|
|
- private double objectiveScore;
|
|
|
+ private String objectiveScore;
|
|
|
|
|
|
@ExcelField(title = "主观总分", align = 2, sort = 100)
|
|
|
- private double subjectiveScore;
|
|
|
+ private String subjectiveScore;
|
|
|
|
|
|
@ExcelField(title = "总分", align = 2, sort = 110)
|
|
|
private String totalScore;
|
|
@@ -73,12 +73,14 @@ public class ExamStudentDTO {
|
|
|
setExamNumber(student.getExamNumber());
|
|
|
setStudentCode(student.getStudentCode());
|
|
|
setName(student.getName());
|
|
|
- setObjectiveScore(student.getObjectiveScore());
|
|
|
- setSubjectiveScore(student.getSubjectiveScore());
|
|
|
setSubjectiveScoreList(StringUtils.trimToEmpty(student.getSubjectiveScoreList()));
|
|
|
if (!student.isUpload() || student.isAbsent()) {
|
|
|
setTotalScore("-");
|
|
|
+ setObjectiveScore("-");
|
|
|
+ setSubjectiveScore("-");
|
|
|
} else {
|
|
|
+ setObjectiveScore(String.valueOf(student.getObjectiveScore()));
|
|
|
+ setSubjectiveScore(String.valueOf(student.getSubjectiveScore()));
|
|
|
setTotalScore(String.valueOf(student.getTotalScore()));
|
|
|
}
|
|
|
if (student.isBreach()) {
|
|
@@ -149,19 +151,19 @@ public class ExamStudentDTO {
|
|
|
this.totalScore = totalScore;
|
|
|
}
|
|
|
|
|
|
- public double getObjectiveScore() {
|
|
|
+ public String getObjectiveScore() {
|
|
|
return objectiveScore;
|
|
|
}
|
|
|
|
|
|
- public void setObjectiveScore(double objectiveScore) {
|
|
|
+ public void setObjectiveScore(String objectiveScore) {
|
|
|
this.objectiveScore = objectiveScore;
|
|
|
}
|
|
|
|
|
|
- public double getSubjectiveScore() {
|
|
|
+ public String getSubjectiveScore() {
|
|
|
return subjectiveScore;
|
|
|
}
|
|
|
|
|
|
- public void setSubjectiveScore(double subjectiveScore) {
|
|
|
+ public void setSubjectiveScore(String subjectiveScore) {
|
|
|
this.subjectiveScore = subjectiveScore;
|
|
|
}
|
|
|
|