题库分析

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

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * @author WN
@@ -1006,4 +1007,21 @@ public class N_Utils {
         return md5.getMD5ofStr(md5.getMD5ofStr(md5.getMD5ofStr(pwd)));
     }
 
+    //处理题型中客观题
+    private static int[] octypelist = new int[]{1,2,4,5,6,7,8};
+    /**
+     * @Description 判断ctype是否是客观题
+     * @Param [ctype]
+     * @Return boolean 如果是客观题返回true,否则返回主观题
+     * @Author wn
+     * @Date 2022/7/20 15:20
+     **/
+    public static boolean isObjectiveQuestion(Integer ctype){
+        if(ctype != null && ctype != 0){
+            return IntStream.of(octypelist).anyMatch(x -> x == ctype);
+        }else{
+            return false;
+        }
+    }
+
 }

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

@@ -75,4 +75,11 @@ 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/mapper/paper/EPaperQtypeMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sexam.mapper.paper;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paper.EPaperQtype;
+import com.xhkjedu.sexam.vo.paper.EPaperQtypeVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,5 +16,5 @@ import java.util.Map;
 public interface EPaperQtypeMapper extends TkMapper<EPaperQtype> {
 
     //题型试题详情
-    List<Map> listPaperQtypeQuestions(@Param("epid") Integer epid);
+    List<EPaperQtypeVo> listPaperQtypeQuestions(@Param("epid") Integer epid);
 }

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

@@ -1,7 +1,7 @@
 package com.xhkjedu.sexam.model.paper;
 
 import com.xhkjedu.sexam.model.BaseBean;
-import com.xhkjedu.sexam.vo.paper.QPointVo;
+import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
 import lombok.Data;
 
 import javax.persistence.Id;
@@ -50,6 +50,6 @@ public class EPaperQtypeQuestion extends BaseBean {
 
     //试题关联知识点
     @Transient
-    private List<QPointVo> points = new ArrayList<>();
+    private List<EPaperQPointVo> points = new ArrayList<>();
 
 }

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

