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 1128f0e3..5be6dabf 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -1,8 +1,10 @@ package com.ibeetl.jlw.service; +import cn.hutool.core.util.ObjectUtil; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.dao.CourseInfoDao; import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao; import com.ibeetl.jlw.entity.CourseInfo; @@ -234,4 +236,41 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends public List getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays, Long orgId) { return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, orgId); } + + /** + * 老师课程设置-系统导入列表 + * @param orgId + * @param courseType + */ + public List> getTheoryAddOpenCourseList(Long orgId,Integer courseType){ + List> theoryCourseList = new ArrayList<>(); + if (ObjectUtil.equal(courseType,0) || ObjectUtil.isNull(courseType)){ + List teacherCourseList = sqlManager.lambdaQuery(TeacherOpenCourse.class) + .andEq(TeacherOpenCourse::getOrgId, orgId) + .andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1) + .select(); + + teacherCourseList.forEach(item ->{ + Map map = new HashMap<>(); + map.put("courseInfoName",item.getTeacherOpenCourseTitle()); + map.put("courseInfoId",item.getTeacherOpenCourseId()); + theoryCourseList.add(map); + }); + } + + if (ObjectUtil.equal(courseType,1) || ObjectUtil.isNull(courseType)){ + List courseInfoList = sqlManager.lambdaQuery(CourseInfo.class) + .andEq(CourseInfo::getOrgId, orgId) + .andEq(CourseInfo::getCourseInfoStatus, 1) + .select(); + + courseInfoList.forEach(item ->{ + Map map = new HashMap<>(); + map.put("courseInfoName",item.getCourseInfoName()); + map.put("courseInfoId",item.getCourseInfoId()); + theoryCourseList.add(map); + }); + } + return theoryCourseList; + } } \ No newline at end of file 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 04d654d2..5bc0bdbc 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java @@ -1,6 +1,7 @@ package com.ibeetl.jlw.web; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; @@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static cn.hutool.core.date.DateTime.now; @@ -263,4 +265,21 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{ public JsonResult getAuthDetailsByCacheUser(@SCoreUser CoreUser coreUser) { return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId())); } + + /** + * 老师课程设置-系统导入列表 + * @param coreUser + * @param courseType + */ + @GetMapping(MODEL + "/getTheoryAddOpenCourseList.json") + @ResponseBody + public JsonResult>> getTheoryAddOpenCourseList(@SCoreUser CoreUser coreUser, Integer courseType) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + } + if(ObjectUtil.isNull(coreUser)){ + return JsonResult.failMessage("院校不存在"); + } + return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getTheoryAddOpenCourseList(coreUser.getOrgId(),courseType)); + } }