fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamDao.java

@@ -38,7 +38,7 @@ public interface ExamDao extends PagingAndSortingRepository<Exam, Integer>, JpaS
 
     public Exam findFirstBySchoolIdAndCode(Integer schoolId, String code);
 
-    @Query(value = "select * from eb_exam e where e.id in (select m.exam_id from eb_marker m where m.user_id=?1) and e.create_time >?2 "
+    @Query(value = "select * from eb_exam e where e.id in (select DISTINCT m.exam_id from eb_marker m where m.user_id=?1) and e.create_time >?2 "
             + "order by e.id", nativeQuery = true)
     public List<Exam> findByMarkerUserId(Integer userId, Date time);
 

stmms-web/src/main/webapp/WEB-INF/views/include/trialDetail.jsp

@@ -84,7 +84,7 @@
                             url: paperUrl,
                             dataType: "json",
                             success: function (data) {
-                                paperqQuestions = data.subjectives;
+                                paperqQuestions = data.questions;
                             }
                         })
                         $.ajax({
@@ -125,7 +125,7 @@
                                                     "italic": true,
                                                     "danger": true
                                                 },
-                                                "value": "(字数统计：" + textCount(question.studentAnswer) + ")"
+                                                "value": "(字数统计：" + textCount(question.answer) + ")"
                                             }]
                                         };
                                         let standardTitle = {
@@ -143,7 +143,7 @@
                                         }
                                         $(renderRichText(paperQuestion.body)).appendTo(this.holder);
                                         $(renderSection(answerTitle)).appendTo(this.holder);
-                                        $(renderRichText(question.studentAnswer)).appendTo(this.holder);
+                                        $(renderRichText(question.answer)).appendTo(this.holder);
                                         $(renderSection(standardTitle)).appendTo(this.holder);
                                         $(renderRichText(paperQuestion.answer)).appendTo(this.holder);
                                         trialDetailModal.setContent($('#trial-detail-content'));

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/jsonView.jsp

@@ -43,7 +43,7 @@
             url: paperUrl,
             dataType: "json",
             success: function (data) {
-            	paperqQuestions = data.subjectives;
+            	paperqQuestions = data.questions;
             }
         })
         $.ajax({
@@ -84,7 +84,7 @@
                                     "italic": true,
                                     "danger": true
                                 },
-                                "value": "(字数统计：" + textCount(question.studentAnswer) + ")"
+                                "value": "(字数统计：" + textCount(question.answer) + ")"
                             }]
                         };
                         let standardTitle = {
@@ -102,7 +102,7 @@
                         }
                         $(renderRichText(paperQuestion.body)).appendTo(this.holder);
                         $(renderSection(answerTitle)).appendTo(this.holder);
-                        $(renderRichText(question.studentAnswer)).appendTo(this.holder);
+                        $(renderRichText(question.answer)).appendTo(this.holder);
                         $(renderSection(standardTitle)).appendTo(this.holder);
                         $(renderRichText(paperQuestion.answer)).appendTo(this.holder);
                     }