diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java index aa4ed8e5..e5e03ccf 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java @@ -3,6 +3,10 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.InsertIgnore; +import org.beetl.sql.annotation.entity.UpdateIgnore; +import org.beetl.sql.fetch.annotation.Fetch; +import org.beetl.sql.fetch.annotation.FetchSql; import javax.validation.constraints.NotNull; import java.util.Date; @@ -11,6 +15,7 @@ import java.util.Date; * 院校权限管理 - 课程资源 * gen by Spring Boot2 Admin 2021-07-20 */ +@Fetch public class UniversitiesCollegesJurisdictionCurriculumResources extends BaseEntity{ //ID @@ -69,6 +74,11 @@ public class UniversitiesCollegesJurisdictionCurriculumResources extends BaseEnt private Long universitiesCollegesJurisdictionExperimentalSystemId ;//暂时无用 private Long courseInfoId ;//课程ID + + @UpdateIgnore + @InsertIgnore + @FetchSql("select course_info_name from course_info t where t.course_info_id = #courseInfoId# and course_info_status = 1") + private String courseInfoName; public UniversitiesCollegesJurisdictionCurriculumResources(){ } @@ -249,4 +259,13 @@ public class UniversitiesCollegesJurisdictionCurriculumResources extends BaseEnt public void setCourseInfoId(Long courseInfoId) { this.courseInfoId = courseInfoId; } + + + public String getCourseInfoName() { + return courseInfoName; + } + + public void setCourseInfoName(String courseInfoName) { + this.courseInfoName = courseInfoName; + } } 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 1bf7a611..47600042 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java @@ -1,10 +1,13 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; 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.UniversitiesColleges; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; @@ -24,7 +27,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import java.util.List; +import java.util.stream.Collectors; +import static cn.hutool.core.date.DateTime.now; import static cn.hutool.core.util.ObjectUtil.defaultIfNull; /** @@ -47,9 +52,26 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{ @Autowired private UniversitiesCollegesService universitiesCollegesService; + @Autowired + private CorePlatformService corePlatformService; /* 前端接口 */ + @GetMapping(API + "/getImportCourseList.do") + @ResponseBody + public JsonResult>getValuesDo(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param, @SCoreUser CoreUser coreUser) { + UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); + if (uc != null) { + param.setUniversitiesCollegesId(uc.getUniversitiesCollegesId()); + } + List list = universitiesCollegesJurisdictionCurriculumResourcesService.getValues(param); + + // 只过滤授权给当前院校的,且课程状态正常的。 + List result = list.stream().filter( + item -> DateUtil.isIn(item.getUseStartTime(), item.getUseEndTime(), now()) && StrUtil.isNotBlank(item.getCourseInfoName())) + .collect(Collectors.toList()); + return JsonResult.success(result); + } /* 后台页面 */