试卷模板、题块信息

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

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

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

@@ -1,14 +1,15 @@
 package com.xhkjedu.smarking.controller.paper;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlock;
 import com.xhkjedu.smarking.service.paper.MsPaperBlockService;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
+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;
 import java.util.List;
@@ -24,34 +25,36 @@ public class MsPaperBlockController {
     @Resource
     private MsPaperBlockService msPaperBlockService;
 
-    /**
-     * @Description 新增
-     * @Param [msPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsPaperBlock msPaperBlock) {
-        msPaperBlockService.add(msPaperBlock);
-        return new ResultVo(0, "保存成功！");
+    /*
+    * @Description 试卷题块试题
+    * @Date 2024/10/21 14:37:21
+    * @Author WN
+    * @Param [msPaper]
+    * @Return com.xhkjedu.vo.ResultVo
+    **/
+    @PostMapping("/list")
+    public ResultVo listPaperBlocks(@RequestBody MsPaper msPaper) {
+        N_Utils.validation(new Object[]{msPaper.getMsid(), "考试科目id"});
+        List<MsPaperBlock> list = msPaperBlockService.listPaperBlockQuestions(msPaper.getMsid());
+        return new ResultVo(0, "查询成功！", list);
     }
 
-    /**
-     * @Description 列表
-     * @Param [msPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
+    /*
+     * @Description 保存题块
+     * @Date 2024/10/21 15:38:52
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsPaperBlock msPaperBlock) {
-        Integer page = msPaperBlock.getPage();
-        Integer size = msPaperBlock.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsPaperBlock> list = msPaperBlockService.queryList(msPaperBlock);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+    @PostMapping("/save")
+    public ResultVo save(@RequestBody MsPaperParams params) {
+        N_Utils.validation(new Object[]{params.getMsid(), "考试科目id"});
+        if(params.getBlocks() == null || params.getBlocks().size() == 0){
+            return new ResultVo(1, "题块不能为空！");
+        }
+        Integer mpid = msPaperBlockService.save(params);
+        return new ResultVo(0, "保存成功！",mpid);
     }
+
+
 }

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

@@ -1,57 +0,0 @@
-package com.xhkjedu.smarking.controller.paper;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
-import com.xhkjedu.smarking.service.paper.MsPaperBlockQuestionService;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
-import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷试卷题块试题表相关操作
- * @Author auto
- * @Date 2024-10-15
- */
-@RestController
-@RequestMapping("/msPaperBlockQuestion")
-public class MsPaperBlockQuestionController {
-    @Resource
-    private MsPaperBlockQuestionService msPaperBlockQuestionService;
-
-    /**
-     * @Description 新增
-     * @Param [msPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsPaperBlockQuestion msPaperBlockQuestion) {
-        msPaperBlockQuestionService.add(msPaperBlockQuestion);
-        return new ResultVo(0, "保存成功！");
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsPaperBlockQuestion msPaperBlockQuestion) {
-        Integer page = msPaperBlockQuestion.getPage();
-        Integer size = msPaperBlockQuestion.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsPaperBlockQuestion> list = msPaperBlockQuestionService.queryList(msPaperBlockQuestion);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
-    }
-}

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

@@ -139,5 +139,19 @@ public class MsPaperQtypeController {
         return new ResultVo(0,"获取成功" ,map);
     }
 
+    /*
+     * @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());
+        return new ResultVo(0,"获取成功" ,map);
+    }
+
 
 }

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

@@ -3,6 +3,7 @@ package com.xhkjedu.smarking.controller.paper;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsTemplate;
 import com.xhkjedu.smarking.service.paper.MsTemplateService;
+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;
@@ -40,7 +41,7 @@ public class MsTemplateController {
     }
 
     /**
-     * @Description 新增
+     * @Description 模版-新增
      * @Param [msTemplate]
      * @Author auto
      * @Date 2024-10-15
@@ -49,9 +50,64 @@ public class MsTemplateController {
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsTemplate msTemplate) {
         N_Utils.validation(new Object[]{msTemplate.getMpid(),"试卷id",1});
-        MsTemplate mt = msTemplateService.add(msTemplate);
+        MsTemplate mt = msTemplateService.save(msTemplate);
         return new ResultVo(0, "保存成功",mt);
     }
 
+    /*
+     * @Description 模版-设置
+     * @Date 2024/10/21 10:55:50
+     * @Author WN
+     * @Param [msTemplate]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update")
+    public ResultVo updateTemplate(@RequestBody MsTemplate msTemplate) {
+        N_Utils.validation(new Object[]{msTemplate.getMpid(),"试卷id",1,msTemplate.getMtid(),"模板id",1});
+        MsTemplate mt = msTemplateService.updateTemplate(msTemplate);
+        return new ResultVo(0, "保存成功",mt);
+    }
+    /*
+     * @Description 模版-提交
+     * @Date 2024/10/21 10:55:50
+     * @Author WN
+     * @Param [msTemplate]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/commit")
+    public ResultVo commitTemplate(@RequestBody MsTemplate msTemplate) {
+        N_Utils.validation(new Object[]{msTemplate.getMpid(),"试卷id",1,msTemplate.getMtid(),"模板id",1});
+        MsTemplate mt = msTemplateService.updateTemplate(msTemplate);
+        return new ResultVo(0, "保存成功",mt);
+    }
+
+    /*
+     * @Description 保存模板主观题框选
+     * @Date 2024/10/21 17:44:35
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/save_sub")
+    public ResultVo saveSubjective(@RequestBody MsPaperParams params) {
+        N_Utils.validation(new Object[]{params.getMpid(),"试卷id",1,params.getMtid(),"模板id",1});
+        msTemplateService.saveSubjectiveQuestion(params);
+        return new ResultVo(0, "保存成功",params.getMtid());
+    }
+
+    /*
+     * @Description 删除模板
+     * @Date 2024/10/21 17:50:46
+     * @Author WN
+     * @Param [msTemplate]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody MsTemplate msTemplate) {
+        N_Utils.validation(new Object[]{msTemplate.getMtid(),"模板id",1});
+        msTemplateService.deleteTemplate(msTemplate.getMtid());
+        return new ResultVo(0, "删除成功");
+    }
+
 
 }

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

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.paper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlock;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷试卷题块 Mapper 接口
@@ -9,4 +12,10 @@ import com.xhkjedu.smarking.model.paper.MsPaperBlock;
  * @Date 2024-10-15
  */
 public interface MsPaperBlockMapper extends TkMapper<MsPaperBlock> {
+
+    //获取题块及题块下试题
+    List<MsPaperBlock> listPaperBlockQuestions(@Param("msid")Integer msid,@Param("blocktype")Integer blocktype);
+
+    //根据试卷ID删除试卷题块
+    int deleteObjByMpidAndBlocktype(@Param("mpid")Integer mpid,@Param("blocktype")Integer blocktype);
 }

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

@@ -23,7 +23,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
     int updatePaperAnswer(@Param("answered") Integer answered,@Param("mpid") Integer mpid);
 
     //获取试卷详情
-    Map<String,Object> getPaperInfoByEsid(@Param("msid") Integer msid);
+    Map<String,Object> getPaperInfoByMsid(@Param("msid") Integer msid);
 
     //获取考试科目对应考试状态信息
     PExamSubjectVo getExamSubjectForPaper(@Param("mpid")Integer mpid);
@@ -40,4 +40,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
 
     //根据试卷id获取考试状态
     Integer getExamStateByMpid(@Param("mpid") Integer mpid);
+
+    //根据科目id获取试卷基础信息
+    MsPaper getPaperBaseByMsid(@Param("msid") Integer msid);
 }

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

@@ -6,6 +6,7 @@ import com.xhkjedu.smarking.vo.paper.MsPaperQtypeVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷试卷题型表 Mapper 接口
@@ -23,4 +24,7 @@ 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);
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.paper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.paper.MsTemplateBlock;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description 阅卷模块客观题定位区表 Mapper 接口
@@ -9,4 +10,7 @@ import com.xhkjedu.smarking.model.paper.MsTemplateBlock;
  * @Date 2024-10-15
  */
 public interface MsTemplateBlockMapper extends TkMapper<MsTemplateBlock> {
+
+    //删除模板中指定类型题块信息
+    int deleteByMtidAndMtype(@Param("mtid")Integer mtid, @Param("mtype")Integer mtype);
 }

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

