tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
xuliangtong 2 years ago
parent ba9ddfe473 028e9a0f2f
commit 4308aa4bc3
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java
Unescape Escape View File

@ -78,6 +78,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated
public List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId){ public List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId){
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId);
} }
@ -87,6 +88,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated
public String getAuthCourseInfoStrByOrgId(Long orgId){ public String getAuthCourseInfoStrByOrgId(Long orgId){
return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId); return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId);
} }
@ -96,6 +98,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated
public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser){ public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser){
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId()); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId());
} }
@ -105,6 +108,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated
public String getAuthCourseInfoStrByCoreUser(CoreUser coreUser){ public String getAuthCourseInfoStrByCoreUser(CoreUser coreUser){
return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId()), CourseInfo::getCourseInfoId); return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId()), CourseInfo::getCourseInfoId);
} }
@ -115,6 +119,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated
public String getAllAuthCourseInfoStrByCoreUser(CoreUser coreUser){ public String getAllAuthCourseInfoStrByCoreUser(CoreUser coreUser){
return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId()), CourseInfo::getCourseInfoId); return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId()), CourseInfo::getCourseInfoId);
} }
@ -125,6 +130,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated
public String getAllAuthCourseInfoStrByOrgId(Long orgId){ public String getAllAuthCourseInfoStrByOrgId(Long orgId){
return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId); return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId);
} }
@ -134,6 +140,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated
public List<CourseInfo> getAllAuthCourseInfoByCoreUser(CoreUser coreUser){ public List<CourseInfo> getAllAuthCourseInfoByCoreUser(CoreUser coreUser){
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId()); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId());
} }
@ -144,6 +151,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated
public List<CourseInfo> getAllAuthCourseInfoByOrgId(Long orgId){ public List<CourseInfo> getAllAuthCourseInfoByOrgId(Long orgId){
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId);
} }

6
web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
Unescape Escape View File

@ -16,6 +16,7 @@ import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.vo.ImportQuestionByWordTemplateResultVO; import com.ibeetl.jlw.entity.vo.ImportQuestionByWordTemplateResultVO;
import com.ibeetl.jlw.entity.vo.QuestionTypeCountVO; import com.ibeetl.jlw.entity.vo.QuestionTypeCountVO;
import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
import com.ibeetl.jlw.enums.AddTypeEnum; import com.ibeetl.jlw.enums.AddTypeEnum;
import com.ibeetl.jlw.enums.MatchTypeEnum; import com.ibeetl.jlw.enums.MatchTypeEnum;
import com.ibeetl.jlw.enums.QuestionBusinessTypeEnum; import com.ibeetl.jlw.enums.QuestionBusinessTypeEnum;
@ -165,8 +166,9 @@ public class ResourcesQuestionController{
// 理论课程：授权表universities_colleges_jurisdiction_curriculum_resources，查询理论课程授权给院校的数据 // 理论课程：授权表universities_colleges_jurisdiction_curriculum_resources，查询理论课程授权给院校的数据
// 考证类课程：查询，不需要二次授权 // 考证类课程：查询，不需要二次授权
Serializable courseInfoIds = defaultIfNull(condition.getCourseInfoId(), condition.getCourseInfoIds()); Serializable courseInfoIds = defaultIfNull(condition.getCourseInfoId(), condition.getCourseInfoIds());
Serializable ifNullCourseInfoIds = defaultIfNull(courseInfoIds, ResourcesCourseInfoAuthDetailsVO resourcesCourseInfoAuthDetails =
universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoStrByOrgId(coreUser.getOrgId())); universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId());
Serializable ifNullCourseInfoIds = defaultIfNull(courseInfoIds, resourcesCourseInfoAuthDetails.getAllAuthCourseInfoIds());
// 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。 // 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。
condition.setCourseInfoIds(StrUtil.blankToDefault(String.valueOf(ifNullCourseInfoIds), "未授权应用")); condition.setCourseInfoIds(StrUtil.blankToDefault(String.valueOf(ifNullCourseInfoIds), "未授权应用"));

49
web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java
Unescape Escape View File

@ -1,9 +1,6 @@
package com.ibeetl.jlw.web; package com.ibeetl.jlw.web;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.jlw.Interceptor.SCoreUser; import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig; import cn.jlw.validate.ValidateConfig;
@ -19,7 +16,6 @@ import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService; import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
import com.ibeetl.jlw.service.UniversitiesCollegesService; import com.ibeetl.jlw.service.UniversitiesCollegesService;
import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.core.engine.PageQuery;
@ -29,7 +25,6 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@ -223,28 +218,28 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{
return JsonResult.success(); return JsonResult.success();
} }
/** // /**
* 查询该机构下所有授权的课程。包含系统本身可以查看的课程 // * 查询该机构下所有授权的课程。包含系统本身可以查看的课程
* @param orgId // * @param orgId
* @param coreUser // * @param coreUser
* @return // * @return
*/ // */
@PostMapping(MODEL + "/getAllAuthCourseInfoByOrgId.json") // @PostMapping(MODEL + "/getAllAuthCourseInfoByOrgId.json")
@ResponseBody // @ResponseBody
public JsonResult getAllAuthCourseInfoByOrgId(@RequestParam(required = false) Long orgId, @RequestParam(required = false) Long universitiesCollegesId, String applicationIds, @SCoreUser CoreUser coreUser){ // public JsonResult getAllAuthCourseInfoByOrgId(@RequestParam(required = false) Long orgId, @RequestParam(required = false) Long universitiesCollegesId, String applicationIds, @SCoreUser CoreUser coreUser){
//
Assert.isFalse(ObjectUtil.isAllEmpty(orgId, universitiesCollegesId), "orgId（机构ID）或universitiesCollegesId （院校ID）不能同时为空！"); // Assert.isFalse(ObjectUtil.isAllEmpty(orgId, universitiesCollegesId), "orgId（机构ID）或universitiesCollegesId （院校ID）不能同时为空！");
//
if (orgId == null) { // if (orgId == null) {
UniversitiesCollegesQuery universitiesCollegesQuery = new UniversitiesCollegesQuery(); // UniversitiesCollegesQuery universitiesCollegesQuery = new UniversitiesCollegesQuery();
universitiesCollegesQuery.setUniversitiesCollegesId(universitiesCollegesId); // universitiesCollegesQuery.setUniversitiesCollegesId(universitiesCollegesId);
universitiesCollegesQuery.setUniversitiesCollegesStatus(1); // universitiesCollegesQuery.setUniversitiesCollegesStatus(1);
UniversitiesColleges universitiesColleges = CollectionUtil.getFirst(universitiesCollegesService.getValuesByQuery(universitiesCollegesQuery)); // UniversitiesColleges universitiesColleges = CollectionUtil.getFirst(universitiesCollegesService.getValuesByQuery(universitiesCollegesQuery));
orgId = universitiesColleges.getOrgId(); // orgId = universitiesColleges.getOrgId();
} // }
//
return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoStrByOrgId(orgId)); // return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoStrByOrgId(orgId));
} // }
/** /**
* 获取所有授权的课程 * 获取所有授权的课程

Write Preview
Loading…
Cancel
Save