deason 5 年之前
父节点
当前提交
0fe6fa322f

+ 78 - 3
src/main/java/cn/com/qmth/dp/examcloud/oe/modules/export_exam_student_score/ExportExamStudentScore.java

@@ -58,14 +58,89 @@ public class ExportExamStudentScore {
         // examMaps.put(822L, Lists.list());
         // examMaps.put(823L, Lists.list());
 
+        // examMaps.put(824L, Lists.list());
+        // examMaps.put(826L, Lists.list());
+        // examMaps.put(827L, Lists.list());
+        // examMaps.put(828L, Lists.list());
+        // examMaps.put(829L, Lists.list());
+        // examMaps.put(830L, Lists.list());
+        // examMaps.put(831L, Lists.list());
+        // examMaps.put(832L, Lists.list());
+        // examMaps.put(834L, Lists.list());
+        // examMaps.put(835L, Lists.list());
+        // examMaps.put(836L, Lists.list());
+        // examMaps.put(837L, Lists.list());
+        // examMaps.put(838L, Lists.list());
+        // examMaps.put(839L, Lists.list());
+        // examMaps.put(840L, Lists.list());
+        // examMaps.put(841L, Lists.list());
+        // examMaps.put(842L, Lists.list());
+        // examMaps.put(843L, Lists.list());
+        // examMaps.put(844L, Lists.list());
+        // examMaps.put(845L, Lists.list());
+        // examMaps.put(846L, Lists.list());
+        // examMaps.put(847L, Lists.list());
+        // examMaps.put(849L, Lists.list());
+        // examMaps.put(850L, Lists.list());
+        // examMaps.put(851L, Lists.list());
+        // examMaps.put(852L, Lists.list());
+        // examMaps.put(853L, Lists.list());
+        // examMaps.put(854L, Lists.list());
+        // examMaps.put(855L, Lists.list());
+        // examMaps.put(857L, Lists.list());
+        // examMaps.put(858L, Lists.list());
+        // examMaps.put(861L, Lists.list());
+        // examMaps.put(863L, Lists.list());
+        // examMaps.put(864L, Lists.list());
+        // examMaps.put(866L, Lists.list());
+        // examMaps.put(867L, Lists.list());
+        // examMaps.put(868L, Lists.list());
+        // examMaps.put(869L, Lists.list());
+        // examMaps.put(870L, Lists.list());
+        // examMaps.put(871L, Lists.list());
+        // examMaps.put(872L, Lists.list());
+        // examMaps.put(874L, Lists.list());
+        // examMaps.put(875L, Lists.list());
+        // examMaps.put(876L, Lists.list());
+        // examMaps.put(877L, Lists.list());
+        // examMaps.put(878L, Lists.list());
+        // examMaps.put(881L, Lists.list());
+        // examMaps.put(882L, Lists.list());
+        // examMaps.put(883L, Lists.list());
+        // examMaps.put(884L, Lists.list());
+        // examMaps.put(885L, Lists.list());
+        // examMaps.put(886L, Lists.list());
+        // examMaps.put(887L, Lists.list());
+        // examMaps.put(888L, Lists.list());
+        // examMaps.put(891L, Lists.list());
+        // examMaps.put(892L, Lists.list());
+        // examMaps.put(894L, Lists.list());
+        // examMaps.put(897L, Lists.list());
+        // examMaps.put(898L, Lists.list());
+        // examMaps.put(900L, Lists.list());
+        // examMaps.put(901L, Lists.list());
+        // examMaps.put(902L, Lists.list());
+        // examMaps.put(903L, Lists.list());
+        // examMaps.put(905L, Lists.list());
+        // examMaps.put(906L, Lists.list());
+        // examMaps.put(907L, Lists.list());
+        // examMaps.put(908L, Lists.list());
+        // examMaps.put(909L, Lists.list());
+        // examMaps.put(910L, Lists.list());
+        // examMaps.put(912L, Lists.list());
+        // examMaps.put(913L, Lists.list());
+        // examMaps.put(914L, Lists.list());
+        // examMaps.put(915L, Lists.list());
+
         this.export(examMaps);
     }
 
     private void export(HashMap<Long, List<Long>> examMaps) {
         Map<Long, String> orgNameMaps = new HashMap<>(), courseNameMaps = new HashMap<>();
 
+        int count = 1;
         for (Map.Entry<Long, List<Long>> entry : examMaps.entrySet()) {
-            log.info("===> export starting, examId = " + entry.getKey());
+            log.info((count++) + "===> export starting, examId = " + entry.getKey());
 
             // 获取考试下待导的课程
             List<Long> examCourseIds;
@@ -213,9 +288,9 @@ public class ExportExamStudentScore {
                     } else {
                         curDynamicColumnValues.add(this.convertChar(question.getStudentAnswer()));
                     }
-                    curDynamicColumnValues.add(question.getQuestionScore() != null ? question.getQuestionScore().toString() : "0");
+                    curDynamicColumnValues.add(question.getStudentScore() != null ? question.getStudentScore().toString() : "0");
                 } else {
-                    curDynamicColumnValues.add(question.getQuestionScore() != null ? question.getQuestionScore().toString() : "0");
+                    curDynamicColumnValues.add(question.getStudentScore() != null ? question.getStudentScore().toString() : "0");
                 }
 
                 curPaperStructKey += (question.getOrder() + question.getQuestionType());

+ 10 - 0
src/main/java/cn/com/qmth/dp/examcloud/oe/modules/export_exam_student_score/vo/ExamQuestionVO.java

@@ -23,6 +23,8 @@ public class ExamQuestionVO implements Serializable {
 
     private Double questionScore;
 
+    private Double studentScore;
+
     public String getId() {
         return id;
     }
@@ -70,4 +72,12 @@ public class ExamQuestionVO implements Serializable {
     public void setQuestionScore(Double questionScore) {
         this.questionScore = questionScore;
     }
+
+    public Double getStudentScore() {
+        return studentScore;
+    }
+
+    public void setStudentScore(Double studentScore) {
+        this.studentScore = studentScore;
+    }
 }