Merge remote-tracking branch 'origin/master'

src/main/java/cn/com/qmth/dp/examcloud/oe/modules/export_exam_student_score/ExportExamStudentScore.java

@@ -147,6 +147,9 @@ public class ExportExamStudentScore {
                 examStudent.setObjectiveScore(okScore.getObjectiveScore());
                 examStudent.setSubjectiveScore(okScore.getSubjectiveScore());
                 examStudent.setTotalScore(okScore.getTotalScore());
+
+                // System.out.println("base_paper_id = " + examRecordDataList.get(0).get("base_paper_id"));
+                // db.getCollection('paper').find({_id:ObjectId("5ed67e2bc68d4c520320b5b7")})
             } else {
                 // 多条考试记录情况
                 List<ScoreVO> scores = new ArrayList<>();
@@ -337,7 +340,7 @@ public class ExportExamStudentScore {
     }
 
     private List<Map<String, Object>> queryExamRecordDataList(Long examId, Long courseId, Long examStudentId) {
-        final String columns = "id,exam_record_status,is_illegality,is_warn,is_audit";
+        final String columns = "id,exam_record_status,is_illegality,is_warn,is_audit,base_paper_id";
         final String querySql = String.format("select %s from ec_oe_exam_record_data where exam_id = %s and course_id = %s and exam_student_id = %s", columns, examId, courseId, examStudentId);
         List<Map<String, Object>> result = jdbcTemplate.queryForList(querySql);