deason 2 vuotta sitten
vanhempi
commit
ed7df7f839

+ 12 - 3
src/main/java/cn/com/qmth/examcloud/tool/service/export_student_answer_and_score_detail/ExportStudentAnswerAndScoreDetailTask.java

@@ -90,7 +90,13 @@ public class ExportStudentAnswerAndScoreDetailTask {
 
         List<List<String>> excelRows = new ArrayList<>();
         for (ExamStudentScoreVO vo : examStudentScoreList) {
-            List<String> rowValues = Lists.newArrayList(vo.getOrgName(), vo.getCourseCode(), vo.getCourseName(), vo.getCourseLevel(), vo.getIdentityNumber(), vo.getStudentCode(), vo.getStudentName(), vo.getGrade(), vo.getSpecialtyName(), vo.getIsAbsent(), vo.getObjectiveScore().replace("--", "0"), vo.getSubjectiveScore().replace("--", "0"), vo.getFinalExamScore().replace("--", "0"));
+            List<String> rowValues = Lists.newArrayList(vo.getOrgName(), vo.getCourseCode(), vo.getCourseName(),
+                    vo.getCourseLevel(), vo.getIdentityNumber(), vo.getStudentCode(), vo.getStudentName(),
+                    vo.getGrade(), vo.getSpecialtyName(), vo.getIsAbsent(),
+                    vo.getObjectiveScore().replace("--", "0"),
+                    vo.getSubjectiveScore().replace("--", "0"),
+                    vo.getFinalExamScore().replace("--", "0"),
+                    vo.getBasePaperId());
             excelRows.add(rowValues);
 
             if (vo.getExamRecordDataId() == null) {
@@ -168,11 +174,14 @@ public class ExportStudentAnswerAndScoreDetailTask {
             rowValues.addAll(dynamicColumnValues);
         }
 
-        List<String> excelHeaders = Lists.newArrayList("学习中心", "课程代码", "课程名称", "课程层次", "身份证号", "学号", "姓名", "年级", "专业", "是否缺考", "客观总分", "主观总分", "总分");
+        List<String> excelHeaders = Lists.newArrayList("学习中心", "课程代码", "课程名称", "课程层次", "身份证号",
+                "学号", "姓名", "年级", "专业", "是否缺考", "客观总分", "主观总分", "总分", "试卷ID");
         excelHeaders.addAll(dynamicExcelHeaders);
 
         final String filePath = sysProperty.getDataDir() + "/" + tempDir + "/" + examId + "_" + course.getCourseCode() + ".xlsx";
-        EasyExcel.write(filePath).head(ExcelHelper.buildHeaders(excelHeaders)).registerWriteHandler(ExcelHelper.sheetStrategy()).registerWriteHandler(ExcelHelper.styleStrategy()).sheet().doWrite(excelRows);
+        EasyExcel.write(filePath).head(ExcelHelper.buildHeaders(excelHeaders))
+                .registerWriteHandler(ExcelHelper.sheetStrategy())
+                .registerWriteHandler(ExcelHelper.styleStrategy()).sheet().doWrite(excelRows);
 
         log.info("examId:{} courseId:{} courseCode:{} totalRows:{} 已处理!", examId, course.getCourseId(), course.getCourseCode(), excelRows.size());
 

+ 5 - 0
src/main/java/cn/com/qmth/examcloud/tool/service/export_student_answer_and_score_detail/vo/ExamStudentScoreVO.java

@@ -112,4 +112,9 @@ public class ExamStudentScoreVO {
      */
     private Long examRecordDataId;
 
+    /**
+     * 试卷ID
+     */
+    private String basePaperId;
+
 }

+ 2 - 1
src/main/resources/templates/login.ftlh

@@ -24,7 +24,8 @@
                         </el-form-item>
 
                         <el-form-item label="密码">
-                            <el-input v-model="password" placeholder="请输入密码" show-password></el-input>
+                            <el-input v-model="password" placeholder="请输入密码" @keyup.enter.native="doLogin"
+                                      show-password></el-input>
                         </el-form-item>
 
                         <el-form-item>