线下试题题型排序相关

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

@@ -6,6 +6,7 @@ import com.xhkjedu.smarking.model.paper.MsPaperFile;
 import com.xhkjedu.smarking.model.paper.MsPaperQtype;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.service.paper.MsPaperQtypeService;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -175,6 +176,108 @@ public class MsPaperQtypeController {
         return new ResultVo(0,"获取成功" ,map);
     }
 
+    /*
+     * @Description 线下试卷-保存题型及试题
+     * @Date 2024/12/4 10:40:53
+     * @Author WN
+     * @Param [qtype]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/qtype_save")
+    public ResultVo saveOfflineQtype(@RequestBody MsPaperQtype qtype) {
+        N_Utils.validation(new Object[]{qtype.getMpid(),"试卷id",1});
+        List<MsPaperQtypeQuestion> questions = qtype.getQuestions();
+        if(questions == null || questions.isEmpty()){
+            return new ResultVo(1,"未设置试题");
+        }
+        return msPaperQtypeService.saveQtypeQuestionOffline(qtype);
+    }
+
+    /*
+     * @Description 线下试卷-修改题型及试题
+     * @Date 2024/12/4 10:42:29
+     * @Author WN
+     * @Param [qtype]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/qtype_update")
+    public ResultVo updateOfflineQtype(@RequestBody MsPaperQtype qtype) {
+        N_Utils.validation(new Object[]{qtype.getMpid(),"试卷id",1,qtype.getMptid(),"题型id",1});
+        List<MsPaperQtypeQuestion> questions = qtype.getQuestions();
+        if(questions == null || questions.isEmpty()){
+            return new ResultVo(1,"未设置试题");
+        }
+        return msPaperQtypeService.updateQtypeQuestionOffline(qtype);
+    }
+
+    /*
+     * @Description 线下试卷-删除题型
+     * @Date 2024/12/4 10:45:45
+     * @Author WN
+     * @Param [qtype]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/qtype_del")
+    public ResultVo deleteOfflineQtype(@RequestBody MsPaperQtype qtype) {
+        N_Utils.validation(new Object[]{qtype.getMpid(),"试卷id",1,qtype.getMptid(),"题型id",1});
+        return msPaperQtypeService.deleteQtypeOffline(qtype);
+    }
+
+    /*
+     * @Description 线下试卷-移动题型
+     * @Date 2024/12/4 10:54:08
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/qtype_move")
+    public ResultVo moveOfflineQtype(@RequestBody MsPaperParams params) {
+        N_Utils.validation(new Object[]{params.getMpid(),"试卷id",1,params.getMptid(),"题型id",1,params.getMovetype(),"移动类型",1});
+        msPaperQtypeService.updateQtypeOrderOffline(params);
+        return new ResultVo(0,"保存成功");
+    }
+
+    /*
+     * @Description 线下试卷-修改试题
+     * @Date 2024/12/4 10:55:44
+     * @Author WN
+     * @Param [question]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/que_update")
+    public ResultVo updateOfflineQuestion(@RequestBody MsPaperQtypeQuestion question) {
+        N_Utils.validation(new Object[]{question.getMpid(),"试卷id",1,question.getMptid(),"题型id",1,question.getMptqid(),"试题id",1});
+        msPaperQtypeService.updateQuestionOffline(question);
+        return new ResultVo(0,"保存成功");
+    }
+
+    /*
+     * @Description 线下试卷-删除试题
+     * @Date 2024/12/4 10:56:59
+     * @Author WN
+     * @Param [question]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/que_del")
+    public ResultVo deleteOfflineQuestion(@RequestBody MsPaperQtypeQuestion question) {
+        N_Utils.validation(new Object[]{question.getMpid(),"试卷id",1,question.getMptid(),"题型id",1,question.getMptqid(),"试题id",1});
+        msPaperQtypeService.deleteQuestionOffline(question);
+        return new ResultVo(0,"保存成功");
+    }
+
+    /*
+     * @Description 线下试卷-移动试题
+     * @Date 2024/12/4 10:58:39
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/que_move")
+    public ResultVo moveOfflineQuestion(@RequestBody MsPaperParams params) {
+        N_Utils.validation(new Object[]{params.getMpid(),"试卷id",1,params.getMptqid(),"试题id",1,params.getMovetype(),"移动类型",1});
+        msPaperQtypeService.updateQuestionOrderOffline(params);
+        return new ResultVo(0,"保存成功");
+    }
 
 
 

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.paper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperQtype;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import com.xhkjedu.smarking.vo.paper.MsPaperQtypeVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,4 +39,9 @@ public interface MsPaperQtypeMapper extends TkMapper<MsPaperQtype> {
 
     //批量修改题型排序-线下
     int updateBatchQtypeOrder(@Param("list")List<MsPaperQtype> list);
+    //批量修改题型排序-移动-线下
+    int updateBatchMoveQtypeOrder(@Param("list")List<MsPaperQtype> list);
+
+    //题型移动-获取要交换位置的题型
+    MsPaperQtype getQtypeForMoverOrder(@Param("p") MsPaperParams p);
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.paper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -36,11 +37,15 @@ public interface MsPaperQtypeQuestionMapper extends TkMapper<MsPaperQtypeQuestio
 
     //批量修改试题排序-线下
     int updateBatchQuestionOrder(@Param("list") List<MsPaperQtypeQuestion> list);
+    //批量修改试题排序-移动-线下
+    int updateBatchMoveQuestionOrder(@Param("list") List<MsPaperQtypeQuestion> list);
 
     //获取试卷中所有试题排序
     List<MsPaperQtypeQuestion> listQuesOrderByMpid(@Param("mpid")Integer mpid);
 
     //获取题型下试题数量
     int getQuesnumByMptid(@Param("mptid")Integer mptid);
+    //试题移动-获取要交换位置的试题
+    MsPaperQtypeQuestion getQuestionForMoverOrder(@Param("p")MsPaperParams p);
 
 }

smarking/src/main/java/com/xhkjedu/smarking/model/exam/MsExam.java

@@ -27,7 +27,7 @@ public class MsExam extends BaseBean {
     private Integer exammode;
     //是否启用监控0未启用1启用
     private Integer monitored;
-    //考试状态0未开始1已开始2已结束3己生成报告(一键统分)4发布成绩
+    //考试状态：0未开始1已开始2已结束3一键统分4生成报告5发布成绩
     private Integer examstate;
     //年级
     private Integer gradeid;

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

@@ -45,7 +45,7 @@ public class MsPaperQtypeQuestion extends BaseBean {
     private String qanswer;
     //少选分值
     private Double loseoption;
-    //分值设置0默认1送分题 20分题
+    //分值设置0默认1送分题 2 0分题
     private Integer scoreset;
     //试题难易度
     private Integer complexity;

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

@@ -1341,14 +1341,9 @@ public class MsPaperQtypeService {
         //设置试卷题目数量和分值
         setPaperNumAndScore(paper);
         msPaperMapper.updateByPrimaryKeySelective(paper);
-        //更改顺序
-        List<MsPaperQtypeQuestion> queOrders = msPaperQtypeQuestionMapper.listQuesOrderByMpid(mptid);
-        int qorder = 1;
-        for(MsPaperQtypeQuestion que : queOrders){
-            que.setQorder(qorder);
-            qorder++;
-        }
-        msPaperQtypeQuestionMapper.updateBatchQuestionOrder(queOrders);
+
+        //试卷中小题重新排序
+        chandleQuestionOrder(paper);
 
         savePaperAnalyzeForFj(paper);
         deletePaperOtherInfo(mpid);
@@ -1364,7 +1359,14 @@ public class MsPaperQtypeService {
      * @Return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void deleteQtypeOffline(MsPaperQtype paperQtype){
+    public ResultVo deleteQtypeOffline(MsPaperQtype paperQtype){
+        //根据试卷ID获取考试信息
+        PExamSubjectVo exam = msPaperMapper.getExamSubjectForPaper(paperQtype.getMpid());
+        //线下考试，发布成绩（生成报告）之前可以修改试卷结构
+        if(exam.getExammode() < 3 && exam.getExamstate() > 2){
+            throw new MissingParametersException("考试已统分禁止操作");
+        }
+
         msPaperQtypeMapper.deleteByPrimaryKey(paperQtype.getMptid());
         MsPaper paper = new MsPaper();
         paper.setMpid(paperQtype.getMpid());
@@ -1374,6 +1376,7 @@ public class MsPaperQtypeService {
 
         //重新生成试卷分析
         savePaperAnalyzeForFj(paper);
+        return new ResultVo(0,"删除成功",paper.getMpid());
     }
 
     //处理试卷试题数量和分值，题型排序，试题排序
@@ -1408,10 +1411,70 @@ public class MsPaperQtypeService {
         msPaperMapper.updateByPrimaryKeySelective(paper);
     }
 
+    //处理试卷中小题排序
+    private void chandleQuestionOrder(MsPaper paper){
+        //小题重新排序
+        List<MsPaperQtypeQuestion> queOrders = msPaperQtypeQuestionMapper.listQuesOrderByMpid(paper.getMpid());
+        int qorder = 1;
+        int pnum = 0;
+        double pscore = 0;
+        for(MsPaperQtypeQuestion que : queOrders){
+            que.setQorder(qorder);
+            qorder++;
+            pnum++;
+            pscore = MarkingUtil.add(pscore, que.getQscore());
+        }
+        paper.setPnum(pnum);
+        paper.setPscore(pscore);
+        msPaperQtypeQuestionMapper.updateBatchQuestionOrder(queOrders);
+    }
+
 
+    /*
+     * @Description 线下试卷-题型上下移动
+     * @Date 2024/12/4 10:30:51
+     * @Author WN
+     * @Param [params]
+     * @Return void
+     **/
     @Transactional(rollbackFor = Exception.class)
