试题篮详情优化

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

@@ -10,8 +10,7 @@ import com.xhkjedu.sstudy.vo.question.UserBasketVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -63,6 +62,24 @@ public class UserBasketService {
     //获取列表
     public List <UserBasketVo> findAll(Integer userid, String subjectid) {
         List<UserBasketVo> baskets = userBasketMapper.findAll(userid, subjectid);
+        List<String> questionids = new ArrayList<>();
+        for (UserBasketVo basket : baskets) {
+            questionids.addAll(basket.getQuestions().stream().filter(b -> b.getQlevel().equals(2)).map(
+                    QuestionVo::getQuestionid).collect(Collectors.toList()));
+        }
+        if (N_Utils.isListNotEmpty(questionids)) {
+            List<Map<String, String>> sonList = questionMapper.listSonQuestionForSelect(String.join("','", questionids));
+            for (UserBasketVo basket : baskets) {
+                for (QuestionVo question : basket.getQuestions()) {
+                    if (question.getQlevel().equals(2)) {
+                        String questionid = question.getQuestionid();
+                        List<Map> sonqlist = sonList.stream().filter(
+                                s -> s.get("questionpid").equals(questionid)).collect(Collectors.toList());
+                        question.setSonqlist(sonqlist);
+                    }
+                }
+            }
+        }
         String sujectname = subjectMapper.getSubjectnameById(subjectid);
         //英语学科时处理听力题
         if(sujectname.contains("英语")){

sstudy/src/main/resources/mapper/question/UserBasketMapper.xml

@@ -29,10 +29,10 @@
                 <result property="pointid" column="pointid"></result>
                 <result property="pointname" column="pointname"></result>
             </collection>
-            <collection property="sonqlist" ofType="com.xhkjedu.sstudy.vo.question.QuestionVo"
-                        javaType="java.util.List" select="listSonQuestions" column="questionid">
+            <!--<collection property="sonqlist" ofType="com.xhkjedu.sstudy.vo.question.QuestionVo"-->
+            <!--            javaType="java.util.List" select="listSonQuestions" column="questionid">-->
 
-            </collection>
+            <!--</collection>-->
         </collection>
     </resultMap>
     <resultMap id="listSonQuestions" type="com.xhkjedu.sstudy.vo.question.QuestionVo" >