完善附件、题库试卷

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

@@ -577,6 +577,21 @@ public class N_Utils {
         return count.doubleValue();
     }
 
+    //两个double 类型相加
+    public static Double getDoubleSum(Double value1,Double value2){
+        BigDecimal b1 = new BigDecimal(Double.toString(value1));
+        BigDecimal b2 = new BigDecimal(Double.toString(value2));
+
+        return b1.add(b2).doubleValue();
+    }
+    //两个double 类型相减
+    public static Double getDoubleReduce(Double value1,Double value2){
+        BigDecimal b1 = new BigDecimal(Double.toString(value1));
+        BigDecimal b2 = new BigDecimal(Double.toString(value2));
+
+        return b1.subtract(b2).doubleValue();
+    }
+
     //计算比例向下取整
     public static Integer floorDiv(Integer num,Integer totalNum) {
         if (isEmptyInteger(totalNum) || isEmptyInteger(num)) return 0;
@@ -1012,7 +1027,7 @@ public class N_Utils {
     /**
      * @Description 判断ctype是否是客观题
      * @Param [ctype]
-     * @Return boolean 如果是客观题返回true,否则返回主观题
+     * @Return boolean 如果是客观题返回true,否则返回false
      * @Author wn
      * @Date 2022/7/20 15:20
      **/

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

@@ -92,7 +92,7 @@ public class EPaperFjtypeController {
      * @Author wn
      * @Date 2022/7/19 15:02
      **/
-    @PostMapping("/sans")
+    @PostMapping("/answer")
     public ResultVo savePaperQuestionAnswer(@RequestBody EPaper paper){
         N_Utils.validation(new Object[]{paper.getEpid(),"试卷id",1});
         if(paper.getFjqueslist()==null || paper.getFjqueslist().size() ==0){

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

@@ -75,11 +75,4 @@ public class EPaperQtypeController {
         Map map = ePaperQtypeService.getPaperQtDetail(paper.getEpid());
         return new ResultVo(0,"成功获取试卷详情",map);
     }
-
-    @PostMapping("/savean")
-    public ResultVo saveAlype(@RequestBody EPaper paper){
-        N_Utils.validation(new Object[]{paper.getEpid(),"试卷id",1});
-        ePaperQtypeService.savePaperAnalyze(paper);
-        return new ResultVo(0,"成功保存试卷分析");
-    }
 }

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

@@ -23,33 +23,9 @@ public class ESubjectScantronController {
 
     @PostMapping("/add")
     public ResultVo add(@RequestBody ESubjectScantron eSubjectScantron) {
-        eSubjectScantronService.save(eSubjectScantron);
+        eSubjectScantronService.saveSubjectScantron(eSubjectScantron);
         return new ResultVo(0,"保存成功");
     }
 
-    @PostMapping("/delete")
-    public ResultVo delete(@RequestBody ESubjectScantron eSubjectScantron) {
-        eSubjectScantronService.deleteById(eSubjectScantron.getId());
-        return new ResultVo(0,"删除成功");
-    }
-
-    @PostMapping("/update")
-    public ResultVo update(@RequestBody ESubjectScantron eSubjectScantron) {
-        eSubjectScantronService.update(eSubjectScantron);
-        return new ResultVo(0,"修改成功");
-    }
 
-    @PostMapping("/detail")
-    public ResultVo detail(@RequestBody ESubjectScantron eSubjectScantron) {
-        ESubjectScantron es = eSubjectScantronService.findById(eSubjectScantron.getId());
-        return new ResultVo(0,"获取详情成功",es);
-    }
-
-    @PostMapping("/list")
-    public ResultVo list(@RequestBody ESubjectScantron eSubjectScantron) {
-        PageHelper.startPage(eSubjectScantron.getPage(), eSubjectScantron.getPageSize());
-        List<ESubjectScantron> list = eSubjectScantronService.listAll();
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"获取列表成功",pageResult);
-    }
 }

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

@@ -2,6 +2,10 @@ package com.xhkjedu.sexam.mapper.paper;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paper.EPaperFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 附件试卷文件
@@ -9,4 +13,6 @@ import com.xhkjedu.sexam.model.paper.EPaperFile;
  * Date 2022/7/18 14:10
  **/
 public interface EPaperFileMapper extends TkMapper<EPaperFile> {
+
+    List<Map> listPaperFiles(@Param("epid") Integer epid);
 }

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

@@ -2,6 +2,13 @@ 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/system/UserBasketMapper.java

@@ -0,0 +1,14 @@
+package com.xhkjedu.sexam.mapper.system;
+
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description
+ * @Author WN
+ * Date 2022/7/21 17:48
+ **/
+public interface UserBasketMapper {
+
+    //试清空试题栏
+    void deleteByUseridAndSubjectid(@Param("userid")Integer userid,@Param("subjectid")String subjectid);
+}

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

@@ -18,6 +18,9 @@ public class EPaperFjtype extends BaseBean {
     //试卷id
     private Integer epid;
 
+    //处理题型
+    private Integer ctype;
+
     //题型名称
     private String epfjname;
 

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

@@ -19,6 +19,9 @@ public class EPaperQtype extends BaseBean {
     //试卷id
     private Integer epid;
 
+    //处理题型
+    private Integer ctype;
+
     //题型名称
     private String eptname;
 

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

@@ -13,8 +13,8 @@ public class ESubjectScantron extends BaseBean {
     //试卷科目答题卡表
     private Integer essid;
 
-    //考试id
-    private Integer examid;
+    //考试科目id
+    private Integer esid;
 
     //考试试卷id
     private Integer epid;
@@ -22,23 +22,17 @@ public class ESubjectScantron extends BaseBean {
     //答题卡题型表id
     private Integer esstid;
 
-    //试卷类型1题库2答题卡3仅答题卡
-    private Integer ptype;
-
     //试题处理题型
     private Integer ctype;
 
     //试题id
     private String questionid;
 
-    //题型id
-    private String qtypeid;
-
-    //题型名称
-    private String qtypename;
-
     //题号
-    private String order;
+    private String qn;
+
+    //试题排序
+    private Integer order;
 
     //分值
     private Double score;

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

@@ -15,12 +15,15 @@ public class ESubjectScantronQtype extends BaseBean {
     //试卷科目答题卡题型表
     private Integer esstid;
 
-    //考试id
-    private Integer examid;
+    //考试科目id
+    private Integer esid;
 
     //考试试卷表
     private Integer epid;
 
+    //处理题型
+    private Integer ctype;
+
     //题型名称
     private String esstname;
 

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

@@ -6,15 +6,13 @@ import com.xhkjedu.sexam.mapper.paper.*;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.*;
 import com.xhkjedu.sexam.vo.paper.EPaperQsVo;
+import com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo;
 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.*;
 import java.util.stream.Collectors;
 
 /**
@@ -132,7 +130,7 @@ public class EPaperFjtypeService {
         int knum = 0;
         double kscore = 0;
         for(EPaperFjtypeQuestion q : queslist){
-            if(q.getCtype() == 3 || q.getCtype() == 11){
+            if(N_Utils.isObjectiveQuestion(q.getCtype())){
                 znum ++;
                 zscore = zscore + q.getScore();
             }else{
@@ -155,15 +153,20 @@ public class EPaperFjtypeService {
         ztmap.put("pscore",ePaper.getPscore());
         ztmap.put("ranglist",ranglist);
 
-        //题型分布(保存大题型及分组)
+        //题型分布(按照名称进行分组)
+        fjtypelist.stream().sorted(Comparator.comparing(EPaperFjtype::getEpfjorder)).collect(Collectors.toList());
+        Map<String,List<EPaperFjtype>> qtypemap =  fjtypelist.stream().collect(Collectors.groupingBy(EPaperFjtype:: getEpfjname, Collectors.toList()));
         List<EPaperQsVo> qtlist = new ArrayList<>();
-        for(EPaperFjtype fjt : fjtypelist){
+        for(Map.Entry<String, List<EPaperFjtype>> entry : qtypemap.entrySet()){
+            List<EPaperFjtype> aq = entry.getValue();
+            int num = aq.stream().mapToInt(EPaperFjtype::getEpfjnum).sum();
+            double tscore = aq.stream().collect(Collectors.summingDouble(EPaperFjtype:: getEpfjscore));
+            double storerate = N_Utils.getDoubleDivideAndMulitiply(tscore, ePaper.getPscore());
             EPaperQsVo qvo = new EPaperQsVo();
-            qvo.setQtname(fjt.getEpfjname());
-            qvo.setNum(fjt.getEpfjnum());
-            qvo.setScore(fjt.getEpfjscore());
-            double scorerate = N_Utils.getDoubleDivideAndMulitiply(fjt.getEpfjscore(), ePaper.getPscore());
-            qvo.setSrate(scorerate);
+            qvo.setQtname(entry.getKey());
+            qvo.setNum(num);
+            qvo.setScore(tscore);
+            qvo.setSrate(storerate);
             qtlist.add(qvo);
         }
 
@@ -211,7 +214,9 @@ 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);//附件集合
         map.put("qtypes",fjtypelist);
+        map.put("files",fileslist);
         return map;
     }
 

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

@@ -6,6 +6,7 @@ import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper;
+import com.xhkjedu.sexam.mapper.system.UserBasketMapper;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.*;
 import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
@@ -38,6 +39,9 @@ public class EPaperQtypeService {
     @Resource
     private ESubjectMapper eSubjectMapper;
 
+    @Resource
+    private UserBasketMapper userBasketMapper;
+
 
     /**
      * @Description 保存题库试卷
@@ -67,6 +71,8 @@ public class EPaperQtypeService {
             eSubject.setEsstate(1);
             eSubjectMapper.updateExamSubjectState(eSubject);
         }
+        //保存后清除试题栏中试题
+        userBasketMapper.deleteByUseridAndSubjectid(paper.getCreateid(),eSubject.getSubjectid());
     }
 
     //设置试卷基本信息
@@ -112,97 +118,109 @@ public class EPaperQtypeService {
     }
 
     //保存试卷分析List<EPaperQtype> qtypelist,List<EPaperQtypeQuestion> queslist
-    public void savePaperAnalyze(EPaper ePaper){
+    private void savePaperAnalyze(EPaper ePaper){
         //保存之前先清除之前的试卷分析
         ePaperAnalyzeMapper.deleteByEpid(ePaper.getEpid());
         //总体分析（主观题、客观题）
         List<EPaperQtypeVo> qtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(ePaper.getEpid());//试卷题型试题信息
-        List<EPaperQtypeQuestionVo> queslist = new ArrayList<>();//试卷中所有试题
-        List<EPaperQPointVo> quespoints = new ArrayList<>();//试卷中所有试题包含子题已经题号和对应知识点
+        List<EPaperQtypeQuestionVo> queslist = new ArrayList<>();//试卷中所有试题(子题)
+        List<EPaperQPointVo> quespoints = new ArrayList<>();//试卷中所有单题和子题以及对应知识点
 
         //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11综合题12听力
+        List<EPaperQsVo> typelist = new ArrayList<>();//题型分析
         //处理出试卷中所有试题、知识点
         for(EPaperQtypeVo qt : qtypelist){
             for(EPaperQtypeQuestionVo q : qt.getQuestions()){
-                queslist.add(q);
-                if(q.getQlevel() == 0 && q.getHasson() == 1){
-                    //说明试题有子题
-                    /*for(EPaperQtypeQuestionVo sq : q.getSonquestions()){
-                        List<EPaperQPointVo> pointslist = sq.getPoints();
-                        if(pointslist != null && pointslist.size()>0){
-                            for(EPaperQPointVo point : pointslist){
-                                EPaperQPointVo p = new EPaperQPointVo();
-                                p.setPointid(point.getPointid());
-                                p.setPointname(point.getPointname());
-                                p.setQuestionid(sq.getQuestionid());
-                                p.setOrder(q.getOrder());
-                                p.setScore(sq.getScore());
-                                quespoints.add(p);
-                            }
-                        }
-                    }*/
-                }else{
-                    List<EPaperQPointVo> pointslist = q.getPoints();
-                    if(pointslist != null && pointslist.size()>0){
-                        for(EPaperQPointVo point : pointslist){
-                            EPaperQPointVo p = new EPaperQPointVo();
-                            p.setPointid(point.getPointid());
-                            p.setPointname(point.getPointname());
-                            p.setQuestionid(q.getQuestionid());
-                            p.setOrder(q.getOrder());
-                            p.setScore(q.getScore());
-                            quespoints.add(p);
-                        }
+                //处理试题关联知识点
+                List<EPaperQPointVo> pointslist = q.getPoints();
+                if(pointslist != null && pointslist.size()>0){
+                    for(EPaperQPointVo point : pointslist){
+                        EPaperQPointVo p = new EPaperQPointVo();
+                        p.setPointid(point.getPointid());
+                        p.setPointname(point.getPointname());
+                        p.setQuestionid(q.getQuestionid());
+                        p.setOrder(q.getOrder());
+                        p.setScore(q.getScore());
+                        quespoints.add(p);
                     }
                 }
+                if(q.getQlevel()==1){
+                    q.setQuestionpid("000");
+                }
+                queslist.add(q);
             }
+
+            double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
+            EPaperQsVo tvo = new EPaperQsVo();
+            tvo.setQtname(qt.getEptname());
+            tvo.setNum(qt.getEptnum());
+            tvo.setScore(qt.getEptscore());
+            tvo.setSrate(storerate);
+            typelist.add(tvo);
         }
 
-        //总体分布
-        int znum = 0;
-        double zscore = 0;
-        int knum = 0;
-        double kscore = 0;
-        for(EPaperQtypeQuestionVo q : queslist){
-            if(!N_Utils.isObjectiveQuestion(q.getCtype())){
-                znum ++;
-                zscore = zscore + q.getScore();
+        //获取出所有单题和母题,进行判断区分
+        Map<String,List<EPaperQtypeQuestionVo>> quesMap = queslist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getQuestionpid, Collectors.toList()));
+        List<EPaperQtypeQuestionVo> mquestions = new ArrayList<>();//仅存放单题和母题
+        for(Map.Entry<String, List<EPaperQtypeQuestionVo>> entry : quesMap.entrySet()){
+            if(entry.getKey().equals("000")){
+                for(EPaperQtypeQuestionVo dq : entry.getValue()){
+                    if(N_Utils.isObjectiveQuestion(dq.getCtype())){
+                        //判断试题是否是客观题,暂时用mctype进行标识
+                        dq.setMctype(111);
+                    }else{
+                        dq.setMctype(112);
+                    }
+                    mquestions.add(dq);
+                }
             }else{
-                knum ++;
-                kscore = kscore + q.getScore();
+                EPaperQtypeQuestionVo mq = new EPaperQtypeQuestionVo();
+                List<EPaperQtypeQuestionVo> sonques = entry.getValue();
+                int k = 0;//如果k大于1说明有小题是主观题，则母题为主观题
+                double score = 0;
+                for(EPaperQtypeQuestionVo sq : sonques){
+                    if(!N_Utils.isObjectiveQuestion(sq.getCtype())){
+                        k++;
+                    }
+                    score = N_Utils.getDoubleSum(score,sq.getScore());
+                }
+
+                EPaperQtypeQuestionVo qobj = sonques.get(0);
+                mq.setQuestionid(qobj.getQuestionpid());
+                mq.setComplexity(qobj.getMcomplexity());
+                mq.setScore(score);
+                if(k == 0){
+                    mq.setMctype(111);
+                }else{
+                    mq.setMctype(112);
+                }
+                mquestions.add(mq);
             }
         }
-        double znumrate = N_Utils.getIntegerDivideAndMulitiply(znum, ePaper.getPnum());
-        double knumrate = 100-znumrate;
-        double zscorerate = N_Utils.getDoubleDivideAndMulitiply(zscore, ePaper.getPscore());
-        double kscorerate = 100 - zscorerate;
 
+        //试题总体分布进行分析
+        //客观题集合
+        List<EPaperQtypeQuestionVo> ktlst = mquestions.stream().filter(q->q.getMctype() == 111).collect(Collectors.toList());
+        int ktnum = ktlst.size();
+        double ktscore = ktlst.stream().collect(Collectors.summingDouble(EPaperQtypeQuestionVo:: getScore));
+        double ktnrate = N_Utils.getIntegerDivideAndMulitiply(ktnum, ePaper.getPnum());
+        double ktsrate = N_Utils.getDoubleDivideAndMulitiply(ktscore, ePaper.getPscore());
         List<EPaperQsVo> ranglist = new ArrayList<>();
-        ranglist.add(new EPaperQsVo("主观题",zscore,znum,zscorerate,znumrate));
-        ranglist.add(new EPaperQsVo("客观题",kscore,knum,kscorerate,knumrate));
-
+        ranglist.add(new EPaperQsVo("客观题",ktscore,ktnum,ktsrate,ktnrate));
+        EPaperQsVo zgq = new EPaperQsVo();
+        zgq.setQtname("主观题");
+        zgq.setNum(ePaper.getPnum() - ktnum);
+        zgq.setNrate(N_Utils.getDoubleReduce(100.0,ktnrate));
+        zgq.setScore(N_Utils.getDoubleReduce(ePaper.getPscore(),ktscore));
+        zgq.setSrate(N_Utils.getDoubleReduce(100.0,ktsrate));
+        ranglist.add(zgq);
         Map ztmap = new HashMap<>();
         ztmap.put("pnum", ePaper.getPnum());
         ztmap.put("pscore",ePaper.getPscore());
         ztmap.put("ranglist",ranglist);
 
-        //题型分布
-        queslist.stream().sorted(Comparator.comparing(EPaperQtypeQuestionVo::getOrder)).collect(Collectors.toList());
-        Map<String,List<EPaperQtypeQuestionVo>> qtypemap =  queslist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getQtypeid, Collectors.toList()));
-        List<EPaperQsVo> typelist = new ArrayList<>();
-        for(Map.Entry<String, List<EPaperQtypeQuestionVo>> entry : qtypemap.entrySet()){
-            List<EPaperQtypeQuestionVo> aq = entry.getValue();
-            double tscore = aq.stream().collect(Collectors.summingDouble(EPaperQtypeQuestionVo:: getScore));
-            double storerate = N_Utils.getDoubleDivideAndMulitiply(tscore, ePaper.getPscore());
-            EPaperQsVo tvo = new EPaperQsVo();
-            tvo.setQtname(aq.get(0).getQtypename());
-            tvo.setNum(aq.size());
-            tvo.setScore(tscore);
-            tvo.setSrate(storerate);
-            typelist.add(tvo);
-        }
         //难易度
-        Map<Integer,List<EPaperQtypeQuestionVo>> complxmap =  queslist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getComplexity, Collectors.toList()));
+        Map<Integer,List<EPaperQtypeQuestionVo>> complxmap =  mquestions.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getComplexity, Collectors.toList()));
         List<Map> clist = new ArrayList<>();
         for(Map.Entry<Integer, List<EPaperQtypeQuestionVo>> entry : complxmap.entrySet()){
             Map cmap = new HashMap();
@@ -227,7 +245,7 @@ public class EPaperQtypeService {
             pm.put("pointname",pvo.get(0).getPointname());
             pm.put("score",cscore);
             pm.put("srate",scorerate);
-            pm.put("order",thlist);
+            pm.put("order",thlist.stream().distinct().collect(Collectors.toList()));
             pointlist.add(pm);
         }
 

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

@@ -4,6 +4,7 @@ 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;
@@ -14,28 +15,10 @@ public class ESubjectScantronService {
     private ESubjectScantronMapper eSubjectScantronMapper;
 
     //添加
-    public void save(ESubjectScantron model) {
-        model.setCreatetime(N_Utils.getSecondTimestamp());
-        eSubjectScantronMapper.insertSelective(model);
-    }
+    @Transactional(rollbackFor = Exception.class)
+    public void saveSubjectScantron(ESubjectScantron model) {
 
-    //删除
-    public Integer deleteById(Integer id) {
-        return eSubjectScantronMapper.deleteByPrimaryKey(id);
     }
 
-    //修改
-    public Integer update(ESubjectScantron model) {
-        return eSubjectScantronMapper.updateByPrimaryKeySelective(model);
-    }
 
-    //获取详情
-    public ESubjectScantron findById(Integer id) {
-        return eSubjectScantronMapper.selectByPrimaryKey(id);
-    }
-
-    //获取列表
-    public List <ESubjectScantron> listAll() {
-        return eSubjectScantronMapper.selectAll();
-    }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQtypeQuestionVo.java

@@ -51,18 +51,34 @@ public class EPaperQtypeQuestionVo {
     //难易度
     private Integer complexity;
 
-    //试题类型0母题1子题
+    //试题类型1单体2母题3子题
     private Integer qlevel;
 
-    //是否包含子题0不包含1包含
-    private Integer hasson;
+    //子题排序
+    private Integer sorder;
 
     //母题id
     private String questionpid;
 
+    //子题数量
+    private Integer snum;
+
+    //母题难易度
+    private Integer  mcomplexity;
+
+    //母题题干
+    private String  mqstem;
+
+    //母题题型id
+    private String mqtypeid;
+
+    //母题名称
+    private String mqtypename;
+
+    //母题处理题型
+    private Integer mctype;
+
     //试题关联知识点
     private List<EPaperQPointVo> points = new ArrayList<>();
 
-    //子试题集合
-    private List<EPaperQtypeQuestionVo> sonquestions = new ArrayList<>();
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQtypeVo.java

@@ -15,6 +15,9 @@ public class EPaperQtypeVo {
     //考试试卷题型表
     private Integer eptid;
 
+    //处理题型
+    private Integer ctype;
+
     //题型名称
     private String eptname;
 

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

@@ -2,5 +2,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.EPaperFileMapper">
 
-
+    <!--获取文件附件-->
+    <select id="listPaperFiles" resultType="java.util.Map">
+        select * from e_paper_file where epid=#{epid}
+    </select>
 </mapper>

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

@@ -6,6 +6,7 @@
     <resultMap id="fjtypeQuestions" type="java.util.Map">
         <result column="epfjid" property="epfjid"></result>
         <result column="epid" property="epid"></result>
+        <result column="ctype" property="ctype"></result>
         <result column="epfjname" property="epfjname"></result>
         <result column="epfjnum" property="epfjnum"></result>
         <result column="epfjorder" property="epfjorder"></result>
@@ -24,7 +25,7 @@
         </collection>
     </resultMap>
     <select id="listPaperFjtypeQuestions" resultMap="fjtypeQuestions">
-        select t.epfjid,t.epid,t.epfjname,t.epfjnum,t.epfjorder,t.epfjscore,
+        select t.epfjid,t.epid,t.ctype,t.epfjname,t.epfjnum,t.epfjorder,t.epfjscore,
                q.epfjqid,q.epfjid,q.epid,q.qtypeid,q.qtypename,q.ctype,q.score,q.qn,q.order,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

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

@@ -5,6 +5,7 @@
     <!--试卷题型试题信息-->
     <resultMap id="qtypesQuestion" type="com.xhkjedu.sexam.vo.paper.EPaperQtypeVo">
         <result column="eptid" property="eptid"></result>
+        <result column="ctype" property="ctype"></result>
         <result column="eptname" property="eptname"></result>
         <result column="eptnum" property="eptnum"></result>
         <result column="eptorder" property="eptorder"></result>
@@ -24,47 +25,31 @@
             <result column="qanalyze" property="qanalyze"></result>
             <result column="complexity" property="complexity"></result>
             <result column="qlevel" property="qlevel"></result>
-            <result column="hasson" property="hasson"></result>
+            <result column="sorder" property="sorder"></result>
+            <result column="snum" property="snum"></result>
+            <result column="questionpid" property="questionpid"></result>
+            <result column="mqstem" property="mqstem"></result>
+            <result column="mcomplexity" property="mcomplexity"></result>
+            <result column="mqtypeid" property="mqtypeid"></result>
+            <result column="mqtypename" property="mqtypename"></result>
+            <result column="mctype" property="mctype"></result>
             <collection property="points" ofType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo" javaType="java.util.List"
                         column="questionid" select="listQuestionPoints">
                 <result column="pointid" property="pointid"></result>
                 <result column="pointname" property="pointname"></result>
             </collection>
-            <collection property="sonquestions" ofType="com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo" javaType="java.util.List"
-                        column="questionid" select="listSonQuestions" >
-            </collection>
-        </collection>
-    </resultMap>
-    <!--子题信息和关联知识点（题型-母题-子题-子题知识点 不能放在一个resultMap中处理不支持三层）-->
-    <resultMap id="qtypeSonQuestions" type="com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo">
-        <result column="questionid" property="questionid"></result>
-        <result column="score" property="score"></result>
-        <result column="order" property="order"></result>
-        <result column="qtypeid" property="qtypeid"></result>
-        <result column="qtypename" property="qtypename"></result>
-        <result column="ctype" property="ctype"></result>
-        <result column="qstem" property="qstem"></result>
-        <result column="qoption" property="qoption"></result>
-        <result column="qanswer" property="qanswer"></result>
-        <result column="qanalyze" property="qanalyze"></result>
-        <result column="complexity" property="complexity"></result>
-        <result column="qlevel" property="qlevel"></result>
-        <result column="hasson" property="hasson"></result>
-        <result column="questionpid" property="questionpid"></result>
-        <collection property="points" ofType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo" javaType="java.util.List"
-                    column="questionid" select="listQuestionPoints">
-            <result column="pointid" property="pointid"></result>
-            <result column="pointname" property="pointname"></result>
         </collection>
     </resultMap>
     <!--试题详情-->
     <select id="listPaperQtypeQuestions" resultMap="qtypesQuestion">
-        select t.eptid,t.epid,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.questionid,
+        select t.eptid,t.epid,t.ctype,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.questionid,
                tq.score,tq.order,q.qtypeid,q.qtypename,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
-               q.complexity,q.qlevel,q.hasson
+               q.complexity,q.qlevel,q.sorder,q.questionpid,fq.snum,fq.qstem as mqstem,fq.complexity as mcomplexity,
+               fq.qtypeid mqtypeid,fq.qtypename mqtypename,fq.ctype mctype
         from e_paper_qtype_question tq left join e_paper_qtype t 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
+        left join t_question q on tq.questionid=q.questionid
+        left JOIN t_question fq on q.questionpid=fq.questionid
+        where t.epid=#{epid} order by t.eptorder,tq.order,q.sorder
     </select>
     <!--试题关联知识点-->
     <select id="listQuestionPoints" resultType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo">
@@ -72,11 +57,7 @@
         left join t_point p on qp.pointid=p.pointid
         where qp.questionid=#{questionid} order by p.pointorder
     </select>
-    <!--子题-->
-    <select id="listSonQuestions"  resultMap="qtypeSonQuestions">
-        select q.questionid,q.qtypeid,q.qtypename,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
-               q.complexity,q.qlevel,q.hasson,q.sorder,q.questionpid from t_question q
-        where q.questionpid=#{questionid} order by q.sorder
-    </select>
+
+
     
 </mapper>

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

@@ -0,0 +1,33 @@
+<?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>

sexam/src/main/resources/mapper/system/UserBasketMapper.xml

@@ -0,0 +1,7 @@
+<?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.system.UserBasketMapper">
+    <delete id="deleteByUseridAndSubjectid">
+        delete from t_user_basket where userid=#{userid} and subjectid=#{subjectid}
+    </delete>
+</mapper>

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -15,15 +15,6 @@ class SexamApplicationTests {
 
     @Test
     void contextLoads() {
-        EPaper epaper = new EPaper();
-        epaper.setEpid(5);
-        epaper.setPnum(4);
-        epaper.setPscore(50.0);
-        saveA(epaper);
-    }
-
-    private void saveA(EPaper epaper){
-        ePaperQtypeService.savePaperAnalyze(epaper);
     }
 
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestion.java

@@ -50,11 +50,11 @@ public class TQuestion extends BaseBean {
     //资源归属1平台1区平台3学校4个人(搜索时5我的收藏 6我的上传)
     private Integer belong;
 
-    //试题类型0母题1子题
+    //试题类型1单体2母题3子题
     private Integer qlevel;
 
-    //是否包含子题0不包含1包含
-    private Integer hasson;
+    //子题数量
+    private Integer snum;
 
     //子题排序
     private Integer sorder;

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionService.java

@@ -359,17 +359,16 @@ public class QuestionService {
         String questionid = StudyUtil.getId();
         question.setQuestionid(questionid);
         saveQues.add(question);
-        if(question.getQlevel() == 0 && question.getHasson() ==1){//是母体并且包含子题
+        //qlevel试题类型1单体2母题3子题
+        if(question.getQlevel() == 2){//是母体并且包含子题
             List<TQuestion> sonques = question.getQuestions();
             for(TQuestion sq : sonques){
                 String sqid = StudyUtil.getId();
-                sq.setQuestionpid(sqid);
+                sq.setQuestionid(sqid);
                 sq.setCount(0);
                 sq.setQstate(1);
-                sq.setQlevel(1);
-                sq.setHasson(0);
                 sq.setBelong(4);
-                sq.setQuestionid(questionid);
+                sq.setQuestionpid(questionid);
                 sq.setSubjectid(question.getSubjectid());
                 sq.setCreateid(question.getCreateid());
                 sq.setCreatetime(timestamp);

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionVo.java

@@ -51,6 +51,12 @@ public class QuestionVo {
     //试题关联章节
     private List<DirectorVo> directors;
 
+    //试题类型1单体2母题3子题
+    private Integer qlevel;
+
+    //子题数量
+    private Integer snum;
+
     //组题次数
     private Integer count;
 

sstudy/src/main/resources/mapper/paperstudent/PaperStudentMapper.xml

@@ -218,7 +218,7 @@
         <if test="ps.stoptime!=null and ps.stoptime!=0">
             and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))&lt;=#{ps.stoptime}
         </if>
-        GROUP BY ps.psid ORDER BY pg.starttime DESC,p.createtime DESC,p.psid desc
+        GROUP BY ps.psid ORDER BY pg.starttime DESC,p.createtime DESC,ps.psid desc
     </select>
     <!--提交作业-->
     <update id="submitPaper">