试卷模板、进度总览完善 学科试题报告

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

@@ -123,5 +123,19 @@ public class MsTemplateController {
         return new ResultVo(0, "查询成功",rtnObjs);
     }
 
+    /*
+     * @Description 主观题框选-题块模板
+     * @Date 2024/12/27 16:54:30
+     * @Author WN
+     * @Param [msTemplate]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/block_temp")
+    public ResultVo listBlockTemplates(@RequestBody MsTemplate msTemplate) {
+        N_Utils.validation(new Object[]{msTemplate.getMpid(),"试卷id",1,msTemplate.getMtid(),"模板id",1});
+        List<Map<String,Object>> rtnObjs = msTemplateService.listBlockTemplates(msTemplate.getMpid(),msTemplate.getMtid());
+        return new ResultVo(0, "查询成功",rtnObjs);
+    }
+
 
 }

smarking/src/main/java/com/xhkjedu/smarking/controller/report/XkReportController.java

@@ -1,8 +1,16 @@
 package com.xhkjedu.smarking.controller.report;
 
+import com.xhkjedu.smarking.service.report.report.MsrClassQuestionService;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * @Description：学科报告
  * @Author: WN
@@ -11,4 +19,19 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/rxk")
 public class XkReportController {
+    @Resource
+    private MsrClassQuestionService msrClassQuestionService;
+
+    /*
+     * @Description 各班学科试题分析-得分率
+     * @Date 2024/12/27 15:42:52
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/xkst_dfl")
+    public ResultVo listQuestionForXhXhstDfl(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2,params.getClassids(),"班级id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForXhXhstDfl(params));
+    }
 }

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

@@ -22,4 +22,7 @@ public interface MsTemplateBlockMapper extends TkMapper<MsTemplateBlock> {
 
     //获取模版主观题题块信息
     List<Map<String,Object>> listSubjectiveBlockQuestions(@Param("mtid")Integer mtid);
+
+    //主观题框选题块获取
+    List<Map<String,Object>> listBlockTemplates(@Param("mpid")Integer mpid,@Param("mtid")Integer mtid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportother/MsrReportparamMapper.java

@@ -17,6 +17,8 @@ public interface MsrReportparamMapper extends TkMapper<MsrReportparam> {
     List<MsrReportparam> listReportparamByRpbelong(@Param("examid") Integer examid, @Param("rpbelong") String rpbelong, @Param("reportcode") String reportcode);
     //获取指定科目参数
     MsrReportparam getReportparamByRpbelongSubject(@Param("examid") Integer examid, @Param("rpbelong") String rpbelong, @Param("reportcode") String reportcode, @Param("subjectid") String subjectid);
+    //获取含有类型的对应类型参数
+    MsrReportparam getReportparamByRpbelongSubjectType(@Param("examid") Integer examid, @Param("rpbelong") String rpbelong, @Param("reportcode") String reportcode, @Param("subjectid") String subjectid, @Param("rptype") Integer rptype);
 
     //批量删除
     int deleteBatchReportparam(@Param("list") List<Integer> list);

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

@@ -1,6 +1,7 @@
 package com.xhkjedu.smarking.service.paper;
 
 import com.xhkjedu.exception.MissingParametersException;
+import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.paper.*;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
@@ -120,17 +121,24 @@ public class MsTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public MsTemplate updateTemplate(MsTemplate msTemplate){
 
+        //根据模板ID获取模板信息
+        MsTemplate oldTemplate = msTemplateMapper.selectByPrimaryKey(msTemplate.getMtid());
+        if(!msTemplate.getCurrstep().equals(oldTemplate.getCurrstep())) throw new ServiceException("请按顺序操作");
+
         //定位区选择
         if(msTemplate.getCurrstep() == 3){
-
             SchoolCloudVo school = schoolMapper.getSchoolCloudcode(msTemplate.getMpid());
             String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/marking/paper/";
-            //定位区正面图片
-            String dwtfront = MarkingUtil.uploadBase64Img(msTemplate.getDwtfront(),1, savefloder);
-            msTemplate.setDwtfront(dwtfront);
-            //定位区反面图片
-            String dwtback = MarkingUtil.uploadBase64Img(msTemplate.getDwtback(),1, savefloder);
-            msTemplate.setDwtback(dwtback);
+            if(N_Utils.isNotEmpty(msTemplate.getDwtfront())){
+                //定位区正面图片
+                String dwtfront = MarkingUtil.uploadBase64Img(msTemplate.getDwtfront(),1, savefloder);
+                msTemplate.setDwtfront(dwtfront);
+            }
+            if(N_Utils.isNotEmpty(msTemplate.getDwtback())){
+                //定位区反面图片
+                String dwtback = MarkingUtil.uploadBase64Img(msTemplate.getDwtback(),1, savefloder);
+                msTemplate.setDwtback(dwtback);
+            }
         }
 
         //其中currstep保存时会加1，代表保存后的步骤
@@ -163,23 +171,32 @@ public class MsTemplateService {
         //保存之前先清除已保存的信息试卷客观题题块、模板题块
         msTemplateBlockMapper.deleteByMtidAndMtype(msTemplate.getMtid(),1);
         msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,1);
+        //获取试卷中所有试题信息
+        List<MsPaperQtypeQuestion> questions = msPaperQtypeQuestionMapper.listQuestionsByMpid(mpid);
+        List<MsPaperQtypeQuestion> objQuestions = questions.stream().filter(q -> q.getQtype() == 1).collect(Collectors.toList());//客观题试题信息
+        if(objQuestions.isEmpty()){
+            return;
+        }
+
+        if(tblocks.isEmpty()){
+            throw new ServiceException("未设置客观题");
+        }
 
         //客观题题块试题信息
         List<MsPaperBlockQuestion> savePbquestions = new ArrayList<>();
         //客观题模块试题信息
         List<MsTemplateBlockQuestion> saveTbquestions = new ArrayList<>();
-        //获取试卷中所有试题信息
-        List<MsPaperQtypeQuestion> questions = msPaperQtypeQuestionMapper.listQuestionsByMpid(mpid);
+
         int i = 1;
         for(MsTemplateBlock tblock : tblocks){
             //获取客观题单题
             List<MsTemplateBlockQuestion> tbquestions = tblock.getTbquestions();
             //获取客观题题号
             List<String> tbqns = tbquestions.stream().map(MsTemplateBlockQuestion::getQn).collect(Collectors.toList());
-            //包含的试题信息
-            List<MsPaperQtypeQuestion> selQuestions = questions.stream().filter(q -> tbqns.contains(q.getQn())).collect(Collectors.toList());
-            if(selQuestions.isEmpty() || selQuestions.size() != tbquestions.size()){
-                throw new MissingParametersException("试题信息和试卷不匹配");
+            //包含的客观题试题信息
+            List<MsPaperQtypeQuestion> selQuestions = objQuestions.stream().filter(q -> tbqns.contains(q.getQn())).collect(Collectors.toList());
+            if(selQuestions.isEmpty()){
+                throw new ServiceException("试题信息和试卷不匹配");
             }
 
             Double tbqScores = selQuestions.stream().mapToDouble(MsPaperQtypeQuestion::getQscore).sum();//题块下试题总分值
@@ -210,7 +227,7 @@ public class MsTemplateService {
             for(MsTemplateBlockQuestion tbquestion : tbquestions) {
                 MsPaperQtypeQuestion q = selQuestions.stream().filter(q1 -> q1.getQn().equals(tbquestion.getQn())).findFirst().orElse(null);
 
-                if(q == null) throw new MissingParametersException("试题信息和试卷不匹配");
+                if(q == null) throw new ServiceException("试题信息和试卷不匹配");
 
                 tbquestion.setMtbid(mtbid);
                 tbquestion.setMptqid(q.getMptqid());
@@ -230,6 +247,9 @@ public class MsTemplateService {
             }
         }
 
+        if(saveTbquestions.isEmpty()) throw new ServiceException("未设置客观题");
+        if(objQuestions.size() != saveTbquestions.size()) throw new ServiceException("试题信息和试卷不匹配");
+
         msPaperBlockQuestionMapper.insertList(savePbquestions);
         msTemplateBlockQuestionMapper.insertList(saveTbquestions);
     }
@@ -423,4 +443,15 @@ public class MsTemplateService {
     public List<Map<String,Object>> listTemplateBlocksByMtidAndType(Integer mtid){
         return msTemplateBlockMapper.listSubjectiveBlockQuestions(mtid);
     }
+
+    /*
+     * @Description 主观题框选题块获取
+     * @Date 2024/12/27 16:51:38
+     * @Author WN
+     * @Param [mpid, mtid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listBlockTemplates(Integer mpid, Integer mtid){
+        return msTemplateBlockMapper.listBlockTemplates(mpid, mtid);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/report/MsrClassQuestionService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.smarking.service.report.report;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.exam.MsClassMapper;
 import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQuestionMapper;
 import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectGradeMapper;
@@ -10,13 +11,12 @@ import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -112,29 +112,135 @@ public class MsrClassQuestionService {
     }
 
     //学科报告-各班学科试题分析-得分率
-    public void listQuestionForXhScoreRate(ExamReportParams params){
+    public Map<String,Object> listQuestionForXhXhstDfl(ExamReportParams params){
         params.setSelclass(3);
         params.setClassids("0," + params.getClassids());//拼上全体
         //获取选定班级的试题分析
         List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+        //获取全体试题情况
+        List<MsrClassQuestion> schoolQuestions = questions.stream().filter(m -> m.getClassid() == 0).collect(Collectors.toList());
+        List<MsrClassQuestion> classQuestions = questions.stream().filter(m -> m.getClassid() != 0).collect(Collectors.toList());
         //获取所有题号
-        List<String> qns = questions.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+        List<String> qns = new ArrayList<>();
+        //获取全体得分率数据
+        List<Map<String,Object>> schoolScoreRate = new ArrayList<>();
+        Map<Integer,Object> mptqidScore = new LinkedHashMap<>();//全体各题得分率
+        for(MsrClassQuestion q : schoolQuestions){
+            Map<String,Object> qMap = new HashMap<>();
+            qMap.put("qn",q.getQn());
+            qMap.put("mptqid",q.getMptqid());
+            qMap.put("qorder",q.getQorder());
+            qMap.put("scorerate",q.getScorerate());
+            schoolScoreRate.add(qMap);
+            mptqidScore.put(q.getMptqid(),q.getScorerate());
+            qns.add(q.getQn());
+        }
+
         //把试题按班级分组
-        Map<Integer,List<MsrClassQuestion>> classMap = questions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getClassid));
-        List<Map<String,Object>> classList = new ArrayList<>();//班级试题
+        Map<Integer,List<MsrClassQuestion>> classMap = classQuestions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getClassid));
+        List<Map<String,Object>> classList = new ArrayList<>();//班级试题得分率差
         for(Map.Entry<Integer,List<MsrClassQuestion>> entry : classMap.entrySet()){
+            List<MsrClassQuestion> classQueList = entry.getValue();
+            List<Map<String,Object>> queList = new ArrayList<>();
+            for(MsrClassQuestion q : classQueList) {
+                Map<String, Object> qMap = new HashMap<>();
+                qMap.put("qn", q.getQn());
+                qMap.put("mptqid", q.getMptqid());
+                qMap.put("qorder", q.getQorder());
+                qMap.put("scorerate", q.getScorerate());
+                qMap.put("scoreratec", q.getScoreratec());
+                qMap.put("schoolscorerate", mptqidScore.get(q.getMptqid()));
+                queList.add(qMap);
+            }
+
             Map<String,Object> clMap = new HashMap<>();
             clMap.put("classid",entry.getKey());
-            clMap.put("classname",entry.getValue().get(0).getClassname());
-            clMap.put("questions",entry.getValue());
+            clMap.put("classname",classQueList.get(0).getClassname());
+            clMap.put("questions",queList.stream().sorted(Comparator.comparing(m -> (Integer) m.get("qorder"))).collect(Collectors.toList()));
             classList.add(clMap);
         }
+
+        //分析诊断-得分率高于全体得分率的班级和试题
+        List<MsrClassQuestion> highQuestions = new ArrayList<>();//高于全体得分率的试题情况
+        for(MsrClassQuestion q : schoolQuestions){
+            List<MsrClassQuestion> hightClass = questions.stream().filter(m -> m.getMptqid().equals(q.getMptqid()) && m.getClassid() != 0 && m.getScorerate() > q.getScorerate()).collect(Collectors.toList());
+            if(!hightClass.isEmpty()){
+                highQuestions.addAll(hightClass);
+            }
+        }
+        //高分按班级分组，哪个班级试题数量多，则属于高班和试题(统计高于年级平均值的试题数量，看哪个班级最多)
+        Map<Integer,List<MsrClassQuestion>> highClassMap = highQuestions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getClassid));
+        int maxNum = 0;
+        List<MsrClassQuestion> maxClassQuestions = new ArrayList<>();
+        for(Map.Entry<Integer,List<MsrClassQuestion>> entry : highClassMap.entrySet()){
+            if(entry.getValue().size() > maxNum){
+                maxNum = entry.getValue().size();
+                maxClassQuestions.addAll(entry.getValue());
+            }
+        }
+        Map<String,Object> highMap = new HashMap<>();//高得分率分析
+        if(!maxClassQuestions.isEmpty()){
+            highMap.put("classname",maxClassQuestions.get(0).getClassname());
+            highMap.put("qnstr",maxClassQuestions.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.joining(",")));
+        }
+        //列出各个难度的试题中，得分率低于60%的试题,用全体试题的得分率进行难度分组
+        Map<String,List<MsrClassQuestion>> ndMap = schoolQuestions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getNdms));
+        //获取所有试题难度分组参数
+        MsrReportparam ndParam = msrReportparamMapper.getReportparamByRpbelongSubjectType(params.getExamid(),"quesummary","all",params.getSubjectid(),1);
+        List<SzJsonVo> jsonList = JSON.parseArray(ndParam.getSzjson(), SzJsonVo.class);
+        List<Map<String,Object>> ndList = new ArrayList<>();
+        for(SzJsonVo szvo : jsonList){
+            Map<String,Object> zsndMap = new HashMap<>();
+            zsndMap.put("djkey",szvo.getDjkey());
+            String qnStr = "";
+            if(ndMap.containsKey(szvo.getDjkey())){
+                List<MsrClassQuestion> ndQues = ndMap.get(szvo.getDjkey());
+                //获取得分率低于60%的试题
+                List<MsrClassQuestion> lowQuestions = ndQues.stream().filter(m -> m.getScorerate() < 0.6).collect(Collectors.toList());
+                if(!lowQuestions.isEmpty()){
+                    qnStr = lowQuestions.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.joining(","));
+                }
+            }
+            if(N_Utils.isEmpty(qnStr)){
+                qnStr = "无";
+            }
+            zsndMap.put("qnstr",qnStr);
+
+            ndList.add(zsndMap);
+        }
+        //计算各个难度的试题得分率
+        for(Map<String,Object> nd : ndList) {
+            List<MsrClassQuestion> ndQuestions = schoolQuestions.stream().filter(m -> m.getNdms().equals(nd.get("ndms"))).collect(Collectors.toList());
+        }
+
+        Map<String,Object> rtnMap = new LinkedHashMap<>();
+        rtnMap.put("qns",qns);
+        rtnMap.put("schoolQues",schoolScoreRate);
+        rtnMap.put("classQues",classList);
+        rtnMap.put("highMap",highMap);
+        rtnMap.put("ndList",ndList);
+        return rtnMap;
     }
     //学科报告-各班学科试题分析-试题难度和区分度
-    public void listQuestionForXhNdAndQfd(ExamReportParams params){
+    public void listQuestionForXhXhstNdAndQfd(ExamReportParams params){
         params.setSelclass(4);
         //获取选定班级的试题分析
         List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+        //表现较好的题目和表现不足的题目，根据得分率差进行排序
+        List<MsrClassQuestion> goodAndBadQues = questions.stream().sorted(Comparator.comparing(MsrClassQuestion::getScoreratec).reversed()).collect(Collectors.toList());
+        List<MsrClassQuestion> firstN;
+        List<MsrClassQuestion> lastN;
+        int n = 5;
+        if(goodAndBadQues.size() < n){
+            n = goodAndBadQues.size()/2;
+        }
+        // 获取前N个元素
+        firstN = goodAndBadQues.stream().limit(n).collect(Collectors.toList());
+        // 获取后N个元素
+        lastN = goodAndBadQues.stream().skip(goodAndBadQues.size() - n).collect(Collectors.toList());
+
+        
+
         //获取所有题号
         List<String> qns = questions.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
         //把试题按班级分组

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -134,7 +134,7 @@
     <!--单科设置信息-->
     <select id="getSet" resultType="java.util.Map">
         <if test="exammode!=3">
-            select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,s.pbstate,s.checkset,s.checkstate,s.invigilatestate,3 as correcttype
+            select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.mpid,3 as correcttype
             ,count(distinct ps.mpsid) as stunum
             ,count(distinct if(ps.batchid is not null,ps.mpsid,null)) as scannum
             ,count(distinct pb.mblockid) as blocknum
@@ -144,6 +144,7 @@
             ,count(distinct if(psb.arbitratestate in(1,2),psb.mpsbid,null)) as arbitratenum
             ,count(distinct if(psb.hasproblem in(1,2),psb.mpsbid,null)) as problemnum
             from ms_subject s left join ms_paper_student ps on s.msid = ps.msid
+            left join ms_paper p on p.msid = s.msid
             left join ms_paper_block pb on pb.mpid = ps.mpid
             left join ms_template t on t.mpid=ps.mpid
             left join ms_template_block tb on tb.mtid=t.mtid
@@ -152,7 +153,7 @@
             where s.examid=#{examid} and s.subjectid=#{subjectid}
         </if>
         <if test="exammode==3">
-            select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.correcttype
+            select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.mpid,p.correcttype
             ,count(distinct if(pc.dispenseway!=0,pc.mblockid,null)) as ysznum
             ,if(p.correcttype=1,(select count(*) from ms_class c where c.examid=s.examid and c.subjectid=s.subjectid)
             ,count(distinct if(pb.qtype=2,pb.mptqid,null)))-count(distinct if(pc.dispenseway!=0,pc.mblockid,null)) as wsznum

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

@@ -124,7 +124,7 @@
     </select>
     <!--根据试卷ID获取科目名称和考试名称-->
     <select id="getSubjectAndExamByMpid" resultType="java.util.Map">
-        select distinct s.msid,s.subjectname,e.examid,e.examname
+        select distinct s.msid,s.subjectname,e.examid,e.examname,e.exammode
         from ms_subject s left join ms_exam e on s.examid=e.examid
         left join ms_paper p on s.msid=p.msid
         where p.mpid=#{mpid}

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

@@ -46,4 +46,28 @@
         select b.mtbid,b.mblockid,b.blockname,b.mttype,b.direct,b.localcoor,b.pagenum,b.extendcoor,b.scorecoor,
         b.mtborder from ms_template_block b where b.mtid=#{mtid} and b.mttype=2 order by b.mtborder
     </select>
+
+    <resultMap id="blockTemplate" type="java.util.Map">
+        <result column="mblockid" property="mblockid" />
+        <result column="blockname" property="blockname" />
+        <result column="blockorder" property="blockorder" />
+        <result column="bqnum" property="bqnum" />
+        <result column="bqscore" property="bqscore" />
+        <result column="localcoor" property="localcoor" />
+        <result column="pagenum" property="pagenum" />
+        <result column="extendcoor" property="extendcoor" />
+        <result column="scorecoor" property="scorecoor" />
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.ArrayList">
+            <result column="mbqid" property="mbqid" />
+            <result column="bqn" property="bqn" />
+        </collection>
+    </resultMap>
+    <!--主观题框选题块获取-->
+    <select id="listBlockTemplates" resultMap="blockTemplate">
+        select DISTINCT b.mblockid,b.blockname,b.blockorder,b.bqnum,b.bqscore,
+                        tb.localcoor,tb.pagenum,tb.extendcoor,tb.scorecoor,bq.mbqid,bq.bqn
+        from ms_paper_block b inner join ms_template_block tb on b.mblockid=tb.mblockid
+        left join ms_paper_block_question bq on b.mblockid=bq.mblockid
+        where b.mpid=#{mpid} and tb.mtid=#{mtid} and b.blocktype=2 order by b.blockorder,bq.bqorder
+    </select>
 </mapper>

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

@@ -11,24 +11,27 @@
 
     <!--设置试卷模板信息-->
     <update id="updateTemplateForCurrstep">
-        update ms_template set currstep=(#{t.currstep} + 1)
-        <if test="t.currstep == 1">
-            ,blankindex=#{t.blankindex}
-        </if>
-        <if test="t.currstep == 2">
-            ,anglefront=#{t.anglefront},angleback=#{t.angleback}
-        </if>
-        <if test="t.currstep == 3">
-            ,coorfront=#{t.coorfront},coorback=#{t.coorback},dwtfront=#{t.dwtfront},dwtback=#{t.dwtback}
-        </if>
-        <if test="t.currstep == 4">
-            ,examnocoor=#{t.examnocoor},cardcoor=#{t.cardcoor}
-        </if>
-        <if test="t.currstep == 6">
-            ,misscoor=#{t.misscoor}
+        update ms_template
+        <if test="t.currstep &lt; 7">
+            set currstep=(#{t.currstep} + 1)
+            <if test="t.currstep == 1">
+                ,blankindex=#{t.blankindex}
+            </if>
+            <if test="t.currstep == 2">
+                ,anglefront=#{t.anglefront},angleback=#{t.angleback}
+            </if>
+            <if test="t.currstep == 3">
+                ,coorfront=#{t.coorfront},coorback=#{t.coorback},dwtfront=#{t.dwtfront},dwtback=#{t.dwtback}
+            </if>
+            <if test="t.currstep == 4">
+                ,examnocoor=#{t.examnocoor},cardcoor=#{t.cardcoor}
+            </if>
+            <if test="t.currstep == 6">
+                ,misscoor=#{t.misscoor}
+            </if>
         </if>
         <if test="t.currstep == 7">
-            ,violatecoor=#{t.violatecoor},tstate=1
+            set violatecoor=#{t.violatecoor},tstate=1
         </if>
         where mtid=#{t.mtid}
     </update>

smarking/src/main/resources/mapper/report/reportother/MsrReportparamMapper.xml

@@ -19,6 +19,11 @@
         select * from msr_reportparam where examid=#{examid} and rpbelong = #{rpbelong} and
                                             reportcode = #{reportcode} and subjectid = #{subjectid} limit 1
     </select>
+    <!--获取含有类型的对应类型参数-->
+    <select id="getReportparamByRpbelongSubjectType" resultType="com.xhkjedu.smarking.model.report.reportother.MsrReportparam">
+        select * from msr_reportparam where examid=#{examid} and rpbelong = #{rpbelong} and
+            reportcode = #{reportcode} and subjectid = #{subjectid} and rptype = #{rptype} limit 1
+    </select>
 
     <!--删除-->
     <delete id="deleteBatchReportparam">