fixbugs

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

@@ -18,10 +18,13 @@ public interface ExamQuestionDao extends JpaRepository<ExamQuestion, Integer>, J
     public List<ExamQuestion> findByExamIdAndSubjectCodeAndObjective(Integer examId, String subjectCode,
             boolean objective);
 
-    @Query("select q from ExamQuestion q where q.examId=?1 and q.subjectCode=?2 and q.objective=?3 "
-            + " group by q.mainNumber, q.subNumber order by q.mainNumber, q.subNumber")
-    public List<ExamQuestion> findByExamIdAndSubjectCodeAndObjectiveGroupByNumber(Integer examId, String subjectCode,
-            boolean objective);
+    // @Query("select q from ExamQuestion q where q.examId=?1 and q.subjectCode=?2 and q.objective=?3 "
+    // +
+    // " group by q.mainNumber, q.subNumber order by q.mainNumber, q.subNumber")
+    // public List<ExamQuestion>
+    // findByExamIdAndSubjectCodeAndObjectiveGroupByNumber(Integer examId,
+    // String subjectCode,
+    // boolean objective);
 
     @Query("select count(q) from ExamQuestion q where q.examId=?1 and q.subjectCode=?2 and q.objective=?3 and q.mainNumber=?4")
     public long countByExamIdAndSubjectCodeAndObjectiveAndMainNumber(Integer examId, String subjectCode,

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamQuestionServiceImpl.java

@@ -108,8 +108,10 @@ public class ExamQuestionServiceImpl extends BaseQueryService<ExamQuestion> impl
     @Override
     public List<ExamQuestion> findByExamAndSubjectAndObjectiveGroupByNumber(Integer examId, String subjectCode,
             boolean objective) {
-        return questionSort(questionDao.findByExamIdAndSubjectCodeAndObjectiveGroupByNumber(examId, subjectCode,
-                objective));
+        List<String> paperTypeList = this.getPaperType(examId, subjectCode);
+        List<ExamQuestion> list = this.findByExamAndSubjectAndObjectiveAndPaperType(examId, subjectCode, objective,
+                paperTypeList.get(0));
+        return questionSort(list);
     }
 
     @Override

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -1360,7 +1360,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         StringBuilder sql = new StringBuilder();
         sql.append(" select s.sheet_count sheetCount,s.exam_number examNumber,s.exam_id examId,s.id,s.student_code studentCode,s.name");
         sql.append(" ,s.subject_code subjectCode,s.subject_name subjectName,s.is_upload upload,s.is_breach breach,s.is_absent absent,s.subjective_score subjectiveScore ");
-        sql.append(" ,s.score_verify_time scoreVerifyTime,s.subjective_score_list subjectiveScoreList,s.objective_score objectiveScore ");
+        sql.append(" ,s.score_verify_time scoreVerifyTime,s.subjective_score_list subjectiveScoreList,s.objective_score objectiveScore,s.objective_score_list objectiveScoreList  ");
         sql.append(" ,s.subject_level subjectLevel,s.subject_category subjectCategory,s.college,s.class_name className,s.teacher ");
         sql.append(" ,s.exam_site examSite,s.exam_room examRoom,s.package_code packageCode");
         sql.append(" from eb_exam_student s ");
@@ -1537,8 +1537,8 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     }
 
     @Transactional
-	@Override
-	public void cancelInspect(int examId, String subjectCode) {
-    	studentDao.cancelInspect(examId, subjectCode);
-	}
+    @Override
+    public void cancelInspect(int examId, String subjectCode) {
+        studentDao.cancelInspect(examId, subjectCode);
+    }
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -829,7 +829,7 @@ public class PaperController extends BaseExamController {
                     + "&level=" + query.getLevel() + "&upload=" + u + "&totalScoreNotEqual=" + t;
         }
         question.setExamId(examId);
-        if (StringUtils.isNotBlank(question.getPaperType())) {
+        if (StringUtils.isBlank(question.getPaperType())) {
             question.setPaperType(NULL_PAPER_TYPE_PLACEHOLDER);
         }
         if (question.isObjective()) {