线上题块设置及相关学生题块信息

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -1176,6 +1176,8 @@ public class N_Utils {
 
     //主观题处理题型
     public static int[] subjectiveList = new int[]{3,9,13,14,15};
+    //客观题题型处理
+    public static int[] objectiveList = new int[]{1,2,4,5,6,7,8,10,16,17};
 
     //简单题进行分项展示
     private static int[] simplelist = new int[]{1,2,4,5,6,7,8,10,16,17};

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

@@ -44,6 +44,9 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
     //根据科目id获取试卷基础信息
     MsPaper getPaperBaseByMsid(@Param("msid") Integer msid);
 
+    //获取试卷ID及考试模式
+    PExamSubjectVo getPaperAndMxammodeByMsid(@Param("msid") Integer msid);
+
     //根据考试id和科目id获取试卷信息
     MsPaper getPaperByExamIdAndSubjectId(@Param("examId") Integer examId, @Param("subjectId") String subjectId);
 
@@ -52,4 +55,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
 
     //根据考试科目ID获取试卷ID
     Integer getMpIdByMsId(@Param("msid") Integer msid);
+
+    //修改题块设置后试卷中试题数量
+    Integer updaePaperMeregpnumByMpid(@Param("mpid") Integer mpid, @Param("meregpnum") Integer meregpnum);
 }

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

@@ -27,4 +27,7 @@ public interface MsPaperQtypeQuestionMapper extends TkMapper<MsPaperQtypeQuestio
 
     //清空试题难易度
     int updateComplexityByMpid(@Param("mpid")Integer mpid);
+
+    //获取试卷中所有客观题
+    List<MsPaperQtypeQuestion> listObjectiveQuestionByMpid(@Param("mpid")Integer mpid, @Param("list")int[] objtypes);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentBlockMapper.java

@@ -16,6 +16,9 @@ public interface MsPaperStudentBlockMapper extends TkMapper<MsPaperStudentBlock>
     //根据学生试卷ID清空作答及批阅信息
     int updateStudentBlockQuestionByMpsid(@Param("mpsid")Integer mpsid);
 
+    //u清空试卷下所有学生作答及批阅信息
+    int updateStudentBlockQuestionByMpid(@Param("mpid")Integer mpid);
+
     //获取学生题块试题
     List<MsPaperStudentBlock> listPaperStuBlockQuestions(@Param("mpsid")Integer mpsid);
 

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentMapper.java

@@ -52,4 +52,6 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
     Integer getSubjectStateByMpsid(@Param("mpsid")Integer mpsid);
     //学生考试-提交试卷
     Integer updateStudentPaper(@Param("ps")MsPaperStudent ps);
+    //修改学生试卷设置题块收试题数量
+    Integer updatePaperMergepnumByMpid(@Param("mpid")Integer mpid,@Param("mergepnum")Integer mergepnum);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaper.java

