1
0
ting.yin 3 жил өмнө
parent
commit
d9df49f3f1

+ 10 - 8
stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ExamStudentDTO.java

@@ -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;
     }
 

+ 7 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreController.java

@@ -170,6 +170,7 @@ public class ScoreController extends BaseExamController {
             addMessage(redirectAttributes, "请选择正确的考试");
             return "redirect:/admin/exam/score";
         }
+        String fileName = "成绩单.xlsx";
         query.setExamId(exam.getId());
         Set<String> subjectSet = new HashSet<>();
         // 单科目导出
@@ -194,8 +195,10 @@ public class ScoreController extends BaseExamController {
                     subjectSet.add(subject.getCode());
                 }
             }
+            if (list.size() != subjectSet.size()) {
+                fileName = "成绩单(未导出全量数据).xlsx";
+            }
         }
-        String fileName = "成绩单.xlsx";
         try {
             List<ExamStudentDTO> list = new LinkedList<>();
             // 可导出科目不为空时,才能执行查询操作
@@ -210,8 +213,9 @@ public class ScoreController extends BaseExamController {
                         student.setObjectiveScore(0d);
                         student.setSubjectiveScore(0d);
                     }
-                    if(student.getSubjectiveScoreList()!=null){
-                        student.setSubjectiveScoreList(student.getSubjectiveScoreList().replace(UN_SELECTIVE_SCORE, "/"));
+                    if (student.getSubjectiveScoreList() != null) {
+                        student.setSubjectiveScoreList(student.getSubjectiveScoreList()
+                                .replace(UN_SELECTIVE_SCORE, "/"));
                     }
                     list.add(new ExamStudentDTO(student));
                 }