知识点

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseKnowledgePoint.java

@@ -26,11 +26,11 @@ public class TeacherOpenCourseKnowledgePoint extends BaseEntity{
     private Long teacherOpenCourseKnowledgePointId ;
 	
     //课程开课ID
-    @Dict(type = "course_info.course_info_name.course_info_status=1,course_info_type=1")
+    @Dict(type = "teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
     private Long teacherOpenCourseId ;
 	
     //章节ID
-    @Dict(type="course_info.course_info_name.course_info_status=1")
+    @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1")
     private Long chapterId ;
 	
     //知识点标题
@@ -52,7 +52,14 @@ public class TeacherOpenCourseKnowledgePoint extends BaseEntity{
     //用户ID
 
     private Long userId ;
-	
+
+    /**
+     * 归属实操项目
+     */
+    @Dict(type="teacher_open_course_hands_on.hands_on_name.1=1")
+    private Long handsOnId;
+
+
     //是否删除 1删除，0未删除
 	/*逻辑删除标志*/
 	@InsertIgnore
@@ -180,5 +187,11 @@ public class TeacherOpenCourseKnowledgePoint extends BaseEntity{
         this.delFlag = delFlag;
     }
 
+    public Long getHandsOnId() {
+        return handsOnId;
+    }
 
+    public void setHandsOnId(Long handsOnId) {
+        this.handsOnId = handsOnId;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -9,7 +10,9 @@ import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointDao;
 import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePoint;
+import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePointRelation;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointQuery;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointRelationQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
@@ -22,6 +25,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 知识点 Service
@@ -35,6 +39,7 @@ import java.util.List;
 public class TeacherOpenCourseKnowledgePointService extends CoreBaseService<TeacherOpenCourseKnowledgePoint> implements DeleteResourcesBy{
 
     @Autowired private TeacherOpenCourseKnowledgePointDao teacherOpenCourseKnowledgePointDao;
+    @Autowired private TeacherOpenCourseKnowledgePointRelationService relationService;
 
     public PageQuery<TeacherOpenCourseKnowledgePoint>queryByCondition(PageQuery query){
         PageQuery ret =  teacherOpenCourseKnowledgePointDao.queryByCondition(query);
@@ -44,7 +49,23 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseService<Teac
 
     public PageQuery<TeacherOpenCourseKnowledgePoint>queryByConditionQuery(PageQuery query){
         PageQuery ret =  teacherOpenCourseKnowledgePointDao.queryByConditionQuery(query);
-        queryListAfter(ret.getList());
+        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) {
+                TeacherOpenCourseKnowledgePointRelation relation = openCourseKnowledgePointRelations.stream().filter(v ->
+                        v.getTeacherOpenCourseKnowledgePointId().equals(teacherOpenCourseKnowledgePoint.getTeacherOpenCourseKnowledgePointId())).findFirst().orElse(null);
+                if (relation != null) {
+                    teacherOpenCourseKnowledgePoint.setHandsOnId(relation.getBussinessId());
+                }
+            }
+
+        }
+
+        queryListAfter(list);
         return ret;
     }