@@ -25,6 +25,9 @@ public class ESubjectScantron extends BaseBean {
     //试卷类型1题库2答题卡3仅答题卡
     private Integer ptype;
 
+    //试题处理题型
+    private Integer ctype;
+
     //试题id
     private String questionid;
 

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

@@ -5,6 +5,8 @@ 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
@@ -36,4 +38,7 @@ public class ESubjectScantronQtype extends BaseBean {
 
     //创建时间
     private Integer createtime;
+
+    @Transient
+    private List<ESubjectScantron> questions;//试题
 }

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

@@ -99,20 +99,15 @@ public class EPaperFjtypeService {
 
     //保存题型--题型下试题
     private void saveFjtypeQuestion(EPaper paper,List<EPaperFjtype> fjtypelist){
-        int qorder = 1;//答题卡试题排序
-        int qtorder = 1;//答题卡题型排序
-
         List<EPaperFjtypeQuestion> saveques = new ArrayList<>();
         for(EPaperFjtype fjt : fjtypelist){
             List<EPaperFjtypeQuestion> quelist = fjt.getQuestions();//题型下试题
             fjt.setEpfjid(paper.getEpid());
             fjt.setCreateid(paper.getHandleid());
             fjt.setCreatetime(paper.getHandletime());
-            fjt.setEpfjorder(qtorder);
             fjt.setEpfjnum(quelist.size());
             double tscore = quelist.stream().collect(Collectors.summingDouble(EPaperFjtypeQuestion :: getScore));
             fjt.setEpfjscore(tscore);
-             qtorder ++;
         }
         //批量保存题型信息
         ePaperFjtypeMapper.insertList(fjtypelist);
@@ -120,8 +115,6 @@ public class EPaperFjtypeService {
             for(EPaperFjtypeQuestion q : fjt.getQuestions()){
                 q.setEpfjid(fjt.getId());
                 q.setEpid(paper.getEpid());
-                q.setOrder(qorder);
-                qorder ++;
                 saveques.add(q);
             }
         }
@@ -162,7 +155,7 @@ public class EPaperFjtypeService {
         ztmap.put("pscore",ePaper.getPscore());
         ztmap.put("ranglist",ranglist);
 
-        //题型分布
+        //题型分布(保存大题型及分组)
         List<EPaperQsVo> qtlist = new ArrayList<>();
         for(EPaperFjtype fjt : fjtypelist){
             EPaperQsVo qvo = new EPaperQsVo();

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

@@ -8,16 +8,16 @@ import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.*;
+import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
 import com.xhkjedu.sexam.vo.paper.EPaperQsVo;
+import com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo;
+import com.xhkjedu.sexam.vo.paper.EPaperQtypeVo;
 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;
 
 /**
@@ -60,7 +60,7 @@ public class EPaperQtypeService {
         //保存题型试题信息
         savePaperQtype(paper,qtypelist);
         //保存作业分析
-        savePaperAnalyze(paper,qtypelist,queslist);
+        savePaperAnalyze(paper);
         //更加试卷状态是否需要生成分析和更改科目状态
         if(paper.getPstate()!=null && paper.getPstate() == 1){
             //如果提交试卷，更改科目状态
@@ -90,45 +90,81 @@ public class EPaperQtypeService {
 
     //保存试卷题型试题信息
     private void savePaperQtype(EPaper epaper,List<EPaperQtype> qtypelist){
-        int ptorder = 1;//题型排序
-        int qorder = 1;//试题排序
         List<EPaperQtypeQuestion> qtqs = new ArrayList<>();
         for(EPaperQtype qtype : qtypelist){
             List<EPaperQtypeQuestion> qlst = qtype.getQuestions();
             qtype.setEpid(epaper.getEpid());
-            qtype.setEptorder(ptorder);
             qtype.setCreateid(epaper.getHandleid());
             qtype.setCreatetime(epaper.getHandletime());
             qtype.setEptnum(qlst.size());
             Double ptscore = qlst.stream().collect(Collectors.summingDouble(EPaperQtypeQuestion::getScore));
             qtype.setEptscore(ptscore);
-            ptorder++;
         }
         ePaperQtypeMapper.insertList(qtypelist);//保存题型
         for(EPaperQtype qtype : qtypelist){
             for(EPaperQtypeQuestion q : qtype.getQuestions()){
                 q.setEpid(epaper.getEpid());
                 q.setEptid(qtype.getId());
-                q.setOrder(qorder);
-                qorder++;
                 qtqs.add(q);
             }
         }
         ePaperQtypeQuestionMapper.insertList(qtqs);
     }
 
-    //保存试卷分析
-    private void savePaperAnalyze(EPaper ePaper,List<EPaperQtype> qtypelist,List<EPaperQtypeQuestion> queslist){
+    //保存试卷分析List<EPaperQtype> qtypelist,List<EPaperQtypeQuestion> queslist
+    public 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<>();//试卷中所有试题包含子题已经题号和对应知识点
+
         //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11综合题12听力
+        //处理出试卷中所有试题、知识点
+        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);
+                        }
+                    }
+                }
+            }
+        }
+
+        //总体分布
         int znum = 0;
         double zscore = 0;
         int knum = 0;
         double kscore = 0;
-        for(EPaperQtypeQuestion q : queslist){
-            if(q.getCtype() == 3 || q.getCtype() == 11){
+        for(EPaperQtypeQuestionVo q : queslist){
+            if(!N_Utils.isObjectiveQuestion(q.getCtype())){
                 znum ++;
                 zscore = zscore + q.getScore();
             }else{
@@ -136,7 +172,6 @@ public class EPaperQtypeService {
                 kscore = kscore + q.getScore();
             }
         }
-
         double znumrate = N_Utils.getIntegerDivideAndMulitiply(znum, ePaper.getPnum());
         double knumrate = 100-znumrate;
         double zscorerate = N_Utils.getDoubleDivideAndMulitiply(zscore, ePaper.getPscore());
@@ -152,35 +187,56 @@ public class EPaperQtypeService {
         ztmap.put("ranglist",ranglist);
 
         //题型分布
-        List<EPaperQsVo> qtlist = new ArrayList<>();
-        for(EPaperQtype qt : qtypelist){
-            EPaperQsVo qvo = new EPaperQsVo();
-            qvo.setQtname(qt.getEptname());
-            qvo.setNum(qt.getEptnum());
-            qvo.setScore(qt.getEptscore());
-            double scorerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
-            qvo.setSrate(scorerate);
-            qtlist.add(qvo);
+        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<EPaperQtypeQuestion>> complxmap =  queslist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestion :: getComplexity,Collectors.toList()));
+        Map<Integer,List<EPaperQtypeQuestionVo>> complxmap =  queslist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getComplexity, Collectors.toList()));
         List<Map> clist = new ArrayList<>();
-        for(Map.Entry<Integer, List<EPaperQtypeQuestion>> entry : complxmap.entrySet()){
+        for(Map.Entry<Integer, List<EPaperQtypeQuestionVo>> entry : complxmap.entrySet()){
             Map cmap = new HashMap();
             cmap.put("level",entry.getKey());
-            List<EPaperQtypeQuestion> aq = entry.getValue();
-            double cscore = aq.stream().collect(Collectors.summingDouble(EPaperQtypeQuestion:: getScore));
+            List<EPaperQtypeQuestionVo> aq = entry.getValue();
+            double cscore = aq.stream().collect(Collectors.summingDouble(EPaperQtypeQuestionVo:: getScore));
             double scorerate = N_Utils.getDoubleDivideAndMulitiply(cscore, ePaper.getPscore());
+            cmap.put("score",cscore);
             cmap.put("srate",scorerate);
             clist.add(cmap);
         }
 
+        //知识点
+        Map<String,List<EPaperQPointVo>> pointmap =  quespoints.stream().collect(Collectors.groupingBy(EPaperQPointVo:: getPointid, Collectors.toList()));
+        List<Map> pointlist = new ArrayList<>();
+        for(Map.Entry<String, List<EPaperQPointVo>> entry : pointmap.entrySet()){
+            Map pm = new HashMap();
+            List<EPaperQPointVo> pvo = entry.getValue();
+            double cscore = pvo.stream().collect(Collectors.summingDouble(EPaperQPointVo:: getScore));
+            double scorerate = N_Utils.getDoubleDivideAndMulitiply(cscore, ePaper.getPscore());
+            List<Integer> thlist = pvo.stream().map(EPaperQPointVo :: getOrder).collect(Collectors.toList());
+            pm.put("pointname",pvo.get(0).getPointname());
+            pm.put("score",cscore);
+            pm.put("srate",scorerate);
+            pm.put("order",thlist);
+            pointlist.add(pm);
+        }
+
         EPaperAnalyze epa = new EPaperAnalyze();
-        epa.setEpaid(ePaper.getEpid());
-        epa.setAlljson(JSON.toJSONString(ztmap));
-        epa.setQnumjson(JSON.toJSONString(qtlist));
-        epa.setComplexityjson(JSON.toJSONString(clist));
+        epa.setEpid(ePaper.getEpid());
+        epa.setAlljson(JSON.toJSONString(ztmap));//总体分析
+        epa.setQnumjson(JSON.toJSONString(typelist));//试题栏题型分析
+        epa.setComplexityjson(JSON.toJSONString(clist));//难易度分析
+        epa.setPointjson(JSON.toJSONString(pointlist));//知识点分析
         ePaperAnalyzeMapper.insertUseGeneratedKeys(epa);
 
     }
@@ -208,7 +264,7 @@ public class EPaperQtypeService {
         //保存题型试题信息
         savePaperQtype(paper,qtypelist);
         //保存作业分析
-        savePaperAnalyze(paper,qtypelist,queslist);
+        savePaperAnalyze(paper);
         //更加试卷状态是否需要生成分析和更改科目状态
         if(paper.getPstate()!=null && paper.getPstate() == 1){
             //如果提交试卷，更改科目状态
@@ -217,7 +273,6 @@ public class EPaperQtypeService {
         }
     }
 
-
     /**
      * @Description  题库试卷详情
      * @Param [epid]
@@ -227,7 +282,7 @@ public class EPaperQtypeService {
      **/
     public Map getPaperQtDetail(Integer epid) {
         Map map = ePaperMapper.getExamPaperDetailByEpid(epid);//试卷信息
-        List<Map> fjtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(epid);//试卷题型试题信息
+        List<EPaperQtypeVo> fjtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(epid);//试卷题型试题信息
         map.put("qtypes",fjtypelist);
         return map;
     }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/QPointVo.java → sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQPointVo.java

@@ -8,7 +8,11 @@ import lombok.Data;
  * Date 2022/7/19 10:03
  **/
 @Data
-public class QPointVo {
+public class EPaperQPointVo {
     private String pointid;//知识点id
     private String pointname;//知识点名称
+
+    private String questionid;//试题id
+    private double score;//分值
+    private Integer order;//试题排序
 }

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

@@ -0,0 +1,68 @@
+package com.xhkjedu.sexam.vo.paper;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 题库试卷题型下试题集合
+ * @Author WN
+ * Date 2022/7/20 14:17
+ **/
+@Data
+public class EPaperQtypeQuestionVo {
+    //考试试卷题型试题表
+    private Integer eptqid;
+
+    //考试试卷题型表id
+    private Integer eptid;
+
+    //试题id
+    private String questionid;
+
+    //试题分值
+    private Double score;
+
+    //试题排序
+    private Integer order;
+
+    //试题处理题型
+    private Integer ctype;
+
+    //试题题型
+    private String qtypeid;
+
+    //试题题型名称
+    private String qtypename;
+
+    //试题题干
+    private String qstem;
+
+    //试题选项
+    private String qoption;
+
+    //试题答案
+    private String qanswer;
+
+    //试题分析
+    private String qanalyze;
+
+    //难易度
+    private Integer complexity;
+
+    //试题类型0母题1子题
+    private Integer qlevel;
+
+    //是否包含子题0不包含1包含
+    private Integer hasson;
+
+    //母题id
+    private String questionpid;
+
+    //试题关联知识点
+    private List<EPaperQPointVo> points = new ArrayList<>();
+
+    //子试题集合
+    private List<EPaperQtypeQuestionVo> sonquestions = new ArrayList<>();
+}

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

@@ -0,0 +1,32 @@
+package com.xhkjedu.sexam.vo.paper;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 题库试卷题型
+ * @Author WN
+ * Date 2022/7/20 14:17
+ **/
+@Data
+public class EPaperQtypeVo {
+    //考试试卷题型表
+    private Integer eptid;
+
+    //题型名称
+    private String eptname;
+
+    //题型下试题数量
+    private Integer eptnum;
+
+    //题型排序
+    private Integer eptorder;
+
+    //题型下试题总分值
+    private Double eptscore;
+
+    //试题集合
+    private List<EPaperQtypeQuestionVo> questions = new ArrayList<>();
+}

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

@@ -13,7 +13,6 @@
         <collection property="questions" ofType="java.util.Map">
             <result column="epfjqid" property="epfjqid"></result>
             <result column="epfjid" property="epfjid"></result>
-            <result column="epid" property="epid"></result>
             <result column="qtypeid" property="qtypeid"></result>
             <result column="qtypename" property="qtypename"></result>
             <result column="ctype" property="ctype"></result>

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

@@ -16,7 +16,7 @@
     <!--教师出卷列表-->
     <select id="listExamPapersByTeacherid" resultType="java.util.Map">
         select es.esid,es.subjectid,es.sdate,es.begintime,es.endtime,es.teacherid,u2.username as teachername,es.esstate,es.ptype
-        ,ep.epid,ep.pnum,ep.pscore,ep.answered,s.subjectname,ep.handleid,u.username as handlename,es.examid,e.examname
+        ,ep.epid,ep.pnum,ep.pscore,ep.answered,s.subjectname,ep.handleid,u.username as handlename,es.examid,e.examname,e.examtype
         from e_subject es left join e_paper ep on es.esid=ep.esid
         left join t_subject s on es.subjectid=s.subjectid
         left join e_base e on es.examid=e.examid
@@ -28,12 +28,14 @@
 
     <!--试卷详情-->
     <select id="getExamPaperDetailByEpid" resultType="java.util.Map">
-        select ep.epid,ep.examid,ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.hearfile,
+        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.handleid,ep.handletime,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
         left join t_user u on ep.handleid=u.userid
         left join e_subject es on ep.esid=es.esid
+        left join t_user u2 on es.teacherid=u2.userid
         where ep.epid=#{epid}
     </select>
 

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

@@ -3,14 +3,13 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper">
 
     <!--试卷题型试题信息-->
-    <resultMap id="qtypeQuestions" type="java.util.Map">
+    <resultMap id="qtypesQuestion" type="com.xhkjedu.sexam.vo.paper.EPaperQtypeVo">
         <result column="eptid" property="eptid"></result>
-        <result column="epid" property="epid"></result>
         <result column="eptname" property="eptname"></result>
         <result column="eptnum" property="eptnum"></result>
         <result column="eptorder" property="eptorder"></result>
         <result column="eptscore" property="eptscore"></result>
-        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+        <collection property="questions" ofType="com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo" javaType="java.util.List">
             <result column="eptqid" property="eptqid"></result>
             <result column="eptid" property="eptid"></result>
             <result column="questionid" property="questionid"></result>
@@ -26,60 +25,58 @@
             <result column="complexity" property="complexity"></result>
             <result column="qlevel" property="qlevel"></result>
             <result column="hasson" property="hasson"></result>
-            <collection property="points" ofType="java.util.Map" javaType="java.util.List"
+            <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="java.util.Map" javaType="java.util.List"
-                        column="questionid=questionid" select="listSonQuestions">
-                <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="sonpoints" ofType="java.util.Map" javaType="java.util.List"
-                            column="questionid=questionid" select="listSonQuestionPoints">
-                    <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>
-
-
-    <select id="listPaperQtypeQuestions" resultMap="qtypeQuestions">
-        select t.eptid,t.epid,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.eptid,tq.questionid,
+    <!--子题信息和关联知识点（题型-母题-子题-子题知识点 不能放在一个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,
                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.questionpid
+               q.complexity,q.qlevel,q.hasson
         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
     </select>
     <!--试题关联知识点-->
-    <select id="listQuestionPoints" resultType="java.util.Map">
+    <select id="listQuestionPoints" resultType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo">
         select qp.pointid,p.pointname from t_question_point qp
         left join t_point p on qp.pointid=p.pointid
         where qp.questionid=#{questionid} order by p.pointorder
     </select>
     <!--子题-->
-    <select id="listSonQuestions" resultType="java.util.Map">
+    <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.questionpid from t_question q where q.questionpid=#{questionid}
-    </select>
-    <select id="listSonQuestionPoints" resultType="java.util.Map">
-        select qp.pointid,p.pointname from t_question_point qp
-        left join t_point p on qp.pointid=p.pointid
-        where qp.questionid=#{questionid} order by p.pointorder
+               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/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -1,13 +1,29 @@
 package com.xhkjedu.sexam;
 
+import com.xhkjedu.sexam.model.paper.EPaper;
+import com.xhkjedu.sexam.service.paper.EPaperQtypeService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import javax.annotation.Resource;
+
 @SpringBootTest
 class SexamApplicationTests {
 
+    @Resource
+    private EPaperQtypeService ePaperQtypeService;
+
     @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

@@ -56,6 +56,9 @@ public class TQuestion extends BaseBean {
     //是否包含子题0不包含1包含
     private Integer hasson;
 
+    //子题排序
+    private Integer sorder;
+
     //试题对应母题id
     private String questionpid;
 

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

@@ -354,14 +354,12 @@ public class QuestionService {
         int timestamp = N_Utils.getSecondTimestamp();
         question.setCount(0);
         question.setQstate(1);
-        question.setQlevel(0);
-        question.setHasson(1);
         question.setBelong(4);
         question.setCreatetime(timestamp);
         String questionid = StudyUtil.getId();
         question.setQuestionid(questionid);
         saveQues.add(question);
-        if(question.getCtype() ==11 || question.getCtype() ==12){
+        if(question.getQlevel() == 0 && question.getHasson() ==1){//是母体并且包含子题
             List<TQuestion> sonques = question.getQuestions();
             for(TQuestion sq : sonques){
                 String sqid = StudyUtil.getId();
@@ -387,7 +385,15 @@ public class QuestionService {
                         p.setCreateid(question.getCreateid());
                         p.setCreatetime(timestamp);
                         p.setSchoolid(question.getSchoolid());
-                        saveQPoints.add(p);
+                        saveQPoints.add(p);//子题关联知识点
+
+                        TQuestionPoint mp = new TQuestionPoint();
+                        mp.setQpid(StudyUtil.getId());
+                        mp.setQuestionid(questionid);
+                        mp.setPointid(p.getPointid());
+                        mp.setCreateid(question.getCreateid());
+                        mp.setCreatetime(timestamp);
+                        saveQPoints.add(p);//母题关联所有子题关联知识点
                     }
                 }
             }

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
+        GROUP BY ps.psid ORDER BY pg.starttime DESC,p.createtime DESC,p.psid desc
     </select>
     <!--提交作业-->
     <update id="submitPaper">