@@ -29,6 +29,8 @@ public class MsPaper extends BaseBean {
     private Integer ptype;
     //试题数量
     private Integer pnum;
+    //合并后试题数量
+    private Integer mergepnum;
     //试卷总分
     private Double pscore;
     //是否设置正确答案0未设置1已设置

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsExamService.java

@@ -132,6 +132,7 @@ public class MsExamService {
             p.setSubjectid(s.getSubjectid());
             p.setPtype(0);
             p.setPnum(0);
+            p.setMergepnum(0);
             p.setPscore(0.0);
             p.setAnswered(0);
             p.setHasfile(0);

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

@@ -1,13 +1,14 @@
 package com.xhkjedu.smarking.service.paper;
 
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
-import com.xhkjedu.smarking.mapper.paper.MsPaperBlockMapper;
-import com.xhkjedu.smarking.mapper.paper.MsPaperBlockQuestionMapper;
-import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
-import com.xhkjedu.smarking.model.paper.MsPaper;
+import com.xhkjedu.smarking.mapper.paper.*;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlock;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
+import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.vo.paper.MsPaperParams;
+import com.xhkjedu.smarking.vo.paper.PExamSubjectVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +32,12 @@ public class MsPaperBlockService {
     private MsPaperBlockQuestionMapper msPaperBlockQuestionMapper;
     @Resource
     private MsSubjectMapper msSubjectMapper;
+    @Resource
+    private MsPaperQtypeQuestionMapper msPaperQtypeQuestionMapper;
+    @Resource
+    private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
 
     /*
      * @Description 获取试卷所有题块
@@ -54,23 +61,59 @@ public class MsPaperBlockService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public Integer save(MsPaperParams params){
-        MsPaper paper = msPaperMapper.getPaperBaseByMsid(params.getMsid());
+        PExamSubjectVo paper = msPaperMapper.getPaperAndMxammodeByMsid(params.getMsid());
         Integer mpid = paper.getMpid();
-        //先删除已存在题块
-        msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,2);
 
-        Integer createid = paper.getCreateid();
+        Integer createid = params.getCreateid();
         Integer timestamp = N_Utils.getSecondTimestamp();
+        List<MsPaperBlockQuestion> questions = new ArrayList<>();//保存的题块下试题
+        int papernum = 0;//试卷中试题总数量
+        if(paper.getExammode() == 3){
+            //线上考试，删除所有题块
+            msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,null);
+            //保存客观题相关题块
+            List<MsPaperQtypeQuestion> objQues = msPaperQtypeQuestionMapper.listObjectiveQuestionByMpid(mpid,N_Utils.objectiveList);
+            papernum = objQues.size();
+            Double bqscore = objQues.stream().mapToDouble(MsPaperQtypeQuestion::getQscore).sum();
+            MsPaperBlock obBlock = new MsPaperBlock();
+            obBlock.setMpid(mpid);
+            obBlock.setBlockname("客观题题块1");
+            obBlock.setBlocktype(1);
+            obBlock.setBlockorder(objQues.get(0).getQorder());
+            obBlock.setBqnum(papernum);
+            obBlock.setBqscore(bqscore);
+            obBlock.setCreateid(createid);
+            obBlock.setCreatetime(timestamp);
+            msPaperBlockMapper.insertUseGeneratedKeys(obBlock);
+            Integer mblockid = obBlock.getId();
+            for(MsPaperQtypeQuestion q : objQues){
+                MsPaperBlockQuestion bq = new MsPaperBlockQuestion();
+                bq.setMblockid(mblockid);
+                bq.setMpid(mpid);
+                bq.setMbqtype(1);
+                bq.setMptqid(q.getMptqid());
+                bq.setBqn(q.getQn());
+                bq.setBqscore(q.getQscore());
+                bq.setBqorder(q.getQorder());
+                bq.setCreateid(createid);
+                bq.setCreatetime(timestamp);
+                questions.add(bq);
+            }
+        }else{
+            //先删除已存在主观题题块
+            msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,2);
+        }
+
         List<MsPaperBlock> blocks = params.getBlocks();
         for(MsPaperBlock block : blocks){
             block.setBlocktype(2);
             block.setMpid(mpid);
             block.setCreateid(createid);
             block.setCreatetime(timestamp);
+            papernum += block.getBqnum();
         }
         msPaperBlockMapper.insertList(blocks);
-
-        List<MsPaperBlockQuestion> questions = new ArrayList<>();
+        //保存题块下试题
         for(MsPaperBlock block : blocks){
             List<MsPaperBlockQuestion> bqs = block.getQuestions();
             for(MsPaperBlockQuestion bq : bqs){
@@ -83,9 +126,17 @@ public class MsPaperBlockService {
         }
 
         msPaperBlockQuestionMapper.insertList(questions);
+        int pbsate = 1;
+        if(paper.getExammode() == 3){
+            pbsate = 2;//线上考试，设置完题块，科目题块状态变为已完成；线下考试需要为题块框选
+        }
         //更改科目题块框选状态
-        msSubjectMapper.updatePbstateByMpid(mpid,1);//题块状态变成设置中
+        msSubjectMapper.updatePbstateByMpid(mpid,pbsate);//题块状态变成设置中
+        //修改试卷中合并后试题数量
+        msPaperMapper.updaePaperMeregpnumByMpid(mpid,papernum);
+        msPaperStudentMapper.updatePaperMergepnumByMpid(mpid, papernum);
         //保存完题块后，需要清除之前已经生产的学生答案、批阅信息之类的数据，
+        msPaperStudentBlockMapper.updateStudentBlockQuestionByMpid(mpid);
         //知识点，难易度关联需要重新处理；新的题块试题需要绑定知识点，难度度如何处理？
 
         return mpid;

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

@@ -21,5 +21,6 @@ public class PExamSubjectVo {
     private Integer exammode;
     //考试状态0未开始1已开始2已结束3已生成报告
     private Integer examstate;
+    private Integer mpid;//试卷ID
 
 }

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

@@ -80,6 +80,10 @@
     <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}
+    </select>
     <!--根据考试id和科目id获取试卷信息-->
     <select id="getPaperByExamIdAndSubjectId" resultType="com.xhkjedu.smarking.model.paper.MsPaper">
         select mpid, examid, msid, subjectid, ptype, pnum, pscore, answered, hasfile, hearnum, hearfile
@@ -94,4 +98,10 @@
     <select id="getMpIdByMsId" resultType="java.lang.Integer">
         select mpid from ms_paper where msid=#{msid}
     </select>
+
+    <!--修改题块设置后试卷中试题数量-->
+    <update id="updaePaperMeregpnumByMpid">
+        update ms_paper set mergepnum=#{mergepnum} where mpid=#{mpid}
+    </update>
+
 </mapper>

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

@@ -71,4 +71,13 @@
     <update id="updateComplexityByMpid">
         update ms_paper_qtype_question set complexity=null where mpid=#{mpid}
     </update>
+
+    <!--获取试卷中所有客观题-->
+    <select id="listObjectiveQuestionByMpid" resultType="com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion">
+        select * from ms_paper_qtype_question where mpid=#{mpid} and ctype in
+        <foreach collection="list" item="c" open="(" close=")" separator="," >
+            #{c}
+        </foreach>
+        order by qorder
+    </select>
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentBlockMapper.xml

@@ -13,6 +13,17 @@
         q.hasbad=0,q.hasproblem=0,q.problemtype=0,q.problemcomm=null
         where b.mpsid = #{mpsid}
     </update>
+    <!--清空试卷下所有学生作答及批阅信息-->
+    <update id="updateStudentBlockQuestionByMpid">
+        update ms_paper_student_block b join ms_paper_student_question_merge q
+        on b.mpsid=q.mpsid and b.mpsbid=q.mpsbid
+            set b.stuanswer=null,b.hasproblem=0,b.problemtype=0,b.problemcomm=null,b.hasgood=0,
+                b.hasbad=0,b.hasfinal=0,b.finalreason=0,
+                q.answered=0,q.answertype=0,q.stuanswer=null,q.converted=0,q.answertime=0,q.stuscore=0,
+                q.checked=0,q.firstcid=null,q.firstcime=null,q.firstccore=0,q.secondcid=null,q.secondctime=null,q.secondcscore=0,q.arbitrateid=null,q.arbitratetime=null,q.arbitratescore=0,q.hasgood=0,
+                q.hasbad=0,q.hasproblem=0,q.problemtype=0,q.problemcomm=null
+        where b.mpid = #{mpid}
+    </update>
 
     <!--获取学生题块试题-->
     <resultMap id="stuBlockQuestions" type="com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock">

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -207,6 +207,11 @@
         where mpsid=#{ps.mpsid}
     </update>
 
+    <!--修改学生试卷设置题块收试题数量-->
+    <update id="updatePaperMergepnumByMpid">
+        update ms_paper_student set mergepnum=#{mergepnum} where mpid=#{mpid}
+    </update>
+