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

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

@@ -1,7 +1,6 @@
 package com.xhkjedu.sexam.model.paper;
 
 import com.xhkjedu.sexam.model.BaseBean;
-import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
 import lombok.Data;
 
 import javax.persistence.Id;
@@ -9,6 +8,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Table(name = "e_paper_qtype_question")
 @Data
@@ -68,7 +68,7 @@ public class EPaperQtypeQuestion extends BaseBean {
 
     //试题关联知识点
     @Transient
-    private List<EPaperQPointVo> points = new ArrayList<>();
+    private List<Map> points = new ArrayList<>();
 
     //坐标集合
     @Transient

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

@@ -201,7 +201,7 @@ public class EPaperQtypeService {
         //总体分析（主观题、客观题）
         List<EPaperQtypeVo> qtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(ePaper.getEpid());//试卷题型试题信息
         List<EPaperQtypeQuestionVo> queslist = new ArrayList<>();//试卷中所有试题(子题)
-        List<EPaperQPointVo> quespoints = new ArrayList<>();//试卷中所有单题和子题以及对应知识点
+        List<Map> quespoints = new ArrayList<>();//试卷中所有单题和子题以及对应知识点
         List<EPaperQtypeQuestion> uplist = new ArrayList<>();//如果是客观题则获取客观题选项数量更改试卷中客观题选项数量
 
         //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11综合题12听力
@@ -211,15 +211,15 @@ public class EPaperQtypeService {
             List<Integer> qorderlist = new ArrayList<>();
             for(EPaperQtypeQuestionVo q : qt.getQuestions()){
                 //处理试题关联知识点
-                List<EPaperQPointVo> pointslist = q.getPoints();
+                List<Map> 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.setQorder(q.getQorder());
-                        p.setScore(q.getScore());
+                    for(Map point : pointslist){
+                        Map p = new HashMap();
+                        p.put("pointid",point.get("pointid").toString());
+                        p.put("pointname",point.get("pointname").toString());
+                        p.put("eptqid",q.getEptqid());
+                        p.put("order",q.getQorder());
+                        p.put("score",q.getScore());
                         quespoints.add(p);
                     }
                 }
@@ -326,17 +326,17 @@ public class EPaperQtypeService {
         }
 
         //知识点
-        Map<String,List<EPaperQPointVo>> pointmap =  quespoints.stream().collect(Collectors.groupingBy(EPaperQPointVo:: getPointid, Collectors.toList()));
+        Map<String,List<Map>> pointmap =  quespoints.stream().collect(Collectors.groupingBy(item -> item.get("pointid").toString(), Collectors.toList()));
         List<Map> pointlist = new ArrayList<>();
-        for(Map.Entry<String, List<EPaperQPointVo>> entry : pointmap.entrySet()){
+        for(Map.Entry<String, List<Map>> entry : pointmap.entrySet()){
             Map pm = new HashMap();
-            List<EPaperQPointVo> pvo = entry.getValue();
-            double cscore = pvo.stream().collect(Collectors.summingDouble(EPaperQPointVo:: getScore));
+            List<Map> pvo = entry.getValue();
+            double cscore = pvo.stream().collect(Collectors.summingDouble(item -> Double.valueOf(item.get("score").toString())));
             double scorerate = N_Utils.getDoubleDivideAndMulitiply(cscore, ePaper.getPscore());
-            List<Integer> thlist = pvo.stream().map(EPaperQPointVo :: getQorder).collect(Collectors.toList());
+            List<Integer> thlist = pvo.stream().map(item -> Integer.parseInt(item.get("order").toString())).collect(Collectors.toList());
             thlist = thlist.stream().distinct().collect(Collectors.toList());
-            pm.put("pointid",pvo.get(0).getPointid());
-            pm.put("pointname",pvo.get(0).getPointname());
+            pm.put("pointid",pvo.get(0).get("pointid").toString());
+            pm.put("pointname",pvo.get(0).get("pointname").toString());
             pm.put("score",cscore);
             pm.put("srate",scorerate);
             pm.put("order",thlist);
@@ -493,10 +493,10 @@ public class EPaperQtypeService {
                        mq.setQlevel(q.getMqlevel());
                        mq.setMhashear(q.getMhashear());
                        mq.setMhearfile(q.getMhearfile());
-                       List<EPaperQPointVo> allpoint = new ArrayList<>();
+                       List<Map> allpoint = new ArrayList<>();
                        for(EPaperQtypeQuestionVo sq : sonqlist){
-                           List<EPaperQPointVo> sqpoints = sq.getPoints();
-                           for(EPaperQPointVo p : sqpoints){
+                           List<Map> sqpoints = sq.getPoints();
+                           for(Map p : sqpoints){
                                if(!isExistEPaperPoints(allpoint,p)){
                                    allpoint.add(p);
                                }
@@ -521,9 +521,11 @@ public class EPaperQtypeService {
 
     }
 
-    private boolean isExistEPaperPoints(List<EPaperQPointVo> allpoint,EPaperQPointVo p){
-        for(EPaperQPointVo pvo : allpoint){
-            if(p.getPointid().equals(pvo.getPointid())){
+    private boolean isExistEPaperPoints(List<Map> allpoint,Map p){
+        String ppointid = p.get("pointid").toString();
+        for(Map pvo : allpoint){
+            String pvopointid = pvo.get("pointid").toString();
+            if(ppointid.equals(pvopointid)){
                 return true;
             }
         }

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -557,10 +557,10 @@ public class EReportGenerateService {
                         mq.setQanswer(q.getMqanswer());
                         mq.setQorder(q.getQorder());
                         mq.setQlevel(q.getMqlevel());
-                        List<EPaperQPointVo> allpoint = new ArrayList<>();
+                        List<Map> allpoint = new ArrayList<>();
                         for(EPaperQtypeQuestionVo sq : sonqlist){
-                            List<EPaperQPointVo> sqpoints = sq.getPoints();
-                            for(EPaperQPointVo p : sqpoints){
+                            List<Map> sqpoints = sq.getPoints();
+                            for(Map p : sqpoints){
                                 if(!isExistEPaperPoints(allpoint,p)){
                                     allpoint.add(p);
                                 }
@@ -584,9 +584,11 @@ public class EReportGenerateService {
         }
 
     }
-    private boolean isExistEPaperPoints(List<EPaperQPointVo> allpoint,EPaperQPointVo p){
-        for(EPaperQPointVo pvo : allpoint){
-            if(p.getPointid().equals(pvo.getPointid())){
+    private boolean isExistEPaperPoints(List<Map> allpoint,Map p){
+        String ppointid = p.get("pointid").toString();
+        for(Map pvo : allpoint){
+            String pvopointid = pvo.get("pointid").toString();
+            if(ppointid.equals(pvopointid)){
                 return true;
             }
         }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 题库试卷题型下试题集合
@@ -109,7 +110,7 @@ public class EPaperQtypeQuestionVo {
     private String mhearfile;
 
     //试题关联知识点
-    private List<EPaperQPointVo> points = new ArrayList<>();
+    private List<Map> points = new ArrayList<>();
 
     //子题集合
     private List<EPaperQtypeQuestionVo> sonques;

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

@@ -43,7 +43,7 @@
             <result column="mqlevel" property="mqlevel"></result>
             <result column="mhashear" property="mhashear"></result>
             <result column="mhearfile" property="mhearfile"></result>
-            <collection property="points" ofType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo" javaType="java.util.List"
+            <collection property="points" ofType="java.util.Map" javaType="java.util.List"
                         column="{questionid=questionid,qlevel=qlevel,questionpid=questionpid" select="listQuestionPoints">
                 <result column="pointid" property="pointid"></result>
                 <result column="pointname" property="pointname"></result>
@@ -63,7 +63,7 @@
         where t.epid=#{epid} order by t.eptorder,tq.qorder,q.sorder
     </select>
     <!--试题关联知识点-->
-    <select id="listQuestionPoints" resultType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo">
+    <select id="listQuestionPoints" 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