From 0d5955f61c795d2063cf0d4ad97e2c9dd45e37bb Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Sun, 23 Apr 2023 20:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=AF=BE=E7=A8=8B=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE-=E7=B3=BB=E7=BB=9F=E5=AF=BC=E5=85=A5=E5=88=97?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...urisdictionCurriculumResourcesService.java | 39 +++++++++++++++++++
...sdictionCurriculumResourcesController.java | 19 +++++++++
2 files changed, 58 insertions(+)
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<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays, Long orgId) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, orgId);
}
+
+ /**
+ * 老师课程设置-系统导入列表
+ * @param orgId
+ * @param courseType
+ */
+ public List<Map<String,Object>> getTheoryAddOpenCourseList(Long orgId,Integer courseType){
+ List<Map<String,Object>> theoryCourseList = new ArrayList<>();
+ if (ObjectUtil.equal(courseType,0) || ObjectUtil.isNull(courseType)){
+ List<TeacherOpenCourse> teacherCourseList = sqlManager.lambdaQuery(TeacherOpenCourse.class)
+ .andEq(TeacherOpenCourse::getOrgId, orgId)
+ .andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1)
+ .select();
+
+ teacherCourseList.forEach(item ->{
+ Map<String,Object> 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<CourseInfo> courseInfoList = sqlManager.lambdaQuery(CourseInfo.class)
+ .andEq(CourseInfo::getOrgId, orgId)
+ .andEq(CourseInfo::getCourseInfoStatus, 1)
+ .select();
+
+ courseInfoList.forEach(item ->{
+ Map<String,Object> 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<ResourcesCourseInfoAuthDetailsVO> getAuthDetailsByCacheUser(@SCoreUser CoreUser coreUser) {
return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId()));
}
+
+ /**
+ * 老师课程设置-系统导入列表
+ * @param coreUser
+ * @param courseType
+ */
+ @GetMapping(MODEL + "/getTheoryAddOpenCourseList.json")
+ @ResponseBody
+ public JsonResult<List<Map<String,Object>>> 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));
+ }
}