模板题块

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

@@ -41,7 +41,7 @@ public class MsTemplateController {
     }
 
     /**
-     * @Description 模版-新增
+     * @Description 模板-新增
      * @Param [msTemplate]
      * @Author auto
      * @Date 2024-10-15
@@ -55,7 +55,7 @@ public class MsTemplateController {
     }
 
     /*
-     * @Description 模版-设置
+     * @Description 模板-设置
      * @Date 2024/10/21 10:55:50
      * @Author WN
      * @Param [msTemplate]
@@ -97,7 +97,7 @@ public class MsTemplateController {
     }
 
     /*
-     * @Description 模版详情
+     * @Description 模板详情
      * @Date 2024/10/23 14:06:38
      * @Author WN
      * @Param [msTemplate]
@@ -110,5 +110,19 @@ public class MsTemplateController {
         return new ResultVo(0, "查询成功",rtnObj);
     }
 
+    /*
+     * @Description 模板题块详情-主观题
+     * @Date 2024/10/24 10:25:43
+     * @Author WN
+     * @Param [msTemplate]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail_sub")
+    public ResultVo getSubjectiveBlocks(@RequestBody MsTemplate msTemplate) {
+        N_Utils.validation(new Object[]{msTemplate.getMtid(),"模板id",1});
+        List<Map<String,Object>> rtnObjs = msTemplateService.listTemplateBlocksByMtidAndType(msTemplate.getMtid());
+        return new ResultVo(0, "查询成功",rtnObjs);
+    }
+
 
 }

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

@@ -18,4 +18,7 @@ public interface MsPaperBlockMapper extends TkMapper<MsPaperBlock> {
 
     //根据试卷ID删除试卷题块
     int deleteObjByMpidAndBlocktype(@Param("mpid")Integer mpid,@Param("blocktype")Integer blocktype);
+
+    //获取试卷中所有主观题题块ID
+    List<Integer> listSubjectiveBlockidsByMpid(@Param("mpid")Integer mpid);
 }

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

@@ -5,6 +5,7 @@ import com.xhkjedu.smarking.model.paper.MsTemplateBlock;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷模块客观题定位区表 Mapper 接口
@@ -18,4 +19,7 @@ public interface MsTemplateBlockMapper extends TkMapper<MsTemplateBlock> {
 
     //版信息详情
     List<MsTemplateBlock> listTemplateBlockQuestions(@Param("mtid")Integer mtid,@Param("mttype")Integer mttype);
+
+    //获取模版主观题题块信息
+    List<Map<String,Object>> listSubjectiveBlockQuestions(@Param("mtid")Integer mtid);
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -28,6 +29,8 @@ public class MsPaperBlockService {
     private MsPaperMapper msPaperMapper;
     @Resource
     private MsPaperBlockQuestionMapper msPaperBlockQuestionMapper;
+    @Resource
+    private MsSubjectMapper msSubjectMapper;
 
     /*
      * @Description 获取试卷所有题块
@@ -80,6 +83,8 @@ public class MsPaperBlockService {
         }
 
         msPaperBlockQuestionMapper.insertList(questions);
+        //更改科目题块框选状态
+        msSubjectMapper.updatePbstateByMpid(mpid,1);//题块状态变成设置中
         //保存完题块后，需要清除之前已经生产的学生答案、批阅信息之类的数据，
         //知识点，难易度关联需要重新处理；新的题块试题需要绑定知识点，难度度如何处理？
 

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.smarking.service.paper;
 
+import com.xhkjedu.exception.MissingParametersException;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.paper.*;
 import com.xhkjedu.smarking.model.paper.*;
@@ -71,7 +72,7 @@ public class MsTemplateService {
     }
 
     /*
-     * @Description 设置模版
+     * @Description 设置模板
      * @Date 2024/10/21 10:47:00
      * @Author WN
      * @Param [msTemplate]
@@ -83,7 +84,7 @@ public class MsTemplateService {
         msTemplateMapper.updateTemplateForCurrstep(msTemplate);
         //如果当前保存为6，则需要保存客观题信息
         if(msTemplate.getCurrstep() == 5){
-            //模版题块信息
+            //模板题块信息
             List<MsTemplateBlock> tblocks = msTemplate.getTblocks();
             savePaperBlockAndTemplate(tblocks,msTemplate);
         }
@@ -99,14 +100,14 @@ public class MsTemplateService {
         return msTemplateMapper.selectByPrimaryKey(msTemplate.getMtid());
     }
 
-    //保存客观题题块和模版信息
+    //保存客观题题块和模板信息
     private void savePaperBlockAndTemplate(List<MsTemplateBlock> tblocks,MsTemplate msTemplate){
         Integer mpid = msTemplate.getMpid();
         Integer mtid = msTemplate.getMtid();
         Integer timestamp = N_Utils.getSecondTimestamp();
         Integer createid = msTemplate.getCreateid();
 
-        //保存之前先清除已保存的信息试卷客观题题块、模版题块
+        //保存之前先清除已保存的信息试卷客观题题块、模板题块
         msTemplateBlockMapper.deleteByMtidAndMtype(msTemplate.getMtid(),1);
         msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,1);
 
@@ -192,29 +193,38 @@ public class MsTemplateService {
         Integer createid = params.getCreateid();
         Integer timestamp = N_Utils.getSecondTimestamp();
         List<MsTemplateBlock> templateBlocks = params.getTblocks();
-        //删除模块中题块定位数据
-        msTemplateBlockMapper.deleteByMtidAndMtype(mtid,2);
+        //获取试卷中所有主观题id
+        List<Integer> blockids = msPaperBlockMapper.listSubjectiveBlockidsByMpid(mpid);
+        List<Integer> selids = templateBlocks.stream().map(MsTemplateBlock::getMblockid).collect(Collectors.toList());
+
+        boolean areEqual = blockids.stream().sorted().collect(Collectors.toList())
+                                .equals(selids.stream().sorted().collect(Collectors.toList()));
+        if(!areEqual){
+            throw new MissingParametersException("题块未全部框选");
+        }
 
         for (MsTemplateBlock templateBlock : templateBlocks){
             templateBlock.setMtid(mtid);
             templateBlock.setMttype(2);
             templateBlock.setCreateid(createid);
             templateBlock.setCreatetime(timestamp);
-
-            msTemplateBlockMapper.insertList(templateBlocks);
         }
-        //更改模版题块框选状态
+
+        //删除模块中题块定位数据
+        msTemplateBlockMapper.deleteByMtidAndMtype(mtid,2);
+
+        //保存模块题块信息
+        msTemplateBlockMapper.insertList(templateBlocks);
+
+        //更改模板题块框选状态
         msTemplateMapper.updateTemplateTbstate(mtid,1);
-        //获取试卷中所有模版题块框选状态
+        //获取试卷中所有模板题块框选状态
         int tbnum = msTemplateMapper.getUnSelTemplateCount(mpid);
-        int pbstate;
         if(tbnum == 0){
-            pbstate = 2;
-        }else{
-            pbstate = 1;
+            //更改科目题块框选状态已完成
+            msSubjectMapper.updatePbstateByMpid(mpid,2);
         }
-        //更改科目题块框选状态
-        msSubjectMapper.updatePbstateByMpid(mpid,pbstate);
+
     }
 
     /*
@@ -229,7 +239,7 @@ public class MsTemplateService {
     }
 
     /*
-     * @Description 获取模版详情
+     * @Description 获取模板详情
      * @Date 2024/10/23 11:47:48
      * @Author WN
      * @Param [mtid]
@@ -240,4 +250,15 @@ public class MsTemplateService {
         msTemplate.setTblocks(msTemplateBlockMapper.listTemplateBlockQuestions(mt.getMtid(),mt.getMttype()));
         return msTemplate;
     }
+
+    /*
+     * @Description 模板题块详情-主观题
+     * @Date 2024/10/24 10:24:05
+     * @Author WN
+     * @Param [mtid]
+     * @Return java.util.List<com.xhkjedu.smarking.model.paper.MsTemplateBlock>
+     **/
+    public List<Map<String,Object>> listTemplateBlocksByMtidAndType(Integer mtid){
+        return msTemplateBlockMapper.listSubjectiveBlockQuestions(mtid);
+    }
 }

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

@@ -42,4 +42,9 @@
         </if>
     </delete>
 
+    <!--获取试卷中所有主观题题块ID-->
+    <select id="listSubjectiveBlockidsByMpid" resultType="com.xhkjedu.smarking.model.paper.MsPaperBlock">
+        select mblockid from ms_paper_block where mpid = #{mpid} and blocktype = 2 order by mblockid
+    </select>
+
 </mapper>

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

@@ -38,4 +38,10 @@
         </if>
         order by b.mtborder,q.mtbqorder
     </select>
+
+    <!--获取模版主观题题块信息-->
+    <select id="listSubjectiveBlockQuestions" resultType="java.util.Map">
+        select b.mtbid,b.mblockid,b.blockname,b.mttype,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>
 </mapper>

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

@@ -45,6 +45,6 @@
 
     <!--获取试卷未框选主观题模板数量-->
     <select id="getUnSelTemplateCount" resultType="java.lang.Integer">
-        select count(*) from ms_template where mpid=#{mpid} and tbstate != 2
+        select count(*) from ms_template where mpid=#{mpid} and tbstate=0
     </select>
 </mapper>