授权课程

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<UniversitiesCollegesJurisdictionCurriculumResources> getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery universitiesCollegesJurisdictionCurriculumResourcesQuery);
+    List<UniversitiesCollegesJurisdictionCurriculumResources> getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery query);
+    List<CourseInfo> getAllAuthCourseByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery query);
 
     /**
      * 获取授权的课程列表，根据系统用户

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

@@ -57,6 +57,10 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
         return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllByQuery(universitiesCollegesJurisdictionCurriculumResourcesQuery);
     }
 
+    public List<CourseInfo> getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param, Boolean b) {
+        return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseByQuery(param);
+    }
+
     public List<UniversitiesCollegesJurisdictionCurriculumResources> getValues (Object paras){
         return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"),UniversitiesCollegesJurisdictionCurriculumResources.class,paras);
     }
@@ -68,5 +72,4 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
     public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser){
         return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId());
     }
-
 }

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 PageQuery<UniversitiesCollegesJurisdictionExperimentalSystem>queryByCondition(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<UniversitiesCollegesJurisdictionExperimentalSystemQuery> 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<UniversitiesCollegesJurisdictionExperimentalSystem> universitiesCollegesJurisdictionExperimentalSystemList = new ArrayList<>();
         for(int i=0;i<usList.size();i++){
             UniversitiesCollegesJurisdictionExperimentalSystem pojo = new UniversitiesCollegesJurisdictionExperimentalSystem();
-            pojo.setUniversitiesCollegesId(uQuery.getUniversitiesCollegesId());
+            pojo.setUniversitiesCollegesId(universitiesCollegesId);
             pojo.setType(usList.get(i).getType());
             pojo.setTypeId(usList.get(i).getTypeId());
             pojo.setUseType(usList.get(i).getUseType());
@@ -112,12 +117,12 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C
         ToolUtils.deleteNullList(urList);
         if(null != urList && urList.size()>0){
             //删掉旧的
-            universitiesCollegesJurisdictionCurriculumResourcesService.deleteByUniversitiesCollegesId(uQuery.getUniversitiesCollegesId());
+            universitiesCollegesJurisdictionCurriculumResourcesService.deleteByUniversitiesCollegesId(universitiesCollegesId);
         }
         List<UniversitiesCollegesJurisdictionCurriculumResources> universitiesCollegesJurisdictionCurriculumResourcesList = new ArrayList<>();
         for(int i=0;i<urList.size();i++){
             UniversitiesCollegesJurisdictionCurriculumResources pojo = new UniversitiesCollegesJurisdictionCurriculumResources();
-            pojo.setUniversitiesCollegesId(uQuery.getUniversitiesCollegesId());
+            pojo.setUniversitiesCollegesId(universitiesCollegesId);
             pojo.setType(urList.get(i).getType());
             pojo.setTypeId(urList.get(i).getTypeId());
             pojo.setUseType(urList.get(i).getUseType());
@@ -125,8 +130,9 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C
             pojo.setUseEndTime(TimeTool.getTime(urList.get(i).getUseEndTime()));
             pojo.setSecondLevelName(urList.get(i).getSecondLevelName());
             pojo.setSecondLevelLogo(urList.get(i).getSecondLevelLogo());
-            pojo.setAddTime(urList.get(i).getAddTime());
+            pojo.setAddTime(defaultIfNull(urList.get(i).getAddTime(), now()));
             pojo.setCourseInfoId(urList.get(i).getCourseInfoId());
+            pojo.setOrgId(uc.getOrgId());
             universitiesCollegesJurisdictionCurriculumResourcesList.add(pojo);
         }
         if(universitiesCollegesJurisdictionCurriculumResourcesList.size()>0){

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<List<UniversitiesCollegesJurisdictionCurriculumResources>>getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param) {
         List<UniversitiesCollegesJurisdictionCurriculumResources>list = universitiesCollegesJurisdictionCurriculumResourcesService.getAllByQuery(param);
         return  JsonResult.success(list);
     }
 
+    @GetMapping(MODEL + "/getAllByQuery.json")
+    @ResponseBody
+    public JsonResult<List<CourseInfo>> getAllAuthCourseByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param) {
+        List<CourseInfo>list = universitiesCollegesJurisdictionCurriculumResourcesService.getAllByQuery(param, true);
+        return  JsonResult.success(list);
+    }
+
     @PostMapping(MODEL + "/list.json")
     @Function("universitiesCollegesJurisdictionCurriculumResources.query")
     @ResponseBody

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
 ===
 * 获取授权的课程列表，根据系统用户