完善作业、试卷知识点分析顺序

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

@@ -279,7 +279,7 @@ public class EPaperQtypeService {
 
             if(hasmt > 0){
                 //说明该题型下有复合题,复合体进行知识点、题型下试题题号及id进行操作
-                Map<String,List<EPaperQtypeQuestionVo>> quesMap = tqlist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getQuestionpid, Collectors.toList()));
+                LinkedHashMap<String,List<EPaperQtypeQuestionVo>> quesMap = tqlist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getQuestionpid,LinkedHashMap::new, Collectors.toList()));
                 for(Map.Entry<String, List<EPaperQtypeQuestionVo>> entry : quesMap.entrySet()){
                     if(!entry.getKey().equals("000")){
                         //说明该题为母题，
@@ -385,7 +385,7 @@ public class EPaperQtypeService {
         //知识点分析
         List<Map> pointlist = new ArrayList<>();
         if(N_Utils.isListNotEmpty(pointqlist)){
-            Map<String,List<QuestionOrderVo>> pointmap = pointqlist.stream().collect(Collectors.groupingBy(QuestionOrderVo::getId,Collectors.toList()));
+            LinkedHashMap<String,List<QuestionOrderVo>> pointmap = pointqlist.stream().collect(Collectors.groupingBy(QuestionOrderVo::getId,LinkedHashMap::new,Collectors.toList()));
             //根据指示进行分组，
             for(Map.Entry<String, List<QuestionOrderVo>> entry : pointmap.entrySet()){
                 List<QuestionOrderVo> pgblist = entry.getValue();
@@ -393,7 +393,7 @@ public class EPaperQtypeService {
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
                 score = N_Utils.formatDouble(score,1);
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,ePaper.getPscore());
-                Map prate = new TreeMap();
+                Map prate = new LinkedHashMap();
                 prate.put("pointid",entry.getKey());
                 prate.put("pointname",pgblist.get(0).getName());
                 prate.put("score",score);

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

@@ -74,7 +74,7 @@
         <if test="qlevel==3">
             qp.questionid=#{questionpid}
         </if>
-        group by qp.pointid order by p.pointorder
+        group by qp.pointid order by p.pointorder,p.pointid
     </select>
 
     <!--试卷题型试题信息（附件）-->

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -542,7 +542,7 @@ public class PaperService {
 
             if(hasmt > 0){
                 //说明该题型下有复合题,复合体进行知识点、题型下试题题号及id进行操作
-                Map<String,List<PaperQtypeQuesVo>> quesMap = tqlist.stream().collect(Collectors.groupingBy(PaperQtypeQuesVo:: getQuestionpid, Collectors.toList()));
+                LinkedHashMap<String,List<PaperQtypeQuesVo>> quesMap = tqlist.stream().collect(Collectors.groupingBy(PaperQtypeQuesVo:: getQuestionpid,LinkedHashMap::new, Collectors.toList()));
                 for(Map.Entry<String, List<PaperQtypeQuesVo>> entry : quesMap.entrySet()){
                     if(!entry.getKey().equals("000")){
                         //说明该题为母题，
@@ -644,7 +644,7 @@ public class PaperService {
         //知识点分析
         List<Map> pointlist = new ArrayList<>();
         if(N_Utils.isListNotEmpty(pointqlist)){
-            Map<String,List<QuestionOrderVo>> pointmap = pointqlist.stream().collect(Collectors.groupingBy(QuestionOrderVo::getId,Collectors.toList()));
+            LinkedHashMap<String,List<QuestionOrderVo>> pointmap = pointqlist.stream().collect(Collectors.groupingBy(QuestionOrderVo::getId,LinkedHashMap::new,Collectors.toList()));
             //根据指示进行分组，
             for(Map.Entry<String, List<QuestionOrderVo>> entry : pointmap.entrySet()){
                 List<QuestionOrderVo> pgblist = entry.getValue();

sstudy/src/main/resources/mapper/paper/PaperQtypeMapper.xml

@@ -55,7 +55,7 @@
     <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 qp.questionid=#{questionpid} group by qp.pointid order by p.pointorder
+        where qp.questionid=#{questionpid} group by qp.pointid order by p.pointorder,p.pointid
     </select>
 
 </mapper>