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

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

@@ -64,13 +64,13 @@ public class EPaperQtypeService {
 
         List<EPaperQtype> qtypelist = paper.getQtypelist();
         List<EPaperQtypeQuestion> queslist = new ArrayList<>();//存放试题
-        setEPaperBaseDetail(paper,espVo,qtypelist,queslist);
+        setEPaperBaseDetail(paper,espVo,qtypelist);
         //保存试卷信息
         ePaperMapper.insertUseGeneratedKeys(paper);
         int epid = paper.getId();
         paper.setEpid(epid);
         //保存题型试题信息
-        savePaperQtype(paper,qtypelist);
+        savePaperQtype(paper,qtypelist,queslist);
 
         //保存试卷分析
         if(paper.getPtype() == 1){
@@ -95,10 +95,7 @@ public class EPaperQtypeService {
     }
 
     //设置试卷基本信息
-    private void setEPaperBaseDetail(EPaper paper,EExamSubjectPaperVo eSubject,List<EPaperQtype> qtypelist,List<EPaperQtypeQuestion> queslist){
-        qtypelist.forEach(q ->{
-            queslist.addAll(q.getQuestions());
-        });
+    private void setEPaperBaseDetail(EPaper paper,EExamSubjectPaperVo eSubject,List<EPaperQtype> qtypelist){
         if(paper.getPtype() == 2 && paper.getPfiles()!=null && paper.getPfiles().size()>0){
             paper.setHasfile(1);
         }else {
@@ -108,8 +105,9 @@ public class EPaperQtypeService {
         paper.setSubjectid(eSubject.getSubjectid());
         paper.setEsid(eSubject.getEsid());
         int timestamp = N_Utils.getSecondTimestamp();
-        double pscore = queslist.stream().collect(Collectors.summingDouble(EPaperQtypeQuestion:: getScore));
-        paper.setPnum(queslist.size());
+        double pscore = qtypelist.stream().collect(Collectors.summingDouble(EPaperQtype:: getEptscore));
+        int pnum = qtypelist.stream().collect(Collectors.summingInt(EPaperQtype:: getEptnum));
+        paper.setPnum(pnum);
         paper.setPscore(pscore);
         paper.setCreatetime(timestamp);
         paper.setHandletime(timestamp);
@@ -123,8 +121,7 @@ public class EPaperQtypeService {
     }
 
     //保存试卷题型试题信息
-    private void savePaperQtype(EPaper epaper,List<EPaperQtype> qtypelist){
-        List<EPaperQtypeQuestion> qtqs = new ArrayList<>();
+    private void savePaperQtype(EPaper epaper,List<EPaperQtype> qtypelist,List<EPaperQtypeQuestion> qtqs){
         for(EPaperQtype qtype : qtypelist){
             qtype.setEpid(epaper.getEpid());
             qtype.setCreateid(epaper.getHandleid());
@@ -389,13 +386,13 @@ public class EPaperQtypeService {
         List<EPaperQtype> qtypelist = paper.getQtypelist();
         List<EPaperQtypeQuestion> queslist = new ArrayList<>();//存放试题
 
-        setEPaperBaseDetail(paper,espVo,qtypelist,queslist);
+        setEPaperBaseDetail(paper,espVo,qtypelist);
         //保存试卷信息
         ePaperMapper.insertUseGeneratedKeys(paper);
         int epid = paper.getId();
         paper.setEpid(epid);
         //保存题型试题信息
-        savePaperQtype(paper,qtypelist);
+        savePaperQtype(paper,qtypelist,queslist);
 
         //保存试卷分析
         if(paper.getPtype() == 1){
@@ -464,6 +461,10 @@ public class EPaperQtypeService {
                        mq.setQtypename(q.getMqtypename());
                        mq.setQstem(q.getMqstem());
                        mq.setComplexity(q.getMcomplexity());
+                       mq.setQanalyze(q.getMqanalyze());
+                       mq.setQanswer(q.getMqanswer());
+                       mq.setQorder(q.getQorder());
+                       mq.setQlevel(q.getMqlevel());
                        List<EPaperQPointVo> allpoint = new ArrayList<>();
                        for(EPaperQtypeQuestionVo sq : sonqlist){
                            List<EPaperQPointVo> sqpoints = sq.getPoints();
@@ -474,6 +475,8 @@ public class EPaperQtypeService {
                            }
                            sq.setCtype(sq.getQctype());
                        }
+                       Double mscore = sonqlist.stream().collect(Collectors.summingDouble(EPaperQtypeQuestionVo:: getScore));
+                       mq.setScore(mscore);
                        mq.setSonques(sonqlist);
                        mq.setPoints(allpoint);
                        rtnqlist.add(mq);

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

@@ -85,6 +85,15 @@ public class EPaperQtypeQuestionVo {
     //母题处理题型
     private Integer mctype;
 
+    //母题答案
+    private String mqanswer;
+
+    //母题解析
+    private String mqanalyze;
+
+    //母题类型
+    private Integer mqlevel;
+
     //试题关联知识点
     private List<EPaperQPointVo> points = new ArrayList<>();
 

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

@@ -34,6 +34,9 @@
             <result column="mqtypeid" property="mqtypeid"></result>
             <result column="mqtypename" property="mqtypename"></result>
             <result column="mctype" property="mctype"></result>
+            <result column="mqanswer" property="mqanswer"></result>
+            <result column="mqanalyze" property="mqanalyze"></result>
+            <result column="mqlevel" property="mqlevel"></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>
@@ -46,7 +49,8 @@
         select t.eptid,t.epid,t.ctype,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.questionid,tq.answer,
                tq.score,tq.qorder,q.qtypeid,q.qtypename,q.ctype qctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
                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
+               fq.qtypeid mqtypeid,fq.qtypename mqtypename,fq.ctype mctype,fq.qanalyze mqanalyze,fq.qanswer mqanswer,
+               fq.qlevel mqlevel
         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
         left JOIN t_question fq on q.questionpid=fq.questionid