1、课堂知识点搜索问题

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointDao.java

@@ -18,7 +18,14 @@ import java.util.List;
 @SqlResource("jlw.teacherOpenCourseKnowledgePoint")
 public interface TeacherOpenCourseKnowledgePointDao extends BaseMapper<TeacherOpenCourseKnowledgePoint>{
     PageQuery<TeacherOpenCourseKnowledgePoint> queryByCondition(PageQuery query);
+
+    /**
+     * 查询知识点章节和实训
+     * @param query
+     * @return
+     */
     PageQuery<TeacherOpenCourseKnowledgePoint> queryByConditionQuery(PageQuery query);
+    PageQuery<TeacherOpenCourseKnowledgePoint> queryByChapterAndPracticalQuery(PageQuery query);
     @Update
     void deleteTeacherOpenCourseKnowledgePointByIds(String ids);
     @Update

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java

@@ -77,6 +77,30 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseService<Teac
         return ret;
     }
 
+    /**
+     * 查询知识点章节和实训
+     * @param query
+     * @return
+     */
+    public PageQuery<TeacherOpenCourseKnowledgePoint> queryByChapterAndPracticalQuery(PageQuery query){
+        PageQuery ret =  teacherOpenCourseKnowledgePointDao.queryByChapterAndPracticalQuery(query);
+        List<TeacherOpenCourseKnowledgePoint> list = ret.getList();
+        if (CollectionUtil.isNotEmpty(list)) {
+            List<Long> collect = list.stream().map(TeacherOpenCourseKnowledgePoint::getTeacherOpenCourseKnowledgePointId).collect(Collectors.toList());
+            TeacherOpenCourseKnowledgePointRelationQuery relationQuery = new TeacherOpenCourseKnowledgePointRelationQuery();
+            relationQuery.setTeacherOpenCourseKnowledgePointIdPlural(CollectionUtil.join(collect, ","));
+            List<TeacherOpenCourseKnowledgePointRelation> openCourseKnowledgePointRelations = relationService.getValuesByQueryNotWithPermission(relationQuery);
+            for (TeacherOpenCourseKnowledgePoint teacherOpenCourseKnowledgePoint : list) {
+                openCourseKnowledgePointRelations.stream().filter(v ->
+                        v.getTeacherOpenCourseKnowledgePointId().equals(teacherOpenCourseKnowledgePoint.getTeacherOpenCourseKnowledgePointId())).findFirst().ifPresent(relation -> teacherOpenCourseKnowledgePoint.setHandsOnId(relation.getBussinessId()));
+            }
+
+        }
+
+        queryListAfter(list);
+        return ret;
+    }
+
     /**
      * 获取知识点
      * @param condition

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java

@@ -60,6 +60,17 @@ public class TeacherOpenCourseKnowledgePointController {
         }
     }
 
+    @PostMapping(API + "/getChapterAndPracticalPageList.do")
+    public JsonResult<PageQuery> queryByChapterAndPracticalQuery(TeacherOpenCourseKnowledgePointQuery condition, @SCoreUser CoreUser coreUser) {
+        if (null == coreUser) {
+            return JsonResult.failMessage("请登录后再操作");
+        } else {
+            PageQuery page = condition.getPageQuery();
+            teacherOpenCourseKnowledgePointService.queryByChapterAndPracticalQuery(page);
+            return JsonResult.success(page);
+        }
+    }
+
     @PostMapping(API + "/getKnowledgePoint.do")
     public JsonResult<List<TeacherOpenCourseKnowledgePoint>> getKnowledgePoint(TeacherOpenCourseKnowledgePointQuery condition, @SCoreUser CoreUser coreUser){
         if (null == coreUser) {

web/src/main/resources/sql/jlw/teacherOpenCourseKnowledgePoint.md

@@ -108,6 +108,66 @@ queryByConditionQuery
   @}
 
 
+queryByChapterAndPracticalQuery
+===
+* 查询知识点章节和实训
+
+  select
+  @pageTag(){
+  t.*
+  @}
+  from teacher_open_course_knowledge_point t
+  @if(!isEmpty(bussinessId)){
+  LEFT JOIN teacher_open_course_knowledge_point_relation aa ON aa.teacher_open_course_knowledge_point_id = t.teacher_open_course_knowledge_point_id AND aa.bussiness_id = #bussinessId#  AND aa.bussiness_type = 2
+  @}
+  where 1=1  
+  @if(!isEmpty(teacherOpenCourseKnowledgePointId)){
+  and t.teacher_open_course_knowledge_point_id =#teacherOpenCourseKnowledgePointId#
+  @}
+  @if(!isEmpty(teacherOpenCourseKnowledgePointIdPlural)){
+  and find_in_set(t.teacher_open_course_knowledge_point_id,#teacherOpenCourseKnowledgePointIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(chapterId)){
+  and t.chapter_id =#chapterId#
+  @}
+  @if(!isEmpty(chapterIdPlural)){
+  and find_in_set(t.chapter_id,#chapterIdPlural#)
+  @}
+  @if(!isEmpty(knowledgePointTitle)){
+  and t.knowledge_point_title =#knowledgePointTitle#
+  @}
+  @if(!isEmpty(knowledgePointContent)){
+  and t.knowledge_point_content =#knowledgePointContent#
+  @}
+  @if(!isEmpty(createTime)){
+  and t.create_time =#createTime#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+  @if(!isEmpty(delFlag)){
+  and t.del_flag =#delFlag#
+  @}
+  @if(!isEmpty(bussinessId)){
+  and aa.bussiness_id =#bussinessId#
+  @}
+
+
 
 
 deleteTeacherOpenCourseKnowledgePointByIds