-    public void updateQtypeOrderOffline(MsPaperQtype paperQtype){
+    public void updateQtypeOrderOffline(MsPaperParams params){
+
+        //根据试卷ID获取考试信息
+        PExamSubjectVo exam = msPaperMapper.getExamSubjectForPaper(params.getMpid());
+        //线下考试，发布成绩（生成报告）之前可以修改试卷结构
+        if(exam.getExammode() < 3 && exam.getExamstate() > 2){
+            throw new MissingParametersException("考试已统分禁止操作");
+        }
+
+        MsPaperQtype moveQtype = new MsPaperQtype();//要移动的题型
+        moveQtype.setMptid(params.getMptid());
 
+        int movevalue;//移动试题的order变换值
+        int bmovevalue;//被移动试题的order变换值
+        if(params.getMovetype() == 1){ //上移
+            movevalue = -1;//在原来基础上减一
+            bmovevalue = 1;
+        }else{
+            movevalue = 1;//在原来基础上加一
+            bmovevalue = -1;
+        }
+        params.setMovevalue(1);
+        moveQtype.setMptorder(movevalue);
+        //被交换位置的试题
+        MsPaperQtype qtype = msPaperQtypeMapper.getQtypeForMoverOrder(params);
+        qtype.setMptorder(bmovevalue);
+
+        List<MsPaperQtype> changeQuestions = new ArrayList<>();
+        changeQuestions.add(moveQtype);
+        changeQuestions.add(qtype);
+        msPaperQtypeMapper.updateBatchMoveQtypeOrder(changeQuestions);
+
+        MsPaper paper = new MsPaper();
+        paper.setMpid(params.getMpid());
+        chandleQuestionOrder(paper);//小题重新排序
+
+        rebuildPaperAnalyzeOffline(paper.getMpid(),paper);
     }
 
     /*
@@ -1423,6 +1486,14 @@ public class MsPaperQtypeService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void updateQuestionOffline(MsPaperQtypeQuestion question){
+
+        //根据试卷ID获取考试信息
+        PExamSubjectVo exam = msPaperMapper.getExamSubjectForPaper(question.getMpid());
+        //线下考试，发布成绩（生成报告）之前可以修改试卷结构
+        if(exam.getExammode() < 3 && exam.getExamstate() > 2){
+            throw new MissingParametersException("考试已统分禁止操作");
+        }
+
         //获取原小题信息
         MsPaperQtypeQuestion oldQuestion = msPaperQtypeQuestionMapper.selectByPrimaryKey(question.getMptqid());
         //修改小题信息
@@ -1430,6 +1501,9 @@ public class MsPaperQtypeService {
         if(!oldQuestion.getQscore().equals(question.getQscore())){
             //说明修改题型和试卷分值
             msPaperQtypeMapper.updateQtypeScore(question.getMptid(),question.getMpid());
+
+            //重新生成试卷分析
+            rebuildPaperAnalyzeOffline(question.getMpid(),null);
         }
     }
 
@@ -1442,6 +1516,12 @@ public class MsPaperQtypeService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void deleteQuestionOffline(MsPaperQtypeQuestion question){
+        //根据试卷ID获取考试信息
+        PExamSubjectVo exam = msPaperMapper.getExamSubjectForPaper(question.getMpid());
+        //线下考试，发布成绩（生成报告）之前可以修改试卷结构
+        if(exam.getExammode() < 3 && exam.getExamstate() > 2){
+            throw new MissingParametersException("考试已统分禁止操作");
+        }
         Integer mptid = question.getMptid();
         msPaperQtypeQuestionMapper.deleteByPrimaryKey(question.getMptqid());
         //获取题型下试题数量
@@ -1454,33 +1534,66 @@ public class MsPaperQtypeService {
             msPaperQtypeMapper.deleteByPrimaryKey(mptid);
             //处理试卷试题数量和分值，题型排序，试题排序
             chandlePaperNumQtypeOrder(paper);
-
         }else{
             //修改题型和试卷分值
-            msPaperQtypeMapper.updateQtypeScore(mptid,question.getMpid());
+            msPaperQtypeMapper.updateQtypeScoreAndNum(mptid,question.getMpid());
             //小题重新排序
-            List<MsPaperQtypeQuestion> queOrders = msPaperQtypeQuestionMapper.listQuesOrderByMpid(mptid);
-            int qorder = 1;
-            int pnum = 0;
-            double pscore = 0;
-            for(MsPaperQtypeQuestion que : queOrders){
-                que.setQorder(qorder);
-                qorder++;
-                pnum++;
-                pscore = MarkingUtil.add(pscore, que.getQscore());
-            }
-            paper.setPnum(pnum);
-            paper.setPscore(pscore);
-            msPaperQtypeQuestionMapper.updateBatchQuestionOrder(queOrders);
+            chandleQuestionOrder(paper);
         }
 
         //重新生成试卷分析
-        savePaperAnalyzeForFj(paper);
+        rebuildPaperAnalyzeOffline(question.getMpid(), paper);
+        deletePaperOtherInfo(question.getMpid());
     }
 
+    /*
+     * @Description 线下试卷-试题上下移动
+     * @Date 2024/12/4 10:13:29
+     * @Author WN
+     * @Param [params]
+     * @Return void
+     **/
     @Transactional(rollbackFor = Exception.class)
-    public void updateQuestionOrderOffline(MsPaperQtypeQuestion question){
+    public void updateQuestionOrderOffline(MsPaperParams params){
+        //根据试卷ID获取考试信息
+        PExamSubjectVo exam = msPaperMapper.getExamSubjectForPaper(params.getMpid());
+        //线下考试，发布成绩（生成报告）之前可以修改试卷结构
+        if(exam.getExammode() < 3 && exam.getExamstate() > 2){
+            throw new MissingParametersException("考试已统分禁止操作");
+        }
+        MsPaperQtypeQuestion moveQuestion = new MsPaperQtypeQuestion();//要移动的试题
+        moveQuestion.setMptqid(params.getMptqid());
+
+        int movevalue;//移动试题的order变换值
+        int bmovevalue;//被移动试题的order变换值
+        if(params.getMovetype() == 1){ //上移
+            movevalue = -1;//在原来基础上减一
+            bmovevalue = 1;
+        }else{
+            movevalue = 1;//在原来基础上加一
+            bmovevalue = -1;
+        }
+        params.setMovevalue(1);
+        moveQuestion.setQorder(movevalue);
+        //被交换位置的试题
+        MsPaperQtypeQuestion question = msPaperQtypeQuestionMapper.getQuestionForMoverOrder(params);
+        question.setQorder(bmovevalue);
+
+        List<MsPaperQtypeQuestion> changeQuestions = new ArrayList<>();
+        changeQuestions.add(moveQuestion);
+        changeQuestions.add(question);
+        msPaperQtypeQuestionMapper.updateBatchMoveQuestionOrder(changeQuestions);
+
+        //重新生成报告
+        rebuildPaperAnalyzeOffline(params.getMpid(),null);
+    }
 
+    //重新生产线下试卷分析
+    private void rebuildPaperAnalyzeOffline(Integer mpid,MsPaper paper){
+        if(paper == null || !N_Utils.isTrueInteger(paper.getPnum())){
+            paper = msPaperMapper.selectByPrimaryKey(mpid);
+        }
+        savePaperAnalyzeForFj(paper);
     }
 
 

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

@@ -21,4 +21,11 @@ public class MsPaperParams {
 
     private Integer mtid;//模板ID
     private List<MsTemplateBlock> tblocks; //模板题块列
+
+    private Integer mptid;//试题题型ID
+
+    private Integer mptqid;//试题ID
+
+    private Integer movetype;//移动类型1上移2下移
+    private Integer movevalue;//移动值
 }

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

@@ -17,7 +17,7 @@
     <!--获取试卷详细信息-->
     <select id="getPaperInfoByMsid" resultType="java.util.Map">
         select s.examid,s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,
-        e.gradeid,e.examtype,e.examname,e.exammode,
+        e.gradeid,e.examtype,e.examname,e.exammode,e.examstate,
         p.mpid,p.ptype,p.pnum,p.pscore,u.username as teachername,u.username as handlename
         from ms_subject s left join ms_paper p on s.msid=p.msid
         left join ms_exam e on s.examid=e.examid

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

@@ -214,6 +214,18 @@
             update ms_paper_qtype set mptorder=#{t.mptorder} where mptid=#{t.mptid}
         </foreach>
     </update>
+    <!--批量修改题型排序-移动-线下-->
+    <update id="updateBatchMoveQtypeOrder">
+        <foreach collection="list" item="q" separator=",">
+            update ms_paper_qtype set mptorder=mptorder + (#{t.mptorder}) where mptid=#{t.mptid}
+        </foreach>
+    </update>
+
+    <!--题型移动-获取要交换位置的题型-->
+    <select id="getQtypeForMoverOrder" resultType="com.xhkjedu.smarking.model.paper.MsPaperQtype">
+        select mptid,mptorder from ms_paper_qtype where mpid=#{p.mpid} and mptorder=(
+                (select mptorder from ms_paper_qtype where mptid=#{p.mptid})+(#{p.movevalue})) limit 1
+    </select>
 
 
 </mapper>

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

@@ -90,6 +90,12 @@
             update ms_paper_qtype_question set qorder=#{q.qorder} where mptqid=#{q.mptqid}
         </foreach>
     </update>
+    <!--批量修改试题排序-移动-线下-->
+    <update id="updateBatchMoveQuestionOrder">
+        <foreach collection="list" item="q" separator=",">
+            update ms_paper_qtype_question set qorder=qorder + (#{q.qorder}) where mptqid=#{q.mptqid}
+        </foreach>
+    </update>
 
     <!--获取试卷中所有试题排序-->
     <select id="listQuesOrderByMpid" resultType="com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion">
@@ -102,4 +108,10 @@
     <select id="getQuesnumByMptid" resultType="java.lang.Integer">
         select count(*) from ms_paper_qtype_question where mptid = #{mptid}
     </select>
+
+    <!--试题移动-获取要交换位置的试题-->
+    <select id="getQuestionForMoverOrder" resultType="com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion">
+        select mptqid,qorder from ms_paper_qtype_question where mpid=#{p.mpid} and qorder=(
+                (select qorder from ms_paper_qtype_question where mptqid=#{p.mptqid})+(#{p.movevalue}))
+    </select>
 </mapper>