教师批阅时仅获取学生已作答试题

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentQuestionService.java

@@ -1,16 +1,11 @@
 package com.xhkjedu.sstudy.service.paperstudent;
 
-import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sstudy.mapper.paper.PaperQtypeQuestionMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentQuestionMapper;
-import com.xhkjedu.sstudy.model.paper.TPaperQtypeQuestion;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentQuestion;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
-import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentVo;
 import com.xhkjedu.utils.N_Utils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -19,7 +14,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author ywx
@@ -69,6 +63,7 @@ public class PaperStudentQuestionService {
      * @return java.util.List<com.xhkjedu.vo.paperstudent.PaperStudentQuestionVo>
      **/
     public List<PaperStudentQuestionVo> listCorrectQuestion(Integer psid) {
+        //2024-09-19产品南总确认获取试题时不获取未作答自动批改的试题
         return paperStudentQuestionMapper.listCorrectQuestion(psid);
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentScantronService.java

@@ -6,13 +6,14 @@ import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentScantron;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentScantronVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentVo;
 import com.xhkjedu.utils.N_Utils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @ClassName PaperStudentScantronService
@@ -47,6 +48,7 @@ public class PaperStudentScantronService {
      * @return java.util.List<com.xhkjedu.vo.paperstudent.PaperStudentScantronVo>
      **/
     public List<PaperStudentScantronVo> sListCorrectQuestion(Integer psid) {
+        //2024-09-19产品南总确认获取试题时不获取未作答自动批改的试题
         return paperStudentScantronMapper.sListCorrectQuestion(psid);
     }
 

sstudy/src/main/resources/mapper/paperstudent/PaperStudedntScantronMapper.xml

@@ -30,7 +30,7 @@
         pss.good,psc.qtypeid,psc.qtypename,psc.ctype,psc.psanswer
         FROM t_paper_student_scantron pss
         LEFT JOIN t_paper_scantron psc ON pss.pscaid = psc.pscaid
-        WHERE pss.psid=#{psid} and psc.ctype in(3,13,14,15)
+        WHERE pss.psid=#{psid} and pss.answered=1 and psc.ctype in(3,13,14,15)
         order by pss.qorder
     </select>
 

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

@@ -41,7 +41,7 @@
         ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypeid,q.qtypename
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
-        WHERE psq.psid=#{psid} and q.ctype in(3,13,14,15)
+        WHERE psq.psid=#{psid} and psq.answered=1 and q.ctype in(3,13,14,15)
         ORDER BY psq.qorder
     </select>
     <!--作业关联试题列表-->