老师课程设置-系统导入列表 授权课程、开课课程

web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java

@@ -4,7 +4,6 @@ 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;
@@ -13,7 +12,6 @@ import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources
 import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
 import com.ibeetl.jlw.web.query.CourseInfoQuery;
 import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
-import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.core.SQLReady;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
@@ -41,7 +39,8 @@ import static java.util.stream.Collectors.groupingBy;
 @Transactional
 public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends CoreBaseService<UniversitiesCollegesJurisdictionCurriculumResources> {
 
-    @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesDao universitiesCollegesJurisdictionCurriculumResourcesDao;
+    @Autowired
+    private UniversitiesCollegesJurisdictionCurriculumResourcesDao universitiesCollegesJurisdictionCurriculumResourcesDao;
 //    @Autowired private SQLManager sqlManager;
 
     public PageQuery<UniversitiesCollegesJurisdictionCurriculumResources> queryByCondition(PageQuery query) {
@@ -86,6 +85,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
 
     /**
      * 通过机构ID获取授权的课程信息
+     *
      * @param orgId
      * @return
      */
@@ -96,6 +96,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
 
     /**
      * 通过机构ID获取授权的课程信息
+     *
      * @param orgId
      * @return
      */
@@ -106,6 +107,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
 
     /**
      * 通过传入的用户（机构ID），获取授权的课程信息
+     *
      * @param coreUser
      * @return
      */
@@ -116,6 +118,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
 
     /**
      * 通过传入的用户（机构ID），获取授权的课程信息
+     *
      * @param coreUser
      * @return
      */
@@ -127,6 +130,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
     /**
      * 通过传入的用户（机构ID），获取授权的课程信息
      * 获取这个机构，所授权的所有课程。
+     *
      * @param coreUser
      * @return
      */
@@ -138,6 +142,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
     /**
      * 通过传入的用户（机构ID），获取授权的课程信息
      * 获取这个机构，所授权的所有课程。 不包含考证课程类的
+     *
      * @param orgId
      * @return
      */
@@ -145,9 +150,11 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
     public String getAllAuthCourseInfoStrByOrgId(Long orgId) {
         return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId);
     }
+
     /**
      * 通过传入的用户（机构ID），获取授权的课程信息
      * 获取这个机构，所授权的所有课程。所有授权课程  不包含考证课程类的
+     *
      * @param coreUser
      * @return
      */
@@ -159,6 +166,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
     /**
      * 通过传入的用户（机构ID），获取授权的课程信息
      * 获取这个机构，所授权的所有课程。所有授权课程 不包含考证课程类的
+     *
      * @param orgId
      * @return
      */
@@ -170,8 +178,9 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
     /**
      * 获取所有授权的课程
      * 应用课程类、理论课程类、考证课程类（不需要授权默认可以查询所有的）
-     *
+     * <p>
      * ResourcesCourseInfoAuthDetailsVO 里面，判断了orgId 是否是超管
+     *
      * @return
      */
 //    @Cacheable(value = "cache:core:getResourcesCourseInfoAuthDetails", key="#orgId", cacheManager="cacheManager1Hour")
@@ -225,6 +234,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
 
     /**
      * 获取过期的所有授权
+     *
      * @return
      */
     public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthUnUpdateStatus() {
@@ -239,6 +249,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
 
     /**
      * 老师课程设置-系统导入列表
+     *
      * @param orgId
      * @param courseType
      */
@@ -260,12 +271,11 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
         }
 
         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 ->{
+            List<UniversitiesCollegesJurisdictionCurriculumResources> curriculumResources = sqlManager.lambdaQuery(UniversitiesCollegesJurisdictionCurriculumResources.class)
+                    .andEq(UniversitiesCollegesJurisdictionCurriculumResources::getOrgId, orgId).select();
+
+            curriculumResources.forEach(item -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("courseInfoName", item.getCourseInfoName());
                 map.put("courseInfoId", item.getCourseInfoId());

web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java

@@ -267,7 +267,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{
     }
 
     /**
-     *  老师课程设置-系统导入列表
+     *  老师课程设置-系统导入列表  授权课程、开课课程
      * @param coreUser
      * @param courseType
      */