Merge remote-tracking branch 'origin/master' into ywx

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperFjtypeController.java

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Map;
+
 /**
  * @Description 附件试卷
  * @Author WN
@@ -22,7 +24,13 @@ public class EPaperFjtypeController {
     @Resource
     private EPaperFjtypeService ePaperFjtypeService;
 
-    //保存试卷信息
+    /**
+     * @Description 保存试卷信息
+     * @Param [paper]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/7/19 8:36
+     **/
     @PostMapping("/save")
     public ResultVo savePaperFj(@RequestBody EPaper paper){
         N_Utils.validation(new Object[]{paper.getExamid(),"考试id",1});
@@ -30,4 +38,18 @@ public class EPaperFjtypeController {
         return new ResultVo(0,"成功保存试卷信息",null);
     }
 
+    /**
+     * @Description 附件试卷详情
+     * @Param [paper]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/7/19 8:36
+     **/
+    @PostMapping("/detail")
+    public ResultVo getPaperFjDetail(@RequestBody EPaper paper){
+        N_Utils.validation(new Object[]{paper.getEpid(),"试卷id",1});
+        Map map = ePaperFjtypeService.getPaperFjDetail(paper.getEpid());
+        return new ResultVo(0,"成功保存试卷信息",null);
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperFjtypeMapper.java

@@ -2,6 +2,10 @@ package com.xhkjedu.sexam.mapper.paper;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paper.EPaperFjtype;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 附件试卷题型信息
@@ -9,5 +13,6 @@ import com.xhkjedu.sexam.model.paper.EPaperFjtype;
  * Date 2022/7/18 13:59
  **/
 public interface EPaperFjtypeMapper extends TkMapper<EPaperFjtype> {
-
+    //试卷题型试题信息
+    List<Map> listPaperFjtypeQuestions(@Param("epid")Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperFjtypeService.java

@@ -179,8 +179,17 @@ public class EPaperFjtypeService {
         ePaperAnalyzeMapper.insertUseGeneratedKeys(epa);
     }
 
-    //试卷详情
-    public void getPaperDetail(Integer epid){
-
+    /**
+     * @Description 试卷详情
+     * @Param [epid]
+     * @Return java.util.Map
+     * @Author wn
+     * @Date 2022/7/19 8:35
+     **/
+    public Map getPaperFjDetail(Integer epid){
+        Map map = ePaperMapper.getExamPaperDetailByEpid(epid);//试卷信息
+        List<Map> fjtypelist = ePaperFjtypeMapper.listPaperFjtypeQuestions(epid);//试卷题型试题信息
+        map.put("qtypes",fjtypelist);
+        return map;
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperService.java

@@ -38,7 +38,13 @@ public class EPaperService {
         return ePaperMapper.listExamPapers(examid);
     }
 
-    //试卷退回
+    /**
+     * @Description 试卷退回
+     * @Param [ePaperBack]
+     * @Return void
+     * @Author wn
+     * @Date 2022/7/19 8:34
+     **/
     @Transactional(rollbackFor = Exception.class)
     public void savePaperBack(EPaperBack ePaperBack){
         int timestamp = N_Utils.getSecondTimestamp();
@@ -49,7 +55,13 @@ public class EPaperService {
         //试卷回退需要发送通知和短息，后续添加
     }
 
-    //试卷退回原因
+    /**
+     * @Description 试卷退回原因
+     * @Param [epid]
+     * @Return java.util.List<java.util.Map>
+     * @Author wn
+     * @Date 2022/7/19 8:34
+     **/
     public List<Map> listPaperBacksByEpid(Integer epid){
         return ePaperBackMapper.listPaperBacksByEpid(epid);
     }
@@ -59,20 +71,5 @@ public class EPaperService {
         return ePaperMapper.listExamPapersByTeacherid(teacherid);
     }
 
-    //试卷详情
-    public Map getExamPaperDetailByEpid(Integer epid){
-        Map map = ePaperMapper.getExamPaperDetailByEpid(epid);
-        //试卷类型1题库2答题卡3仅答题卡
-        int ptype = Integer.parseInt(map.get("ptype").toString());
-        if(ptype == 1){
-
-        }else if(ptype == 2){
-
-        }else{
-
-        }
-
-        return null;
-    }
 
 }

sexam/src/main/resources/mapper/paper/EPaperFjtypeMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sexam.mapper.paper.EPaperFjtypeMapper">
 
+    <!--试卷题型试题信息-->
     <resultMap id="fjtypeQuestions" type="java.util.Map">
         <result column="epfjid" property="epfjid"></result>
         <result column="epid" property="epid"></result>