From abe9e12eee579a992a512160e6b85e4087295356 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Thu, 22 Dec 2022 20:10:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherOpenCourseKnowledgePoint.java | 19 ++++++++++++--- ...eacherOpenCourseKnowledgePointService.java | 23 ++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseKnowledgePoint.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseKnowledgePoint.java index cd4fa9ab..3e15e7a6 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseKnowledgePoint.java +++ b/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; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java index 735d1907..27d75d22 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java +++ b/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 implements DeleteResourcesBy{ @Autowired private TeacherOpenCourseKnowledgePointDao teacherOpenCourseKnowledgePointDao; + @Autowired private TeacherOpenCourseKnowledgePointRelationService relationService; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = teacherOpenCourseKnowledgePointDao.queryByCondition(query); @@ -44,7 +49,23 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseServicequeryByConditionQuery(PageQuery query){ PageQuery ret = teacherOpenCourseKnowledgePointDao.queryByConditionQuery(query); - queryListAfter(ret.getList()); + List list = ret.getList(); + if (CollectionUtil.isNotEmpty(list)) { + List collect = list.stream().map(TeacherOpenCourseKnowledgePoint::getTeacherOpenCourseKnowledgePointId).collect(Collectors.toList()); + TeacherOpenCourseKnowledgePointRelationQuery relationQuery = new TeacherOpenCourseKnowledgePointRelationQuery(); + relationQuery.setTeacherOpenCourseKnowledgePointIdPlural(CollectionUtil.join(collect, ",")); + List 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; } From 62bbd93f2d75debd84f013b91c7b21f6a7b6a6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Fri, 23 Dec 2022 01:50:22 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/other/userCenter.html | 148 ++++++++++++------ 1 file changed, 104 insertions(+), 44 deletions(-) diff --git a/web/src/main/resources/templates/other/userCenter.html b/web/src/main/resources/templates/other/userCenter.html index 5deae744..96076c35 100644 --- a/web/src/main/resources/templates/other/userCenter.html +++ b/web/src/main/resources/templates/other/userCenter.html @@ -72,7 +72,7 @@
********
- +
@@ -116,7 +116,7 @@
${userCenterData.universitiesColleges.universitiesCollegesName!''}
-
+