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

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

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 77c95d15f6
commit fa683d3e6c
2 changed files with 65 additions and 55 deletions
Show Stats Download Patch File Download Diff File

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

@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException; 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.CourseInfoDao;
import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao; import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao;
import com.ibeetl.jlw.entity.CourseInfo; 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.entity.vo.ResourcesCourseInfoAuthDetailsVO;
import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.CourseInfoQuery;
import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
import org.beetl.sql.core.SQLManager;
import org.beetl.sql.core.SQLReady; import org.beetl.sql.core.SQLReady;
import org.beetl.sql.core.SqlId; import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.core.engine.PageQuery;
@ -39,24 +37,25 @@ import static java.util.stream.Collectors.groupingBy;
@Service @Service
@Transactional @Transactional
public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends CoreBaseService<UniversitiesCollegesJurisdictionCurriculumResources>{ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends CoreBaseService<UniversitiesCollegesJurisdictionCurriculumResources> {
@Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesDao universitiesCollegesJurisdictionCurriculumResourcesDao; @Autowired
private UniversitiesCollegesJurisdictionCurriculumResourcesDao universitiesCollegesJurisdictionCurriculumResourcesDao;
// @Autowired private SQLManager sqlManager; // @Autowired private SQLManager sqlManager;
public PageQuery<UniversitiesCollegesJurisdictionCurriculumResources>queryByCondition(PageQuery query){ public PageQuery<UniversitiesCollegesJurisdictionCurriculumResources> queryByCondition(PageQuery query) {
PageQuery ret = universitiesCollegesJurisdictionCurriculumResourcesDao.queryByCondition(query); PageQuery ret = universitiesCollegesJurisdictionCurriculumResourcesDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public PageQuery<CourseInfo> queryAllAuthCourseInfoByCondition(PageQuery query) { public PageQuery<CourseInfo> queryAllAuthCourseInfoByCondition(PageQuery query) {
PageQuery ret = universitiesCollegesJurisdictionCurriculumResourcesDao.queryAllAuthCourseInfoByCondition(query); PageQuery ret = universitiesCollegesJurisdictionCurriculumResourcesDao.queryAllAuthCourseInfoByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public void deleteUniversitiesCollegesJurisdictionCurriculumResources(String ids){ public void deleteUniversitiesCollegesJurisdictionCurriculumResources(String ids) {
try { try {
universitiesCollegesJurisdictionCurriculumResourcesDao.deleteUniversitiesCollegesJurisdictionCurriculumResourcesByIds(ids); universitiesCollegesJurisdictionCurriculumResourcesDao.deleteUniversitiesCollegesJurisdictionCurriculumResourcesByIds(ids);
} catch (Exception e) { } catch (Exception e) {
@ -64,7 +63,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
} }
} }
public void deleteByUniversitiesCollegesId(Long universitiesCollegesId){ public void deleteByUniversitiesCollegesId(Long universitiesCollegesId) {
try { try {
universitiesCollegesJurisdictionCurriculumResourcesDao.deleteByUniversitiesCollegesId(universitiesCollegesId); universitiesCollegesJurisdictionCurriculumResourcesDao.deleteByUniversitiesCollegesId(universitiesCollegesId);
} catch (Exception e) { } catch (Exception e) {
@ -72,7 +71,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
} }
} }
public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery universitiesCollegesJurisdictionCurriculumResourcesQuery){ public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery universitiesCollegesJurisdictionCurriculumResourcesQuery) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllByQuery(universitiesCollegesJurisdictionCurriculumResourcesQuery); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllByQuery(universitiesCollegesJurisdictionCurriculumResourcesQuery);
} }
@ -80,98 +79,108 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseByQuery(param); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseByQuery(param);
} }
public List<UniversitiesCollegesJurisdictionCurriculumResources> getValues (Object paras){ public List<UniversitiesCollegesJurisdictionCurriculumResources> getValues(Object paras) {
return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"),UniversitiesCollegesJurisdictionCurriculumResources.class,paras); return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"), UniversitiesCollegesJurisdictionCurriculumResources.class, paras);
} }
/** /**
* 通过机构ID获取授权的课程信息 * 通过机构ID获取授权的课程信息
*
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated @Deprecated
public List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId){ public List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId);
} }
/** /**
* 通过机构ID获取授权的课程信息 * 通过机构ID获取授权的课程信息
*
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated @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);
} }
/** /**
* 通过传入的用户（机构ID），获取授权的课程信息 * 通过传入的用户（机构ID），获取授权的课程信息
*
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated @Deprecated
public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser){ public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId()); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId());
} }
/** /**
* 通过传入的用户（机构ID），获取授权的课程信息 * 通过传入的用户（机构ID），获取授权的课程信息
*
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated @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);
} }
/** /**
* 通过传入的用户（机构ID），获取授权的课程信息 * 通过传入的用户（机构ID），获取授权的课程信息
* 获取这个机构，所授权的所有课程。 * 获取这个机构，所授权的所有课程。
*
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated @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);
} }
/** /**
* 通过传入的用户（机构ID），获取授权的课程信息 * 通过传入的用户（机构ID），获取授权的课程信息
* 获取这个机构，所授权的所有课程。 不包含考证课程类的 * 获取这个机构，所授权的所有课程。 不包含考证课程类的
*
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated @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);
} }
/** /**
* 通过传入的用户（机构ID），获取授权的课程信息 * 通过传入的用户（机构ID），获取授权的课程信息
* 获取这个机构，所授权的所有课程。所有授权课程 不包含考证课程类的 * 获取这个机构，所授权的所有课程。所有授权课程 不包含考证课程类的
*
* @param coreUser * @param coreUser
* @return * @return
*/ */
@Deprecated @Deprecated
public List<CourseInfo> getAllAuthCourseInfoByCoreUser(CoreUser coreUser){ public List<CourseInfo> getAllAuthCourseInfoByCoreUser(CoreUser coreUser) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId()); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId());
} }
/** /**
* 通过传入的用户（机构ID），获取授权的课程信息 * 通过传入的用户（机构ID），获取授权的课程信息
* 获取这个机构，所授权的所有课程。所有授权课程 不包含考证课程类的 * 获取这个机构，所授权的所有课程。所有授权课程 不包含考证课程类的
*
* @param orgId * @param orgId
* @return * @return
*/ */
@Deprecated @Deprecated
public List<CourseInfo> getAllAuthCourseInfoByOrgId(Long orgId){ public List<CourseInfo> getAllAuthCourseInfoByOrgId(Long orgId) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId);
} }
/** /**
* 获取所有授权的课程 * 获取所有授权的课程
* 应用课程类、理论课程类、考证课程类（不需要授权默认可以查询所有的） * 应用课程类、理论课程类、考证课程类（不需要授权默认可以查询所有的）
* * <p>
* ResourcesCourseInfoAuthDetailsVO 里面，判断了orgId 是否是超管 * ResourcesCourseInfoAuthDetailsVO 里面，判断了orgId 是否是超管
*
* @return * @return
*/ */
// @Cacheable(value = "cache:core:getResourcesCourseInfoAuthDetails", key="#orgId", cacheManager="cacheManager1Hour") // @Cacheable(value = "cache:core:getResourcesCourseInfoAuthDetails", key="#orgId", cacheManager="cacheManager1Hour")
@ -198,12 +207,12 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
ResourcesCourseInfoAuthDetailsVO authDetailsVO = sqlManager.executeQueryOne( ResourcesCourseInfoAuthDetailsVO authDetailsVO = sqlManager.executeQueryOne(
new SQLReady("SELECT ? as org_id", orgId), ResourcesCourseInfoAuthDetailsVO.class); new SQLReady("SELECT ? as org_id", orgId), ResourcesCourseInfoAuthDetailsVO.class);
List<Map<String,Object>> theoryCourseList = new ArrayList<>(); List<Map<String, Object>> theoryCourseList = new ArrayList<>();
authDetailsVO.getTheoryCourseList().forEach(item ->{ authDetailsVO.getTheoryCourseList().forEach(item -> {
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("courseName",item.getCourseInfoName()); map.put("courseName", item.getCourseInfoName());
map.put("courseId",item.getCourseInfoId()); map.put("courseId", item.getCourseInfoId());
map.put("courseType",1); map.put("courseType", 1);
theoryCourseList.add(map); theoryCourseList.add(map);
}); });
@ -211,11 +220,11 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
.andEq(TeacherOpenCourse::getOrgId, orgId) .andEq(TeacherOpenCourse::getOrgId, orgId)
.andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1) .andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1)
.select(); .select();
teacherOpenCourseList.forEach(item ->{ teacherOpenCourseList.forEach(item -> {
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("courseName",item.getTeacherOpenCourseTitle()); map.put("courseName", item.getTeacherOpenCourseTitle());
map.put("courseId",item.getTeacherOpenCourseId()); map.put("courseId", item.getTeacherOpenCourseId());
map.put("courseType",0); map.put("courseType", 0);
theoryCourseList.add(map); theoryCourseList.add(map);
}); });
authDetailsVO.setTheoryAddOpenCourseList(theoryCourseList); authDetailsVO.setTheoryAddOpenCourseList(theoryCourseList);
@ -225,51 +234,52 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
/** /**
* 获取过期的所有授权 * 获取过期的所有授权
*
* @return * @return
*/ */
public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthUnUpdateStatus(){ public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthUnUpdateStatus() {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthUnUpdateStatus(); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthUnUpdateStatus();
} }
@Cacheable(value = "cache:core:resources:getAllOverdueAuthByBeforeAndAfterDays", key = "#orgId", unless="#result == null || #result.size() == 0", cacheManager = "cacheManager1Hour") @Cacheable(value = "cache:core:resources:getAllOverdueAuthByBeforeAndAfterDays", key = "#orgId", unless = "#result == null || #result.size() == 0", cacheManager = "cacheManager1Hour")
public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays, Long orgId) { public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays, Long orgId) {
return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, orgId); return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, orgId);
} }
/** /**
* 老师课程设置-系统导入列表 * 老师课程设置-系统导入列表
*
* @param orgId * @param orgId
* @param courseType * @param courseType
*/ */
public List<Map<String,Object>> getTheoryAddOpenCourseList(Long orgId,Integer courseType){ public List<Map<String, Object>> getTheoryAddOpenCourseList(Long orgId, Integer courseType) {
List<Map<String,Object>> theoryCourseList = new ArrayList<>(); List<Map<String, Object>> theoryCourseList = new ArrayList<>();
if (ObjectUtil.equal(courseType,0) || ObjectUtil.isNull(courseType)){ if (ObjectUtil.equal(courseType, 0) || ObjectUtil.isNull(courseType)) {
List<TeacherOpenCourse> teacherCourseList = sqlManager.lambdaQuery(TeacherOpenCourse.class) List<TeacherOpenCourse> teacherCourseList = sqlManager.lambdaQuery(TeacherOpenCourse.class)
.andEq(TeacherOpenCourse::getOrgId, orgId) .andEq(TeacherOpenCourse::getOrgId, orgId)
.andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1) .andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1)
.select(); .select();
teacherCourseList.forEach(item ->{ teacherCourseList.forEach(item -> {
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("courseInfoName",item.getTeacherOpenCourseTitle()); map.put("courseInfoName", item.getTeacherOpenCourseTitle());
map.put("courseInfoId",item.getTeacherOpenCourseId()); map.put("courseInfoId", item.getTeacherOpenCourseId());
map.put("courseType",0); map.put("courseType", 0);
theoryCourseList.add(map); theoryCourseList.add(map);
}); });
} }
if (ObjectUtil.equal(courseType,1) || ObjectUtil.isNull(courseType)){ if (ObjectUtil.equal(courseType, 1) || ObjectUtil.isNull(courseType)) {
List<CourseInfo> courseInfoList = sqlManager.lambdaQuery(CourseInfo.class)
.andEq(CourseInfo::getOrgId, orgId) List<UniversitiesCollegesJurisdictionCurriculumResources> curriculumResources = sqlManager.lambdaQuery(UniversitiesCollegesJurisdictionCurriculumResources.class)
.andEq(CourseInfo::getCourseInfoStatus, 1) .andEq(UniversitiesCollegesJurisdictionCurriculumResources::getOrgId, orgId).select();
.select();
courseInfoList.forEach(item ->{ curriculumResources.forEach(item -> {
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("courseInfoName",item.getCourseInfoName()); map.put("courseInfoName", item.getCourseInfoName());
map.put("courseInfoId",item.getCourseInfoId()); map.put("courseInfoId", item.getCourseInfoId());
map.put("courseType",1); map.put("courseType", 1);
theoryCourseList.add(map); theoryCourseList.add(map);
}); });
} }

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

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

Write Preview
Loading…
Cancel
Save