@@ -19,4 +19,13 @@ public interface MsTemplateMapper extends TkMapper<MsTemplate> {
 
     //设置试卷模板信息
     int updateTemplateForCurrstep(@Param("t") MsTemplate t);
+
+    //获取试卷未提交模版数量
+    int getUnCommitTemplateCount(@Param("mpid")Integer mpid);
+
+    //修改模板题块框选状态
+    int updateTemplateTbstate(@Param("mtid")Integer mtid, @Param("tbstate")Integer tbstate);
+
+    //获取试卷未框选主观题模板数量
+    int getUnSelTemplateCount(@Param("mpid")Integer mpid);
 }

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

@@ -5,6 +5,8 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description 阅卷试卷题块
@@ -33,4 +35,8 @@ public class MsPaperBlock extends BaseBean {
     private Integer createid;
     //创建时间
     private Integer createtime;
+
+    //题块下试题
+    @Transient
+    private List<MsPaperBlockQuestion> questions;
 }

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

@@ -53,6 +53,8 @@ public class MsTemplate extends BaseBean {
     private Integer currstep;
     //模板状态0未提交1已提交
     private Integer tstate;
+    //题块框选状态0默认1已提交
+    private Integer tbstate;
     //创建人ID
     private Integer createid;
     //创建时间

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

@@ -1,41 +0,0 @@
-package com.xhkjedu.smarking.service.paper;
-
-import com.xhkjedu.smarking.mapper.paper.MsPaperBlockQuestionMapper;
-import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷试卷题块试题表 服务实现类
- * @Author auto
- * @Date 2024-10-15
- */
-@Service
-public class MsPaperBlockQuestionService {
-    @Resource
-    private MsPaperBlockQuestionMapper msPaperBlockQuestionMapper;
-
-    /**
-     * @Description 新增
-     * @Param [msPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return void
-     **/
-    public void add(MsPaperBlockQuestion msPaperBlockQuestion){
-        msPaperBlockQuestionMapper.insert(msPaperBlockQuestion);
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion>
-     **/
-    public List<MsPaperBlockQuestion> queryList(MsPaperBlockQuestion msPaperBlockQuestion){
-        return msPaperBlockQuestionMapper.selectAll();
-    }
-}

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

@@ -1,10 +1,18 @@
 package com.xhkjedu.smarking.service.paper;
 
 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.model.paper.MsPaperBlock;
+import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,26 +24,62 @@ import java.util.List;
 public class MsPaperBlockService {
     @Resource
     private MsPaperBlockMapper msPaperBlockMapper;
+    @Resource
+    private MsPaperMapper msPaperMapper;
+    @Resource
+    private MsPaperBlockQuestionMapper msPaperBlockQuestionMapper;
 
-    /**
-     * @Description 新增
-     * @Param [msPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return void
+    /*
+     * @Description 获取试卷所有题块
+     * @Date 2024/10/21 14:36:00
+     * @Author WN
+     * @Param [msid]
+     * @Return java.util.List<com.xhkjedu.smarking.model.paper.MsPaperBlock>
      **/
-    public void add(MsPaperBlock msPaperBlock){
-        msPaperBlockMapper.insert(msPaperBlock);
+    public List<MsPaperBlock> listPaperBlockQuestions(Integer msid){
+        Integer blocktype = 2;
+        return msPaperBlockMapper.listPaperBlockQuestions(msid,blocktype);
     }
 
+
     /**
-     * @Description 列表
+     * @Description 新增
      * @Param [msPaperBlock]
      * @Author auto
      * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.paper.MsPaperBlock>
+     * @return void
      **/
-    public List<MsPaperBlock> queryList(MsPaperBlock msPaperBlock){
-        return msPaperBlockMapper.selectAll();
+    @Transactional(rollbackFor = Exception.class)
+    public Integer save(MsPaperParams params){
+        MsPaper paper = msPaperMapper.getPaperBaseByMsid(params.getMsid());
+        Integer mpid = paper.getMpid();
+        //先删除已存在题块
+        msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,2);
+
+        Integer createid = paper.getCreateid();
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        List<MsPaperBlock> blocks = params.getBlocks();
+        for(MsPaperBlock block : blocks){
+            block.setBlocktype(2);
+            block.setMpid(mpid);
+            block.setCreateid(createid);
+            block.setCreatetime(timestamp);
+        }
+        msPaperBlockMapper.insertList(blocks);
+
+        List<MsPaperBlockQuestion> questions = new ArrayList<>();
+        for(MsPaperBlock block : blocks){
+            List<MsPaperBlockQuestion> bqs = block.getQuestions();
+            for(MsPaperBlockQuestion bq : bqs){
+                bq.setMblockid(block.getId());
+                bq.setMpid(mpid);
+                bq.setCreateid(createid);
+                bq.setCreatetime(timestamp);
+                questions.add(bq);
+            }
+        }
+
+        msPaperBlockQuestionMapper.insertList(questions);
+        return mpid;
     }
 }

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

@@ -840,7 +840,7 @@ public class MsPaperQtypeService {
      **/
     public Map<String,Object> getPaperDetail(Integer msid){
         //获取试卷详情
-        Map<String,Object> paper = msPaperMapper.getPaperInfoByEsid(msid);
+        Map<String,Object> paper = msPaperMapper.getPaperInfoByMsid(msid);
         if(N_Utils.isEmpty((paper.get("ptype"))) || paper.get("ptype").equals("0")){
             return paper;
         }
@@ -867,4 +867,25 @@ public class MsPaperQtypeService {
         return paper;
 
     }
+
+
+    /*
+     * @Description 获取试卷中所有主观题（题型-试题）
+     * @Date 2024/10/21 13:50:54
+     * @Author WN
+     * @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;
+        // List<Map<String,Object>> rtnList = new ArrayList<>();
+        // if(paper.getPtype() == 1){
+        //
+        // }else{
+        //     rtnList = msPaperQtypeMapper.listSubjectiveQuestionsFj(mpid,subjectivelist);
+        // }
+
+        return msPaperQtypeMapper.listSubjectiveQuestionsFj(mpid,subjectivelist);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.xhkjedu.smarking.service.paper;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.paper.*;
 import com.xhkjedu.smarking.model.paper.*;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,9 +55,11 @@ public class MsTemplateService {
      * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public MsTemplate add(MsTemplate msTemplate){
+    public MsTemplate save(MsTemplate msTemplate){
         msTemplate.setCreatetime(N_Utils.getSecondTimestamp());
         msTemplate.setCurrstep(1);
+        msTemplate.setTstate(0);
+        msTemplate.setTbstate(0);
         msTemplateMapper.insertUseGeneratedKeys(msTemplate);
         int mtid = msTemplate.getId();
         msTemplate.setMtid(mtid);
@@ -66,24 +69,44 @@ public class MsTemplateService {
         return msTemplate;
     }
 
+    /*
+     * @Description 设置模版
+     * @Date 2024/10/21 10:47:00
+     * @Author WN
+     * @Param [msTemplate]
+     * @Return com.xhkjedu.smarking.model.paper.MsTemplate
+     **/
     @Transactional(rollbackFor = Exception.class)
     public MsTemplate updateTemplate(MsTemplate msTemplate){
         msTemplateMapper.updateTemplateForCurrstep(msTemplate);
-        Integer mpid = msTemplate.getMpid();
         //如果当前保存为6，则需要保存客观题信息
         if(msTemplate.getCurrstep() == 6){
             //模版题块信息
             List<MsTemplateBlock> tblocks = msTemplate.getTblocks();
-            savePaperBlock(tblocks,msTemplate);
+            savePaperBlockAndTemplate(tblocks,msTemplate);
+        }
+
+        if(msTemplate.getTstate()!=null && msTemplate.getTstate() == 1){
+            Integer mpid = msTemplate.getMpid();
+            //代表提交,获取试卷对应所有的模块状态，如果均是已提交，则更改科目表中状态
+            Integer uncommit = msTemplateMapper.getUnCommitTemplateCount(mpid);
+            if(uncommit == 0){
+                msSubjectMapper.updatePtstateByMpid(mpid,2);
+            }
         }
         return msTemplate;
     }
 
-    private void savePaperBlock(List<MsTemplateBlock> tblocks,MsTemplate msTemplate){
+    //保存客观题题块和模版信息
+    private void savePaperBlockAndTemplate(List<MsTemplateBlock> tblocks,MsTemplate msTemplate){
         Integer mpid = msTemplate.getMpid();
         Integer timestamp = N_Utils.getSecondTimestamp();
         Integer createid = msTemplate.getCreateid();
 
+        //保存之前先清除已保存的信息
+        msTemplateBlockMapper.deleteByMtidAndMtype(msTemplate.getMtid(),1);
+        msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,1);
+
         //客观题题块试题信息
         List<MsPaperBlockQuestion> savePbquestions = new ArrayList<>();
         //客观题模块试题信息
@@ -151,4 +174,54 @@ public class MsTemplateService {
     }
 
 
+    /*
+     * @Description 保存模板主观题框选
+     * @Date 2024/10/21 17:41:42
+     * @Author WN
+     * @Param [params]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveSubjectiveQuestion(MsPaperParams params){
+        Integer mtid = params.getMtid();
+        Integer mpid = params.getMpid();
+        Integer createid = params.getCreateid();
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        List<MsTemplateBlock> templateBlocks = params.getTblocks();
+        //删除模块中题块定位数据
+        msTemplateBlockMapper.deleteByMtidAndMtype(mtid,2);
+
+        for (MsTemplateBlock templateBlock : templateBlocks){
+            templateBlock.setMtid(mtid);
+            templateBlock.setMttype(2);
+            templateBlock.setCreateid(createid);
+            templateBlock.setCreatetime(timestamp);
+
+            msTemplateBlockMapper.insertList(templateBlocks);
+        }
+        //更改模版题块框选状态
+        msTemplateMapper.updateTemplateTbstate(mtid,1);
+        //获取试卷中所有模版题块框选状态
+        int tbnum = msTemplateMapper.getUnSelTemplateCount(mpid);
+        Integer pbstate = 0;
+        if(tbnum == 0){
+            pbstate = 2;
+        }else{
+            pbstate = 1;
+
+        }
+        //更改科目题块框选状态
+        msSubjectMapper.updatePbstateByMpid(mpid,pbstate);
+    }
+
+    /*
+     * @Description 删除模板
+     * @Date 2024/10/21 17:49:46
+     * @Author WN
+     * @Param [mtid]
+     * @Return void
+     **/
+    public void deleteTemplate(Integer mtid){
+        msTemplateMapper.deleteByPrimaryKey(mtid);
+    }
 }

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

@@ -0,0 +1,24 @@
+package com.xhkjedu.smarking.vo.paper;
+
+import com.xhkjedu.smarking.model.paper.MsPaperBlock;
+import com.xhkjedu.smarking.model.paper.MsTemplateBlock;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description：试卷题块参数
+ * @Author: WN
+ * @Date: 2024/10/21 15:28:46
+ **/
+@Data
+public class MsPaperParams {
+
+    private Integer msid; //试卷科目ID
+    private Integer mpid;//试卷ID
+    private Integer createid;//创建人ID
+    private List<MsPaperBlock> blocks; //试卷题块列表
+
+    private Integer mtid;//模板ID
+    private List<MsTemplateBlock> tblocks; //模板题块列
+}

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

@@ -17,9 +17,6 @@ public class MsPaperQtypeVo {
     //考试试卷题型表
     private Integer mptid;
 
-    // //处理题型
-    // private Integer ctype;
-
     //题型名称
     private String mptname;
 

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

@@ -1,4 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.paper.MsPaperBlockMapper">
+
+    <resultMap id="paperBlockResultMap" type="com.xhkjedu.smarking.model.paper.MsPaperBlock">
+        <result property="mblockid" column="mblockid"/>
+        <result property="mpid" column="mpid"/>
+        <result property="blockname" column="blockname"/>
+        <result property="blocktype" column="blocktype"/>
+        <result property="blockorder" column="blockorder"/>
+        <result property="bqnum" column="bqnum"/>
+        <result property="bqscore" column="bqscore"/>
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List"></collection>
+    </resultMap>
+
+    <!--获取题块及题块下试题-->
+    <select id="listPaperBlockQuestions" resultMap="paperBlockResultMap">
+        select b.mblockid,b.mpid,b.blockname,b.blocktype,b.blockorder,b.bqnum,b.bqscore,
+        q.mbqid,q.mbqtype,q.mptqid,q.bqn,q.bqscore,q.bqorder,q.mergeqid,q.mergeqn,q.scorestepway,q.scorestep
+        from ms_paper_block b
+        left join ms_paper_block_question q on b.mblockid=q.mblockid
+        left join ms_paper p on b.mpid=p.mpid
+        where p.msid = #{msid} and b.blocktype=#{blocktype} order by b.blockorder,q.bqorder
+    </select>
+
+    <!--根据试卷ID删除题块-->
+    <delete id="deleteObjByMpidAndBlocktype">
+        delete from ms_paper_block where mpid = #{mpid}
+        <if test="blocktype!=null and blocktype > 0">
+            and blocktype = #{blocktype}
+        </if>
+    </delete>
+
 </mapper>

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

@@ -15,7 +15,7 @@
     </update>
 
     <!--获取试卷详细信息-->
-    <select id="getPaperInfoByEsid" resultType="java.util.Map">
+    <select id="getPaperInfoByMsid" resultType="java.util.Map">
         select s.examid,s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.gradeid,e.examtype,
         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
@@ -76,4 +76,9 @@
         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>
+
 </mapper>

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

@@ -86,7 +86,6 @@
     <resultMap id="fjtypeQuestions" type="com.xhkjedu.smarking.vo.paper.MsPaperQtypeVo">
         <result column="mptid" property="mptid"></result>
         <result column="mpid" property="mpid"></result>
-        <result column="ctype" property="ctype"></result>
         <result column="mptname" property="mptname"></result>
         <result column="mptnum" property="mptnum"></result>
         <result column="mptorder" property="mptorder"></result>
@@ -105,10 +104,38 @@
         </collection>
     </resultMap>
     <select id="listPaperQtypeQuesitonsForFj" resultMap="fjtypeQuestions">
-        select  t.mptid,t.mpid,t.ctype,t.mptname,t.mptnum,t.mptorder,t.mptscore,
+        select  t.mptid,t.mpid,t.mptname,t.mptnum,t.mptorder,t.mptscore,
                 q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qorder,q.qanswer,q.optionnum
         from ms_paper_qtype_question q left join ms_paper_qtype t on t.mptid=q.mptid
         where t.mpid=#{mpid} order by t.mptorder,q.qorder
     </select>
 
+    <!--获取试卷所有主观题-->
+    <resultMap id="subjectiveQuestions" type="java.util.Map">
+        <result column="mptid" property="mptid" />
+        <result column="mptname" property="mptname" />
+        <result column="mptnum" property="mptnum" />
+        <result column="mptorder" property="mptorder" />
+        <result column="mptscore" property="mptscore" />
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <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" />
+        </collection>
+    </resultMap>
+    <select id="listSubjectiveQuestionsFj" resultMap="subjectiveQuestions">
+        select t.mptid,t.mptname,t.mptnum,t.mptorder,t.mptscore,
+        q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qorder
+        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>
+        order by t.mptorder,q.qorder
+    </select>
+
 </mapper>

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

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.paper.MsTemplateBlockMapper">
+    
+    <!--删除模板中指定类型题块信息-->
+    <delete id="deleteByMtidAndMtype">
+        delete from ms_template_block where mtid = #{mtid}
+        <if test="mtype!=null and mtype > 0">
+            and mtype = #{mtype}
+        </if>
+    </delete>
 </mapper>

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

@@ -28,8 +28,24 @@
             ,misscoor=#{t.misscoor}
         </if>
         <if test="t.currstep == 8">
-            ,violatecoor=#{t.violatecoor},tstate=#{t.tstate}
+            ,violatecoor=#{t.violatecoor}
+            <if test="t.tstate!=null and t.tstate==1">,tstate=1</if>
         </if>
         where mtid=#{t.mtid}
     </update>
+
+    <!--获取试卷未提交模板数量-->
+    <select id="getUnCommitTemplateCount" resultType="java.lang.Integer">
+        select count(*) from ms_template where mpid=#{mpid} and tstate=0
+    </select>
+
+    <!--修改模板题块框选状态-->
+    <update id="updateTemplateTbstate">
+        update ms_template set tbstate=#{tbstate} where mtid=#{mtid}
+    </update>
+
+    <!--获取试卷未框选主观题模板数量-->
+    <select id="getUnSelTemplateCount" resultType="java.lang.Integer">
+        select count(*) from ms_template where mpid=#{mpid} and tbstate=0
+    </select>
 </mapper>