知识点搜索试题

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

@@ -6,8 +6,10 @@ import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sstudy.model.question.TQuestion;
 import com.xhkjedu.sstudy.model.question.TQuestionCollect;
 import com.xhkjedu.sstudy.model.subjectbook.TDirector;
+import com.xhkjedu.sstudy.model.subjectbook.TPoint;
 import com.xhkjedu.sstudy.service.question.QuestionService;
 import com.xhkjedu.sstudy.service.subjectbook.DirectorService;
+import com.xhkjedu.sstudy.service.subjectbook.PointService;
 import com.xhkjedu.sstudy.vo.question.QuestionCollectVo;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
 import com.xhkjedu.sstudy.vo.system.CollectVo;
@@ -38,6 +40,8 @@ public class QuestionController {
     private QuestionService tQuestionService;
     @Resource
     private DirectorService directorService;
+    @Resource
+    private PointService pointService;
 
     @PostMapping("/update_state")
     @Action("试题管理-修改状态")
@@ -112,6 +116,20 @@ public class QuestionController {
         Integer page = tQuestion.getPage();
         Integer pageSize = tQuestion.getPageSize();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
+        //获取所选知识点信息
+        if(N_Utils.isNotEmpty(tQuestion.getPointid()) && !"0".equals(tQuestion.getPointid())){
+            TPoint point = pointService.getPointInfoById(tQuestion.getPointid());
+
+            if(point.getSonnum() == 0){
+                //没有子知识点，属于叶子节点
+                tQuestion.setPointLeaf(1);
+            }else{
+                //说明有子知识点，直接获取
+                tQuestion.setPointLeaf(0);
+                tQuestion.setPointall(point.getPointall());
+            }
+        }
+
         PageHelper.startPage(page, pageSize);
         tQuestion.setLsbid(null);
         List<Map<String, Object>> list = tQuestionService.listForSelect(tQuestion);

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/PointMapper.java

@@ -24,4 +24,7 @@ public interface PointMapper extends TkMapper<TPoint> {
 
     //查找使用知识点的模块
     String findUseModule(String pointid);
+
+    //根据知识点ID获取知识点信息
+    TPoint getPointInfoById(@Param("pointid")String pointid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestion.java

@@ -135,4 +135,10 @@ public class TQuestion extends BaseBean {
 
     @Transient
     private String directorall;//所有层章节拼接
+
+    @Transient
+    private Integer pointLeaf;//知识点是否是叶子节点0不是1是
+
+    @Transient
+    private String pointall;//所有层知识点拼接
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TPoint.java

@@ -31,6 +31,9 @@ public class TPoint extends BaseBean {
     //知识点所属层级
     private Integer pointlevel;
 
+    //所有层级知识点;拼接
+    private String pointall;
+
     //创建人
     private Integer createid;
 
@@ -50,4 +53,7 @@ public class TPoint extends BaseBean {
     private String createformat;
 
     private List<TPoint> children = new ArrayList<>();
+
+    @Transient
+    private Integer sonnum;//子知识点数量
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/PointService.java

@@ -105,5 +105,10 @@ public class PointService {
         }
         return useModule;
     }
+
+    //获取知识点详情
+    public TPoint getPointInfoById(String pointid) {
+        return pointMapper.getPointInfoById(pointid);
+    }
 }
 

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

@@ -208,6 +208,9 @@
         </if>
         left join t_question_director qd on q.questionid=qd.questionid
         left join t_director d on qd.directorid=d.directorid
+        <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!='' and question.pointLeaf==0">
+            left join t_point p on qp.pointid = p.pointid
+        </if>
         where d.disabled=0 and q.qstate=1
         <if test="question.lsbid!=null and question.lsbid!='0'.toString() and question.lsbid!=''">
             and qd.lsbid=#{question.lsbid}
@@ -221,9 +224,12 @@
         <if test="question.subjectid!=null and question.subjectid!='0'.toString() and question.subjectid!=''">
             and q.subjectid=#{question.subjectid}
         </if>
-        <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
+        <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!='' and question.pointLeaf==1">
             and qp.pointid=#{question.pointid}
         </if>
+        <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!='' and question.pointLeaf==0">
+            and p.pointall like concat('%',#{question.pointall},'%')
+        </if>
         <if test="question.hashear!=null and question.hashear == 1">
             and q.hashear=1
         </if>

sstudy/src/main/resources/mapper/subjectbook/PointMapper.xml

@@ -35,4 +35,11 @@
         )
     </select>
 
+    <!--根据知识点ID获取知识点信息-->
+    <select id="getPointInfoById" resultType="com.xhkjedu.sstudy.model.subjectbook.TPoint">
+        select pointid,pointname,pointall,
+         (select count(*) from t_point p where p.pointpid=#{pointid}) sonnum
+        from t_point where pointid=#{pointid}
+    </select>
+
 </mapper>