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 7d08e7b9..eea65d3e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -24,7 +24,8 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends void deleteUniversitiesCollegesJurisdictionCurriculumResourcesByIds(String ids); @Update void deleteByUniversitiesCollegesId(Long universitiesCollegesId); - List getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery universitiesCollegesJurisdictionCurriculumResourcesQuery); + List getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery query); + List getAllAuthCourseByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery query); /** * 获取授权的课程列表,根据系统用户 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 93e3e30a..e7322f9c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -57,6 +57,10 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllByQuery(universitiesCollegesJurisdictionCurriculumResourcesQuery); } + public List getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param, Boolean b) { + return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseByQuery(param); + } + public List getValues (Object paras){ return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"),UniversitiesCollegesJurisdictionCurriculumResources.class,paras); } @@ -68,5 +72,4 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends public List getAuthCourseInfoByCoreUser(CoreUser coreUser){ return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId()); } - } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java index c26ef766..d6d74486 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java @@ -9,6 +9,7 @@ import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao; +import com.ibeetl.jlw.entity.UniversitiesColleges; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; @@ -23,9 +24,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; - - - +import static cn.hutool.core.date.DateTime.now; +import static cn.hutool.core.util.ObjectUtil.defaultIfNull; /** @@ -39,6 +39,8 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C @Autowired private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao; @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = universitiesCollegesJurisdictionExperimentalSystemDao.queryByCondition(query); @@ -63,10 +65,13 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C } public JsonResult addAll(UniversitiesCollegesJurisdictionExperimentalSystemQuery uQuery){ - if(null == uQuery.getUniversitiesCollegesId()){ + Long universitiesCollegesId = uQuery.getUniversitiesCollegesId(); + if(null == universitiesCollegesId){ return JsonResult.failMessage("请选择学院"); } + UniversitiesColleges uc = universitiesCollegesService.queryById(universitiesCollegesId); + Date date = new Date(); List usList = new ArrayList<>(); @@ -80,12 +85,12 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C ToolUtils.deleteNullList(usList); if(null != usList && usList.size()>0){ //删掉旧的 - this.deleteByUniversitiesCollegesId(uQuery.getUniversitiesCollegesId()); + this.deleteByUniversitiesCollegesId(universitiesCollegesId); } List universitiesCollegesJurisdictionExperimentalSystemList = new ArrayList<>(); for(int i=0;i0){ //删掉旧的 - universitiesCollegesJurisdictionCurriculumResourcesService.deleteByUniversitiesCollegesId(uQuery.getUniversitiesCollegesId()); + universitiesCollegesJurisdictionCurriculumResourcesService.deleteByUniversitiesCollegesId(universitiesCollegesId); } List universitiesCollegesJurisdictionCurriculumResourcesList = new ArrayList<>(); for(int i=0;i0){ diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java index 47600042..86c2aecb 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java @@ -9,6 +9,7 @@ import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.UniversitiesColleges; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService; @@ -106,13 +107,20 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{ /* 后台接口 */ //用于权限管理 - @GetMapping(MODEL + "/getAllByQuery.json") + @GetMapping(MODEL + "/getAllByQuery_old.json") @ResponseBody public JsonResult>getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param) { Listlist = universitiesCollegesJurisdictionCurriculumResourcesService.getAllByQuery(param); return JsonResult.success(list); } + @GetMapping(MODEL + "/getAllByQuery.json") + @ResponseBody + public JsonResult> getAllAuthCourseByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param) { + Listlist = universitiesCollegesJurisdictionCurriculumResourcesService.getAllByQuery(param, true); + return JsonResult.success(list); + } + @PostMapping(MODEL + "/list.json") @Function("universitiesCollegesJurisdictionCurriculumResources.query") @ResponseBody diff --git a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md index e84d0fcc..0cd3976e 100644 --- a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md +++ b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md @@ -136,7 +136,6 @@ getUniversitiesCollegesJurisdictionCurriculumResourcesValues and t.universities_colleges_jurisdiction_experimental_system_id =#universitiesCollegesJurisdictionExperimentalSystemId# @} - getAllByQuery === @@ -146,7 +145,7 @@ getAllByQuery from ( SELECT - t.course_info_name,t.course_info_id, + t.course_info_name, t.course_info_id, b.universities_colleges_jurisdiction_curriculum_resources_id, b.universities_colleges_id, b.universities_colleges_jurisdiction_experimental_system_id, @@ -206,6 +205,13 @@ getAllByQuery and t.universities_colleges_jurisdiction_experimental_system_id =#universitiesCollegesJurisdictionExperimentalSystemId# @} +getAllAuthCourseByQuery +=== +* 根据不为空的参数进行查询 + + #use("getAllByQuery")# + + getAuthCourseInfoByOrgId === * 获取授权的课程列表,根据系统用户