From a16127f5401331a8b4f1058fb25b418240cd53d3 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sun, 12 Feb 2023 22:07:21 +0800 Subject: [PATCH] 1 --- ...ollegesJurisdictionCurriculumResourcesDao.java | 12 ++++++++++-- ...gesJurisdictionCurriculumResourcesService.java | 2 ++ .../ibeetl/jlw/web/ResourcesInfoController.java | 2 ++ .../ibeetl/jlw/web/query/SchoolClassQuery.java | 15 +++++++++++++++ web/src/main/resources/sql/jlw/schoolClass.md | 6 ++++++ ...tiesCollegesJurisdictionCurriculumResources.md | 9 ++++++++- 6 files changed, 43 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java index f78d7224..44940373 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -25,4 +26,11 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends @Update void deleteByUniversitiesCollegesId(Long universitiesCollegesId); List getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery universitiesCollegesJurisdictionCurriculumResourcesQuery); + + /** + * 获取授权的课程列表，根据系统用户 + * @param coreUser + * @return + */ + List getAuthCourseInfo(CoreUser coreUser); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java index 44418fbb..80a0c3dc 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -58,4 +58,6 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends public List getValues (Object paras){ return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"),UniversitiesCollegesJurisdictionCurriculumResources.class,paras); } + + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java index ad9b611f..1bccd48b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java @@ -144,7 +144,9 @@ public class ResourcesInfoController{ if (coreUser.isUniAdmin()) { condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L, null).toArray(), ",")); + condition.setCourseInfoIds(); } + resourcesInfoService.queryByCondition(page); return JsonResult.success(page); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java index 16c6fa1d..d7d29b1b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java @@ -3,6 +3,7 @@ package com.ibeetl.jlw.web.query; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.SchoolClass; +import com.ibeetl.jlw.web.SchoolClassController; import java.util.Date; @@ -30,6 +31,12 @@ public class SchoolClassQuery extends PageParam { private Long orgId; @Query(name = "后台用户ID", display = false) private Long userId; + /** + * 通过教师查询指定的班级，目前只有{@link SchoolClassController#getValues} + * 在用 + */ + @Query(name = "教师ID", display = false) + private Long teacherId; public Long getClassId(){ return classId; } @@ -95,6 +102,14 @@ public class SchoolClassQuery extends PageParam { this.universityFacultyId = universityFacultyId; } + public Long getTeacherId() { + return teacherId; + } + + public void setTeacherId(Long teacherId) { + this.teacherId = teacherId; + } + public SchoolClass pojo(){ SchoolClass pojo = new SchoolClass(); pojo.setClassId(this.getClassId()); diff --git a/web/src/main/resources/sql/jlw/schoolClass.md b/web/src/main/resources/sql/jlw/schoolClass.md index 6a5374c3..4254690e 100644 --- a/web/src/main/resources/sql/jlw/schoolClass.md +++ b/web/src/main/resources/sql/jlw/schoolClass.md @@ -91,6 +91,12 @@ getSchoolClassValues @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(teacherId)){ + and t.universities_colleges_id = + (select universities_colleges_id from teacher where + teacher_id = #teacherId# and teacher_status = 1 + order by add_time desc limit 1) + @} getValuesByQuery diff --git a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md index 9908d695..3ea93e4d 100644 --- a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md +++ b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md @@ -204,4 +204,11 @@ getAllByQuery @} @if(!isEmpty(universitiesCollegesJurisdictionExperimentalSystemId)){ and t.universities_colleges_jurisdiction_experimental_system_id =#universitiesCollegesJurisdictionExperimentalSystemId# - @} \ No newline at end of file + @} + +getAuthCourseInfo +=== +* 获取授权的课程列表，根据系统用户 + + select * from + \ No newline at end of file