完善试卷信息

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

@@ -21,7 +21,7 @@
         left join e_paper_student_question psq on psq.eptqid=pq.eptqid
         where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
         left join e_base eb on es.examid = eb.examid
-        where a.tjnum!=a.pynum and eb.deleted=1
+        where a.tjnum!=a.pynum and eb.deleted=1 order by es.sdate desc,es.endtime desc
     </select>
     <!--已阅卷列表-->
     <select id="listMarked" resultType="java.util.Map">

smarking/src/main/java/com/xhkjedu/smarking/controller/paper/MsPaperQtypeController.java

@@ -131,16 +131,16 @@ public class MsPaperQtypeController {
     }
 
     /*
-     * @Description 试卷-主观题
+     * @Description 试卷-客观题/主观题
      * @Date 2024/10/21 13:53:38
      * @Author WN
      * @Param [subject]
      * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/paper_sub")
-    public ResultVo listSubjectiveQuesitons(@RequestBody MsSubject subject){
-        N_Utils.validation(new Object[]{subject.getMsid(),"考试科目id",1});
-        List<Map<String,Object>> map =msPaperQtypeService.listPaperSubjectiveQuestions(subject.getMsid());
+    @PostMapping("/paper_que")
+    public ResultVo listObjOrSubQuesitons(@RequestBody MsPaperParams params){
+        N_Utils.validation(new Object[]{params.getMpid(),"试卷id",1});
+        List<Map<String,Object>> map =msPaperQtypeService.listPaperSubjectiveQuestions(params.getMpid(),params.getQtype());
         return new ResultVo(0,"获取成功" ,map);
     }
 

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperMapper.java

@@ -41,8 +41,6 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
     //根据试卷id获取考试状态
     Integer getExamStateByMpid(@Param("mpid") Integer mpid);
 
-    //根据科目id获取试卷基础信息
-    MsPaper getPaperBaseByMsid(@Param("msid") Integer msid);
 
     //获取试卷ID及考试模式
     PExamSubjectVo getPaperAndMxammodeByMsid(@Param("msid") Integer msid);

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperQtypeMapper.java

@@ -26,9 +26,9 @@ public interface MsPaperQtypeMapper extends TkMapper<MsPaperQtype> {
     List<MsPaperQtypeVo> listPaperQtypeQuesitonsForFj(@Param("mpid") Integer mpid);
 
     //试卷主观题-附件
-    List<Map<String,Object>> listSubjectiveQuestionsFj(@Param("mpid") Integer mpid,@Param("ctypes")int[] ctypes);
+    List<Map<String,Object>> listSubjectiveQuestionsFj(@Param("mpid") Integer mpid,@Param("qtype")Integer qtype);
     //试卷主观题-题库
-    List<Map<String,Object>> listSubjectiveQuestionsTk(@Param("mpid") Integer mpid,@Param("ctypes")int[] ctypes);
+    List<Map<String,Object>> listSubjectiveQuestionsTk(@Param("mpid") Integer mpid,@Param("qtype")Integer qtype);
     //修改题型分，修改试卷分
     int updateQtypeScore(@Param("mptid") Integer mptid,@Param("mpid") Integer mpid);
     //修改题型分和试题数量，修改试卷分和试题数量

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -418,7 +418,7 @@ public class MsPaperQtypeService {
             msPaperAnalyzeMapper.insertUseGeneratedKeys(epa);
         } else {
             epa.setMpaid(existEpa.getMpaid());
-            msPaperAnalyzeMapper.updateByPrimaryKeySelective(epa);
+            msPaperAnalyzeMapper.updateByPrimaryKey(epa);
         }
     }
 
@@ -717,8 +717,10 @@ public class MsPaperQtypeService {
             }
 
             List<Map<String, Object>> qpoints = q.getPoints();
-            // 存放知识点
-            setPaperQuestionPointScore(pointqlist, quesplist, qpoints, q, null, null);
+            if(qpoints != null) {
+                // 存放知识点
+                setPaperQuestionPointScore(pointqlist, quesplist, qpoints, q, null, null);
+            }
         }
 
         double znumrate = N_Utils.getIntegerDivideAndMulitiply(znum, paper.getPnum());
@@ -869,7 +871,7 @@ public class MsPaperQtypeService {
             msPaperAnalyzeMapper.insertUseGeneratedKeys(epa);
         } else {
             epa.setMpaid(existEpa.getMpaid());
-            msPaperAnalyzeMapper.updateByPrimaryKeySelective(epa);
+            msPaperAnalyzeMapper.updateByPrimaryKey(epa);
         }
     }
 
@@ -898,15 +900,11 @@ public class MsPaperQtypeService {
         for (MsPaperQtypeQuestion tq : questions) {
             if (N_Utils.isTrueInteger(tq.getMptqid()) && N_Utils.isNotEmpty(tq.getQanswer())) {
                 MsPaperQtypeQuestion yq = yqlist.stream().filter(y -> y.getMptqid().equals(tq.getMptqid())).findFirst().orElse(null);
-
-                assert yq != null;
-                if (N_Utils.isObjectiveQuestion(yq.getCtype())) {
+                if(yq!=null && yq.getQtype() == 1){
                     if (!tq.getQanswer().equalsIgnoreCase(yq.getQanswer()) || !tq.getLoseoption().equals(yq.getLoseoption()) || !tq.getScoreset().equals(yq.getScoreset())) {
                         // 说明新设置的答案和原设置的答案不一致，则为变动的
                         tq.setCtype(yq.getCtype());
                         tq.setQscore(yq.getQscore());
-                        tq.setLoseoption(yq.getLoseoption());
-                        tq.setScoreset(yq.getScoreset());
                         changelist.add(tq);
                     }
                 }
@@ -1115,7 +1113,11 @@ public class MsPaperQtypeService {
             for (MsPaperQtypeVo qtype : qtypelist) {
                 List<MsPaperQtypeQuestionVo> questions = qtype.getQuestions();
                 for (MsPaperQtypeQuestionVo question : questions) {
-                    question.setQanswer(question.getAnswer());// 把试卷中设置的答案返回
+                    if(N_Utils.isNotEmpty(question.getAnswer())){
+                        //如果试卷已有答案，把试卷中设置的答案返回
+                        question.setQanswer(question.getAnswer());
+                    }
+
                 }
             }
             paper.put("qtypes", qtypelist);
@@ -1182,14 +1184,13 @@ public class MsPaperQtypeService {
      * @Param [mpid]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String, Object>> listPaperSubjectiveQuestions(Integer mpid) {
-        MsPaper paper = msPaperMapper.getPaperBaseByMsid(mpid);
-        int[] subjectivelist = N_Utils.subjectiveList;
+    public List<Map<String, Object>> listPaperSubjectiveQuestions(Integer mpid,Integer qtype) {
+        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
         List<Map<String, Object>> rtnList;
         if (paper.getPtype() == 1) {
-            rtnList = msPaperQtypeMapper.listSubjectiveQuestionsTk(mpid, subjectivelist);
+            rtnList = msPaperQtypeMapper.listSubjectiveQuestionsTk(mpid, qtype);
         } else {
-            rtnList = msPaperQtypeMapper.listSubjectiveQuestionsFj(mpid, subjectivelist);
+            rtnList = msPaperQtypeMapper.listSubjectiveQuestionsFj(mpid, qtype);
         }
 
         return rtnList;

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/MsPaperParams.java

@@ -30,5 +30,7 @@ public class MsPaperParams {
     private Integer movetype;//移动类型1上移2下移
     private Integer movevalue;//移动值
 
+    private Integer qtype;//试题类型1客观题2主观题
+
     private List<MsPaperQtypeQuestion> questions;//试题列表
 }

smarking/src/main/resources/mapper/paper/MsPaperMapper.xml

@@ -77,10 +77,6 @@
         select eb.examstate from ms_paper ep left join ms_exam eb on ep.examid = eb.examid where ep.mpid=#{mpid}
     </select>
 
-    <!--获取试卷基础信息-->
-    <select id="getPaperBaseByMsid" resultType="com.xhkjedu.smarking.model.paper.MsPaper">
-        select p.* from ms_paper p left join ms_subject s on s.msid=p.msid where s.msid=#{msid}
-    </select>
     <!--获取试卷ID及考试模式-->
     <select id="getPaperAndMxammodeByMsid" resultType="com.xhkjedu.smarking.vo.paper.PExamSubjectVo">
         select p.mpid,e.exammode from ms_paper p left join ms_exam e on p.examid=e.examidwhere p.msid=#{msid}

smarking/src/main/resources/mapper/paper/MsPaperQtypeMapper.xml

@@ -139,31 +139,31 @@
             <result column="mptqid" property="mptqid" />
             <result column="qscore" property="qscore" />
             <result column="qorder" property="qorder" />
-            <result column="qtypeid" property="qtypeid" />
-            <result column="qtypename" property="qtypename" />
             <result column="ctype" property="ctype" />
             <result column="qn" property="qn" />
+            <result column="qanswer" property="qanswer" />
+            <result column="optionnum" property="optionnum" />
+            <result column="loseoption" property="loseoption" />
+            <result column="scoreset" property="scoreset" />
+            <result column="sorder" property="sorder" />
         </collection>
     </resultMap>
     <select id="listSubjectiveQuestionsFj" resultMap="subjectiveQuestions">
         select t.mptid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.mptscore,
-        q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qorder
+        q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qorder,q.qanswer,q.optionnum,q.loseoption,q.scoreset
         from ms_paper_qtype_question q left join ms_paper_qtype t on t.mptid=q.mptid
-        where t.mpid=#{mpid} and q.ctype in
-        <foreach collection="ctypes" item="c" open="(" separator="," close=")">
-            #{c}
-        </foreach>
+        where t.mpid=#{mpid}
+        <if test="qtype!=null and qtype!=0"> and q.qtype=#{qtype}</if>
         order by t.mptorder,q.qorder
     </select>
 
     <select id="listSubjectiveQuestionsTk" resultMap="subjectiveQuestions">
-        select t.mptid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.mptscore,
-        q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qorder
+        select t.mptid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.mptscore,q.mptqid,
+        q.ctype,q.qscore,q.qn,q.qorder,q.qanswer,q.optionnum,q.loseoption,q.scoreset,q2.sorder
         from ms_paper_qtype_question q left join ms_paper_qtype t on t.mptid=q.mptid
-        where t.mpid=#{mpid} and q.ctype in
-        <foreach collection="ctypes" item="c" open="(" separator="," close=")">
-            #{c}
-        </foreach>
+        left join t_question q2 on q.questionid=q2.questionid
+        where t.mpid=#{mpid}
+        <if test="qtype!=null and qtype!=0"> and q.qtype=#{qtype}</if>
         order by t.mptorder,q.qorder
     </select>