答题卡

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

@@ -1023,7 +1023,7 @@ public class N_Utils {
     }
 
     //处理题型中客观题
-    private static int[] octypelist = new int[]{1,2,4,5,6,7,8};
+    private static int[] octypelist = new int[]{1,2,4,5,6,7,8,10};
     /**
      * @Description 判断ctype是否是客观题
      * @Param [ctype]

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

@@ -0,0 +1,38 @@
+package com.xhkjedu.sexam.controller.paper;
+
+import com.xhkjedu.sexam.model.paper.EPaper;
+import com.xhkjedu.sexam.model.paper.EPaperScantron;
+import com.xhkjedu.sexam.service.paper.EPaperScantronService;
+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;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/escan")
+public class EPaperScantronController {
+    @Resource
+    private EPaperScantronService ePaperScantronService;
+
+    //获取制作答题卡需要的试卷信息
+    @PostMapping("/pqs")
+    public ResultVo getPaperAndQuesitons(@RequestBody EPaperScantron eSubjectScantron) {
+        N_Utils.validation(new Object[]{eSubjectScantron.getEpid(),"试卷id",1});
+        Map rtn = ePaperScantronService.getPaperAndQuesitons(eSubjectScantron.getEpid());
+        return new ResultVo(0,"获取成功",rtn);
+    }
+
+    //保存答题卡
+    @PostMapping("/save")
+    public ResultVo save(@RequestBody EPaper epaper) {
+        ePaperScantronService.savePaperScantron(epaper);
+        return new ResultVo(0,"保存成功");
+    }
+
+
+}

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

@@ -1,31 +0,0 @@
-package com.xhkjedu.sexam.controller.paper;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.xhkjedu.sexam.model.paper.ESubjectScantron;
-import com.xhkjedu.sexam.service.paper.ESubjectScantronService;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
-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;
-import java.util.List;
-
-@RestController
-@RequestMapping("/e_scantron")
-public class ESubjectScantronController {
-    @Resource
-    private ESubjectScantronService eSubjectScantronService;
-
-    @PostMapping("/add")
-    public ResultVo add(@RequestBody ESubjectScantron eSubjectScantron) {
-        eSubjectScantronService.saveSubjectScantron(eSubjectScantron);
-        return new ResultVo(0,"保存成功");
-    }
-
-
-}

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

@@ -15,4 +15,7 @@ import java.util.Map;
 public interface EPaperFjtypeMapper extends TkMapper<EPaperFjtype> {
     //试卷题型试题信息
     List<Map> listPaperFjtypeQuestions(@Param("epid")Integer epid);
+
+    //制作答题卡时获取试卷中试题
+    List<Map> listPaperfjtypeQuestionsForScan(@Param("epid")Integer epid);
 }

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

@@ -25,6 +25,9 @@ public interface EPaperMapper extends TkMapper<EPaper> {
     //试卷详情
     Map getExamPaperDetailByEpid(@Param("epid") Integer epid);
 
+    //获取考试科目和考试名称
+    Map getExamPaperAndSubject(@Param("epid") Integer epid);
+
     //删除试卷信息
     void deletePaperByEpid(@Param("epid") Integer epid);
 
@@ -36,4 +39,7 @@ public interface EPaperMapper extends TkMapper<EPaper> {
 
     //修改批阅设置
     void updateCorrectType(@Param("epid") Integer epid, @Param("correcttype") int correcttype);
+
+    //修改答题卡关联字段信息
+    void updatePaperScantron(@Param("paper") EPaper paper);
 }

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

@@ -17,4 +17,7 @@ public interface EPaperQtypeMapper extends TkMapper<EPaperQtype> {
 
     //题型试题详情
     List<EPaperQtypeVo> listPaperQtypeQuestions(@Param("epid") Integer epid);
+
+    //制作答题卡时获取试卷中试题
+    List<Map> listPaperqtypeQuestionsForScan(@Param("epid") Integer epid);
 }

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

@@ -0,0 +1,11 @@
+package com.xhkjedu.sexam.mapper.paper;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.paper.EPaperScantron;
+import org.apache.ibatis.annotations.Param;
+
+public interface EPaperScantronMapper extends TkMapper<EPaperScantron> {
+
+    //删除答题卡
+    void deleteScantronByEpid(@Param("epid")Integer epid);
+}

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

@@ -1,14 +0,0 @@
-package com.xhkjedu.sexam.mapper.paper;
-
-import com.xhkjedu.sexam.base.TkMapper;
-import com.xhkjedu.sexam.model.paper.ESubjectScantron;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ESubjectScantronMapper extends TkMapper<ESubjectScantron> {
-
-    //答题卡中试题详情
-    List<Map> cantronQtypes(@Param("esid")Integer esid);
-}

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

@@ -1,7 +0,0 @@
-package com.xhkjedu.sexam.mapper.paper;
-
-import com.xhkjedu.sexam.base.TkMapper;
-import com.xhkjedu.sexam.model.paper.ESubjectScantronQtype;
-
-public interface ESubjectScantronQtypeMapper extends TkMapper<ESubjectScantronQtype> {
-}

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/ESubjectScantronStudentMapper.java

@@ -1,7 +0,0 @@
-package com.xhkjedu.sexam.mapper.paperstudent;
-
-import com.xhkjedu.sexam.base.TkMapper;
-import com.xhkjedu.sexam.model.paperstudent.ESubjectScantronStudent;
-
-public interface ESubjectScantronStudentMapper extends TkMapper<ESubjectScantronStudent> {
-}

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/ESubjectScantronStudentQuestionMapper.java

@@ -1,7 +0,0 @@
-package com.xhkjedu.sexam.mapper.paperstudent;
-
-import com.xhkjedu.sexam.base.TkMapper;
-import com.xhkjedu.sexam.model.paperstudent.ESubjectScantronStudentQuestion;
-
-public interface ESubjectScantronStudentQuestionMapper extends TkMapper<ESubjectScantronStudentQuestion> {
-}

sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaper.java

@@ -24,7 +24,7 @@ public class EPaper extends BaseBean {
     //科目id
     private String subjectid;
 
-    //试卷类型1题库2答题卡
+    //试卷类型1题库
     private Integer ptype;
 
     //试题数量
@@ -42,6 +42,9 @@ public class EPaper extends BaseBean {
     //听力题文件地址(附件试卷）
     private String hearfile;
 
+    //是否有附件0没有1有附件
+    private Integer hasfile;
+
     //答题卡文件
     private String scantronfile;
 
@@ -77,4 +80,7 @@ public class EPaper extends BaseBean {
 
     @Transient
     private List<EPaperQtype> qtypelist;//题库试卷内容
+
+    @Transient
+    private List<EPaperScantron> scanlist;//答题卡内容
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paper/ESubjectScantron.java → sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaperScantron.java

@@ -5,13 +5,14 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import java.util.List;
 
-@Table(name = "e_subject_scantron")
+@Table(name = "e_paper_scantron")
 @Data
-public class ESubjectScantron extends BaseBean {
+public class EPaperScantron extends BaseBean {
     @Id
     //试卷科目答题卡表
-    private Integer essid;
+    private Integer escanid;
 
     //考试科目id
     private Integer esid;
@@ -19,30 +20,15 @@ public class ESubjectScantron extends BaseBean {
     //考试试卷id
     private Integer epid;
 
-    //答题卡题型表id
-    private Integer esstid;
-
     //试题处理题型
     private Integer ctype;
 
-    //试题id
-    private String questionid;
-
-    //题号
-    private String qn;
-
-    //试题排序
-    private Integer order;
-
-    //分值
-    private Double score;
+    //试卷中生成的试题id
+    private Integer questionid;
 
     //选项数量
     private Integer optionnum;
 
-    //正确答案
-    private String answer;
-
     //试题坐标
     private String coord;
 
@@ -51,4 +37,7 @@ public class ESubjectScantron extends BaseBean {
 
     //创建时间
     private Integer createtime;
+
+    //二维坐标数组字符串
+    private List<String> coordlist;
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paper/ESubjectScantronQtype.java

@@ -1,47 +0,0 @@
-package com.xhkjedu.sexam.model.paper;
-
-import com.xhkjedu.sexam.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
-
-@Table(name = "e_subject_scantron_qtype")
-@Data
-public class ESubjectScantronQtype extends BaseBean {
-    @Id
-    //试卷科目答题卡题型表
-    private Integer esstid;
-
-    //考试科目id
-    private Integer esid;
-
-    //考试试卷表
-    private Integer epid;
-
-    //处理题型
-    private Integer ctype;
-
-    //题型名称
-    private String esstname;
-
-    //题型序号
-    private String esstorder;
-
-    //题型下试题数量
-    private Integer esstnum;
-
-    //题型下试题总分值
-    private Double esstscore;
-
-    //创建人id
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-
-    @Transient
-    private List<ESubjectScantron> questions;//试题
-}

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/ESubjectScantronStudent.java

@@ -1,45 +0,0 @@
-package com.xhkjedu.sexam.model.paperstudent;
-
-import com.xhkjedu.sexam.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "e_subject_scantron_student")
-@Data
-public class ESubjectScantronStudent extends BaseBean {
-    @Id
-    //考试科目答题卡学生表
-    private Integer esssid;
-
-    //班级id
-    private Integer classid;
-
-    //学生id
-    private Integer studentid;
-
-    //考试试卷id
-    private Integer epid;
-
-    //考试科目答题卡id
-    private Integer essid;
-
-    //批阅状态0未批改1批改中2已批改
-    private Integer checked;
-
-    //批阅人
-    private Integer checkid;
-
-    //试题数量
-    private Integer num;
-
-    //试卷分值
-    private Double score;
-
-    //学生得分
-    private Double stuscore;
-
-    //保存时间
-    private Integer createtime;
-}

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/ESubjectScantronStudentQuestion.java

@@ -1,66 +0,0 @@
-package com.xhkjedu.sexam.model.paperstudent;
-
-import com.xhkjedu.sexam.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "e_subject_scantron_student_question")
-@Data
-public class ESubjectScantronStudentQuestion extends BaseBean {
-    @Id
-    //考试答题卡学生作答表
-    private Integer esssqid;
-
-    //班级id
-    private Integer classid;
-
-    //学生id
-    private Integer studentid;
-
-    //考试试卷id
-    private Integer epid;
-
-    //考试科目答题卡id
-    private Integer essid;
-
-    //学生答题卡表id
-    private Integer esssid;
-
-    //试题序号
-    private String qn;
-
-    //试题排序
-    private Integer qorder;
-
-    //是否作答0未作答1已作做答
-    private Integer answered;
-
-    //是否转换0未转换1已转换2转换失败
-    private Integer converted;
-
-    //试题分值
-    private Double qscore;
-
-    //学生得分
-    private Double stuscore;
-
-    //是否批改0未批改1批改中2已批改
-    private Integer checked;
-
-    //批改人
-    private Integer checkid;
-
-    //批改时间
-    private Integer checktime;
-
-    //作答情况0默认1优秀2违规
-    private Integer goodbad;
-
-    //保存时间
-    private Integer createtime;
-
-    //学生答案（选项、图片）
-    private String stuanswer;
-}

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

@@ -42,12 +42,23 @@ public class EPaperFjtypeService {
         ESubject eSubject = eSubjectMapper.selectByPrimaryKey(paper.getEsid());
         List<EPaperFjtype> fjtypelist  = paper.getFjtypelist();//题型
         List<EPaperFjtypeQuestion> queslist = new ArrayList<>();//题型下试题集合
+        List<EPaperFile> files = paper.getPfiles();//附件文件
+        if(files!=null && files.size()>0){
+            paper.setHasfile(1);
+        }else{
+            paper.setHasfile(0);
+        }
+        setPaperBaseDetail(paper,eSubject,fjtypelist,queslist);
+
         ePaperMapper.insertUseGeneratedKeys(paper);
         int epid = paper.getId();
         paper.setEpid(epid);
-        setPaperBaseDetail(paper,eSubject,fjtypelist,queslist);
-        //保存作业附件
-        savePaperFile(paper);
+
+        if(paper.getHasfile() == 1){
+            //保存作业附件
+            savePaperFile(paper,files);
+        }
+
         //保存答题卡信息
         saveFjtypeQuestion(paper,fjtypelist);
 
@@ -82,9 +93,8 @@ public class EPaperFjtypeService {
     }
 
     //保存附件试卷文件
-    private void savePaperFile(EPaper paper){
+    private void savePaperFile(EPaper paper,List<EPaperFile> files){
         int fileorder = 1;
-        List<EPaperFile> files = paper.getPfiles();
         for(EPaperFile f : files){
             f.setCreateid(paper.getCreateid());
             f.setCreatetime(paper.getCreatetime());
@@ -100,7 +110,7 @@ public class EPaperFjtypeService {
         List<EPaperFjtypeQuestion> saveques = new ArrayList<>();
         for(EPaperFjtype fjt : fjtypelist){
             List<EPaperFjtypeQuestion> quelist = fjt.getQuestions();//题型下试题
-            fjt.setEpfjid(paper.getEpid());
+            fjt.setEpid(paper.getEpid());
             fjt.setCreateid(paper.getHandleid());
             fjt.setCreatetime(paper.getHandletime());
             fjt.setEpfjnum(quelist.size());
@@ -185,12 +195,20 @@ public class EPaperFjtypeService {
         ESubject eSubject = eSubjectMapper.selectByPrimaryKey(paper.getEsid());
         List<EPaperFjtype> fjtypelist  = paper.getFjtypelist();//题型
         List<EPaperFjtypeQuestion> queslist = new ArrayList<>();//题型下试题集合
+        List<EPaperFile> files = paper.getPfiles();//附件文件
+        if(files!=null && files.size()>0){
+            paper.setHasfile(1);
+        }else{
+            paper.setHasfile(0);
+        }
         ePaperMapper.insertUseGeneratedKeys(paper);
         int epid = paper.getId();
         paper.setEpid(epid);
         setPaperBaseDetail(paper,eSubject,fjtypelist,queslist);
-        //保存作业附件
-        savePaperFile(paper);
+        if(paper.getHasfile() == 1){
+            //保存作业附件
+            savePaperFile(paper,files);
+        }
         //保存答题卡信息
         saveFjtypeQuestion(paper,fjtypelist);
 
@@ -214,7 +232,12 @@ public class EPaperFjtypeService {
     public Map getPaperFjDetail(Integer epid){
         Map map = ePaperMapper.getExamPaperDetailByEpid(epid);//试卷信息
         List<Map> fjtypelist = ePaperFjtypeMapper.listPaperFjtypeQuestions(epid);//试卷题型试题信息
-        List<Map> fileslist = ePaperFileMapper.listPaperFiles(epid);//附件集合
+        int hasfile = Integer.parseInt(map.get("hasfile").toString());
+        List<Map> fileslist = new ArrayList<>();
+        if(hasfile == 1){
+            fileslist = ePaperFileMapper.listPaperFiles(epid);//附件集合
+        }
+
         map.put("qtypes",fjtypelist);
         map.put("files",fileslist);
         return map;

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

@@ -0,0 +1,111 @@
+package com.xhkjedu.sexam.service.paper;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperFjtypeMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperScantronMapper;
+import com.xhkjedu.sexam.model.exam.ESubject;
+import com.xhkjedu.sexam.model.paper.*;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+
+@Service
+public class EPaperScantronService {
+    @Resource
+    private EPaperScantronMapper ePaperScantronMapper;
+    @Resource
+    private EPaperQtypeMapper ePaperQtypeMapper;
+    @Resource
+    private EPaperFjtypeMapper ePaperFjtypeMapper;
+    @Resource
+    private EPaperMapper ePaperMapper;
+    @Resource
+    private ESubjectMapper eSubjectMapper;
+
+    /**
+     * @Description 获取制作答题卡需要的试卷信息
+     * @Param [epid]
+     * @Return java.util.Map
+     * @Author wn
+     * @Date 2022/7/22 10:19
+     **/
+    public Map getPaperAndQuesitons(Integer epid){
+        Map eps = ePaperMapper.getExamPaperAndSubject(epid);//考试考试科目名称
+        List<Map> qtypes = new ArrayList<>();//题型试题
+        int ptype = Integer.parseInt(eps.get("ptype").toString());//试卷类型1题库2附件
+        if(ptype == 1){
+            qtypes = ePaperQtypeMapper.listPaperqtypeQuestionsForScan(epid);
+            //处理试卷中试题选项数量
+            for(Map qtm : qtypes){
+                List<Map> qlist = (List<Map>) qtm.get("questions");
+                for(Map qm : qlist){
+                    String qoption = qm.get("qoption").toString();
+                    Integer ctype = Integer.parseInt(qm.get("ctype").toString());
+                    if(ctype == 1 || ctype ==2 || ctype==4 || ctype ==5 || ctype==6 ){
+                        List<String> strlst = JSON.parseArray(qoption,String.class);
+                        qm.put("qoption","");
+                        qm.put("optionnum",strlst.size());
+                    }
+                }
+            }
+        }else{
+            qtypes = ePaperFjtypeMapper.listPaperfjtypeQuestionsForScan(epid);
+        }
+        Map rtnmap = new HashMap();
+        rtnmap.put("paper",eps);
+        rtnmap.put("qtypes",qtypes);
+        return rtnmap;
+    }
+
+    /**
+     * @Description 保存答题卡
+     * @Param [ePaper]
+     * @Return void
+     * @Author wn
+     * @Date 2022/7/22 14:16
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void savePaperScantron(EPaper ePaper) {
+        //获取考试科目信息
+        ESubject eSubject = eSubjectMapper.selectByPrimaryKey(ePaper.getEsid());
+        ePaper.setEsid(eSubject.getEsid());
+        List<EPaperScantron> sctypelist  = ePaper.getScanlist();//答题卡
+        int[] ctypes = new int[]{3,11,13,14,15};//ctype为指定值时会出现答题卡不在一个区域
+        int timestamp = N_Utils.getSecondTimestamp();
+        for(EPaperScantron ct : sctypelist){
+            ct.setCreateid(ePaper.getCreateid());
+            ct.setCreatetime(timestamp);
+            if(IntStream.of(ctypes).anyMatch(x -> x == ct.getCtype())){
+                List<List> savecoord = new ArrayList<>();
+                for(String str : ct.getCoordlist()){
+                    List<List> strlist = JSON.parseArray(str, List.class);
+                    for(List l : strlist){
+                        savecoord.add(l);
+                    }
+                }
+                ct.setCoord(JSON.toJSONString(savecoord));
+            }else{
+                ct.setCoord(ct.getCoordlist().get(0));
+            }
+        }
+        //先删除试题原有答题卡
+        ePaperScantronMapper.deleteScantronByEpid(ePaper.getId());
+        //批量保存答题卡信息
+        ePaperScantronMapper.insertList(sctypelist);
+        //完善试卷信息
+        ePaperMapper.updatePaperScantron(ePaper);
+    }
+
+
+
+}

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

@@ -1,24 +0,0 @@
-package com.xhkjedu.sexam.service.paper;
-
-import com.xhkjedu.sexam.mapper.paper.ESubjectScantronMapper;
-import com.xhkjedu.sexam.model.paper.ESubjectScantron;
-import com.xhkjedu.utils.N_Utils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class ESubjectScantronService {
-    @Resource
-    private ESubjectScantronMapper eSubjectScantronMapper;
-
-    //添加
-    @Transactional(rollbackFor = Exception.class)
-    public void saveSubjectScantron(ESubjectScantron model) {
-
-    }
-
-
-}

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

@@ -11,7 +11,7 @@
         <result column="epfjnum" property="epfjnum"></result>
         <result column="epfjorder" property="epfjorder"></result>
         <result column="epfjscore" property="epfjscore"></result>
-        <collection property="questions" ofType="java.util.Map">
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.Map">
             <result column="epfjqid" property="epfjqid"></result>
             <result column="epfjid" property="epfjid"></result>
             <result column="qtypeid" property="qtypeid"></result>
@@ -30,5 +30,29 @@
         from e_paper_fjtype t left join e_paper_fjtype_question q on t.epfjid=q.epfjid
         where t.epid=#{epid} order by t.epfjorder,q.order
     </select>
+
+    <resultMap id="fjtypeQuestionsForScan" type="java.util.Map">
+        <result column="esstname" property="esstname"></result>
+        <result column="ctype" property="ctype"></result>
+        <result column="esstnum" property="esstnum"></result>
+        <result column="esstorder" property="esstorder"></result>
+        <result column="esstscore" property="esstscore"></result>
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <result column="epfjqid" property="questionid"></result>
+            <result column="ctype" property="ctype"></result>
+            <result column="score" property="score"></result>
+            <result column="qn" property="qn"></result>
+            <result column="order" property="order"></result>
+            <result column="answer" property="answer"></result>
+            <result column="optionnum" property="optionnum"></result>
+        </collection>
+    </resultMap>
+    <!--制作答题卡时获取试卷中试题-->
+    <select id="listPaperfjtypeQuestionsForScan" resultMap="fjtypeQuestionsForScan">
+        select t.epfjname esstname,t.ctype ctype,t.epfjnum esstnum,t.epfjorder esstorder,t.epfjscore esstscore,
+               q.epfjqid questionid,q.ctype,q.score,q.qn,q.order,q.qn,q.answer,q.optionnum
+        from e_paper_fjtype t left join e_paper_fjtype_question q on t.epfjid=q.epfjid
+        where t.epid=#{epid} order by t.epfjorder,q.order
+    </select>
     
 </mapper>

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

@@ -29,7 +29,7 @@
     <!--试卷详情-->
     <select id="getExamPaperDetailByEpid" resultType="java.util.Map">
         select ep.epid,ep.examid,e.examname,e.gradeid,e.examtype,e.exammode,e.examstate,e.monitored,ep.ptype,ep.pnum,
-               ep.pscore,ep.answered,ep.hearfile,u2.username teachername,
+               ep.pscore,ep.answered,ep.hearfile,ep.hasfile,u2.username teachername,
         ep.handleid,ep.handletime,ep.subjectid,s.subjectname,u.username as handlename,es.sdate,es.begintime,es.endtime
         from e_paper ep left join e_base e on ep.examid=e.examid
         left join t_subject s on ep.subjectid=s.subjectid
@@ -39,6 +39,13 @@
         where ep.epid=#{epid}
     </select>
 
+    <!--获取试卷考试名科目名称-->
+    <select id="getExamPaperAndSubject" resultType="java.util.Map">
+        select ep.epid,ep.esid,ep.ptype,e.examname,s.subjectname,ep.scantronfile,ep.scantronnote,ep.scantronwh
+        from e_paper ep left join e_base e on ep.examid=e.examid
+        left join t_subject s on ep.subjectid=s.subjectid where ep.epid=#{epid}
+    </select>
+
     <!--删除试卷信息-->
     <select id="deletePaperByEpid">
         delete from e_paper where epid=#{epid}
@@ -57,4 +64,10 @@
     <update id="updateCorrectType">
         update e_paper set correcttype=#{correcttype} where epid=#{epid}
     </update>
+
+    <!--修改设置答题卡-->
+    <update id="updatePaperScantron">
+        update e_paper set scantronfile=#{paper.scantronfile},scantronnote=#{paper.scantronnote}
+        ,scantronwh=#{paper.scantronwh} where epid=#{paper.epid}
+    </update>
 </mapper>

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

@@ -58,6 +58,29 @@
         where qp.questionid=#{questionid} order by p.pointorder
     </select>
 
+    <resultMap id="qtypesQuestionsForScan" type="java.util.Map">
+        <result column="eptname" property="esstname"></result>
+        <result column="ctype" property="ctype"></result>
+        <result column="esstname" property="esstnum"></result>
+        <result column="esstorder" property="esstorder"></result>
+        <result column="esstscore" property="esstscore"></result>
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <result column="questionid" property="questionid"></result>
+            <result column="ctype" property="ctype"></result>
+            <result column="score" property="score"></result>
+            <result column="order" property="order"></result>
+            <result column="qoption" property="qoption"></result>
+        </collection>
+    </resultMap>
+    <!--制作答题卡时获取试卷中试题-->
+    <select id="listPaperqtypeQuestionsForScan" resultMap="qtypesQuestionsForScan">
+        select t.eptname esstname,t.ctype ctype,t.eptnum esstnum,t.eptorder esstorder,t.eptscore esstscore,
+        tq.eptqid questionid,tq.ctype,tq.score,tq.order,q.qoption
+        from e_paper_qtype t left join e_paper_qtype_question tq on t.eptid=tq.eptid
+        left join t_question q on tq.questionid=q.questionid
+        where t.epid=#{epid} order by t.eptorder,tq.order,q.sorder
+    </select>
+
 
     
 </mapper>

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

@@ -0,0 +1,11 @@
+<?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.sexam.mapper.paper.EPaperScantronMapper">
+
+    <!--删除答题卡-->
+    <delete id="deleteScantronByEpid">
+        delete from e_paper_scantron where epid=#{epid}
+    </delete>
+
+    
+</mapper>

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

@@ -1,33 +0,0 @@
-<?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.sexam.mapper.paper.ESubjectScantronMapper">
-
-    <resultMap id="cantronQtypes" type="java.util.Map">
-        <result property="esstid" column="esstid"></result>
-        <result property="esid" column="esid"></result>
-        <result property="epid" column="epid"></result>
-        <result property="esstname" column="esstname"></result>
-        <result property="esstorder" column="esstorder"></result>
-        <result property="esstnum" column="esstnum"></result>
-        <result property="esstscore" column="esstscore"></result>
-        <collection property="scans" ofType="java.util.Map" resultMap="java.util.List" >
-            <result property="essid" column="essid"></result>
-            <result property="esstid" column="esstid"></result>
-            <result property="ctype" column="ctype"></result>
-            <result property="questionid" column="questionid"></result>
-            <result property="qtypeid" column="qtypeid"></result>
-            <result property="qtypename" column="qtypename"></result>
-            <result property="answer" column="answer"></result>
-            <result property="coord" column="coord"></result>
-        </collection>
-    </resultMap>
-
-    <select id="listCantronQtypes" resultMap="cantronQtypes">
-        select st.esstid,st.esid,st.epid,st.esstname,st.esstorder,st.esstnum,st.esstscore,
-               s.essid,s.ctype,s.questionid,s.qtypeid,s.qtypename,s.answer,s.coord
-        from e_subject_scantron_qtype st left join e_subject_scantron s on st.esstid=s.esstid
-        where st.esid=#{esid}
-    </select>
-
-    
-</mapper>