试题列表，试题详情返回子题

sstudy/src/main/java/com/xhkjedu/sstudy/controller/question/QuestionController.java

@@ -74,7 +74,7 @@ public class QuestionController {
         Integer pageSize = tQuestion.getPageSize();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
         PageHelper.startPage(page, pageSize);
-        List<SelectQuestionVo> list = tQuestionService.listForSelect(tQuestion);
+        List<Map> list = tQuestionService.listForSelect(tQuestion);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取章节选题列表成功",pageResult);
     }
@@ -86,7 +86,7 @@ public class QuestionController {
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
         PageHelper.startPage(page, pageSize);
         tQuestion.setLsbid(null);
-        List<SelectQuestionVo> list = tQuestionService.listForSelect(tQuestion);
+        List<Map> list = tQuestionService.listForSelect(tQuestion);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取知识点选题列表成功",pageResult);
     }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionMapper.java

@@ -7,6 +7,7 @@ import com.xhkjedu.sstudy.vo.question.SelectQuestionVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface QuestionMapper extends TkMapper<TQuestion> {
     /**
@@ -62,6 +63,8 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
      * @return com.xhkjedu.model.question.TQuestion
      **/
     QuestionVo findById(@Param("questionid") String questionid);
+    //复合题子题
+    List<Map> listSonQuestionsForDetail(@Param("questionid") String questionid);
 
     /**
      * 章节、知识点选题
@@ -70,7 +73,8 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
      * @Date 2020/6/9 15:00
      * @return java.util.List<com.xhkjedu.vo.question.SelectQuestionVo>
      **/
-    List<SelectQuestionVo> listForSelect(@Param("question") TQuestion question);
+    List<Map> listForSelect(@Param("question") TQuestion question);
+
 
     /**
      * 更新组题次数

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

@@ -55,7 +55,13 @@ public class QuestionService {
 
     //获取详情
     public QuestionVo findById(String questionid) {
-        return questionMapper.findById(questionid);
+        QuestionVo questionVo = questionMapper.findById(questionid);
+        if(questionVo.getQlevel() == 2){
+            //代表母题，需要获取子题
+            List<Map> sonqlist = questionMapper.listSonQuestionsForDetail(questionVo.getQuestionid());
+            questionVo.setSonqlist(sonqlist);
+        }
+        return questionVo;
     }
 
     //获取列表
@@ -260,9 +266,9 @@ public class QuestionService {
      * @Param [question]
      * @Author ywx
      * @Date 2020/6/9 15:00
-     * @return java.util.List<com.xhkjedu.vo.question.SelectQuestionVo>
+     * @return java.util.List<Map>
      **/
-    public List<SelectQuestionVo> listForSelect(TQuestion question) {
+    public List<Map> listForSelect(TQuestion question) {
         return questionMapper.listForSelect(question);
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionVo.java

@@ -118,5 +118,5 @@ public class QuestionVo {
     private List<Map> classes;
 
     //子题
-    private List<QuestionVo> sonqlist;
+    private List<Map> sonqlist;
 }

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

@@ -78,6 +78,7 @@
         <result property="schoolid" column="schoolid"></result>
         <result property="subjectid" column="subjectid"></result>
         <result property="areaall" column="areaall"></result>
+        <result property="qlevel" column="qlevel"></result>
         <collection property="points" ofType="com.xhkjedu.sstudy.vo.subjectbook.PointVo" javaType="java.util.List"
                     select="listPoint" column="{questionid=questionid}">
         </collection>
@@ -115,7 +116,7 @@
     <select id="findById" resultMap="questionResult">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong
         ,q.qtypeid,q.qtypename,q.createtime,q.source,q.year,q.region,q.schoolname,q.subjectid,q.schoolid
-        ,qd.directorid,d.directorall directorname,d.lsbid,q.hearfile
+        ,qd.directorid,d.directorall directorname,d.lsbid,q.hearfile,q.qlevel,
         sb.level,sb.subjectid,s.subjectname,v.versionname,sb.lsbname
         ,(select a.areaall from t_areazone a where a.areacode=q.region)areaall
         from t_question q left join t_question_director qd on q.questionid=qd.questionid
@@ -125,10 +126,15 @@
         left join t_version v on sb.versionid = v.versionid
         where q.questionid=#{questionid}
     </select>
+    <select id="listSonQuestionsForDetail" resultType="java.util.Map">
+        select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
+             ,q.qtypeid,q.qtypename,q.ctype,q.qlevel,q.sorder
+        from t_question q where q.qlevel=3 and q.questionpid=#{questionid} order by q.sorder
+    </select>
     <!--管理端试题列表-->
     <select id="findAll" resultType="com.xhkjedu.sstudy.vo.question.QuestionVo">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong,q.createid
-        ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname,q.hearfile
+        ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname,q.hearfile,q.qlevel
         from t_question q left join t_question_director qd on q.questionid=qd.questionid
         <if test="question.belong!=null and question.belong==5">
             left join t_question_collect qc on q.questionid = qc.questionid
@@ -186,10 +192,37 @@
         </where>
         group by q.questionid order by q.qstate,q.createtime desc
     </select>
+
+    <!--章节、知识点选题-->
+    <resultMap id="directPointQuestions" type="java.util.Map">
+        <result property="questionid" column="questionid"></result>
+        <result property="score" column="score"></result>
+        <result property="complexity" column="complexity"></result>
+        <result property="qstem" column="qstem"></result>
+        <result property="qoption" column="qoption"></result>
+        <result property="qanswer" column="qanswer"></result>
+        <result property="qanalyze" column="qanalyze"></result>
+        <result property="qtypeid" column="qtypeid"></result>
+        <result property="qtypename" column="qtypename"></result>
+        <result property="count" column="count"></result>
+        <result property="points" column="points"></result>
+        <result property="ctype" column="ctype"></result>
+        <result property="source" column="source"></result>
+        <result property="year" column="year"></result>
+        <result property="region" column="region"></result>
+        <result property="schoolname" column="schoolname"></result>
+        <result property="qlevel" column="qlevel"></result>
+        <result property="snum" column="snum"></result>
+        <result property="hearfile" column="hearfile"></result>
+        <collection property="sonqlist" ofType="java.util.Map"
+                    column="questionid" select="listSonQuestionForSelect">
+        </collection>
+    </resultMap>
+
     <!--章节、知识点选题-->
-    <select id="listForSelect" resultType="com.xhkjedu.sstudy.vo.question.SelectQuestionVo">
+    <select id="listForSelect" resultMap="directPointQuestions">
         select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
-        ,q.qtypeid,q.qtypename,q.count,GROUP_CONCAT(p.pointname)points,q.ctype,q.belong,q.createid
+        ,q.qtypeid,q.qtypename,q.count,GROUP_CONCAT(p.pointname)points,q.ctype
         ,q.source,q.year,q.region,q.schoolname,q.qlevel,q.hearfile
         from t_question q left join t_question_point qp on q.questionid = qp.questionid
         left join t_point p on p.pointid=qp.pointid
@@ -246,6 +279,12 @@
         and q.qlevel &lt; 3
         group by q.questionid order by q.createtime desc
     </select>
+
+    <select id="listSonQuestionForSelect" resultType="java.util.Map">
+        select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
+        ,q.qtypeid,q.qtypename,q.ctype,q.qlevel,q.sorder
+        from t_question q where q.qlevel=3 and q.questionpid=#{questionid} order by q.sorder
+    </select>
     <!--修改试题状态-->
     <update id="updateQuestionState">
         update t_question set qstate=#{qstate} where questionid in (${questionIds})