导入课程只查询课程节点

beetlsql3-dev
Mlxa0324 2 years ago
parent 5c45793f2c
commit 3a2383d20e

@ -18,4 +18,14 @@ public interface ResourcesApplicationDao extends BaseMapper<ResourcesApplication
public PageQuery<ResourcesApplication> queryByCondition(PageQuery query);
@Update
public void deleteResourcesApplicationByIds(String ids);
/**
*
*
*
*
* @param query
* @return
*/
PageQuery<ResourcesApplication> queryMyApplicationByConditionQuery(PageQuery query);
}

@ -5,12 +5,15 @@ import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
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.jlw.dao.ResourcesApplicationCourseDao;
import com.ibeetl.jlw.dao.ResourcesApplicationDao;
import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao;
import com.ibeetl.jlw.entity.ResourcesApplication;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.Teacher;
import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem;
import com.ibeetl.jlw.web.query.ResourcesApplicationQuery;
import org.beetl.sql.core.SqlId;
@ -26,6 +29,8 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
/**
* ResourcesApplication Service
@ -41,6 +46,10 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
@Autowired private ResourcesApplicationCourseService resourcesApplicationCourseService;
@Autowired private ResourcesApplicationCourseDao resourcesApplicationCourseDao;
@Autowired private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao;
@Autowired
private TeacherService teacherService;
@Autowired
private StudentService studentService;
public PageQuery<ResourcesApplication>queryByCondition(PageQuery query){
PageQuery ret = resourcesApplicationDao.queryByCondition(query);
@ -182,4 +191,29 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
// 根据应用ID查询应用信息
return resourcesApplicationDao.selectByIds(resourcesApplicationIdList);
}
/**
*
*
*
*
* @param query
*/
public PageQuery<ResourcesApplication> queryMyApplicationByConditionQuery(PageQuery query) {
CoreUser user = getUser();
// 根据条件追加参数
if(user.isTeacher()) {
Teacher teacher = teacherService.getByUserId(user.getId());
query.setPara("teacherId", teacher.getTeacherId());
}
if(user.isStudent()) {
Student student = studentService.getByUserId(user.getId());
query.setPara("studentId", student.getStudentId());
}
PageQuery ret = resourcesApplicationDao.queryMyApplicationByConditionQuery(query);
queryListAfter(ret.getList());
return ret;
}
}

@ -136,5 +136,26 @@ public class ResourcesApplicationController{
return JsonResult.success();
}
/**
*
*
*
*
*
* @param coreUser
* @return
*/
@PostMapping(API + "/myApplication.do")
@ResponseBody
public JsonResult myApplication(ResourcesApplicationQuery condition, @SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
PageQuery page = condition.getPageQuery();
resourcesApplicationService.queryMyApplicationByConditionQuery(page);
return JsonResult.success(page);
}
}
}

@ -604,4 +604,6 @@ getCourseInfoPageByUniversitiesCollegesId
@if(isNotEmpty(universitiesCollegesId)) {
AND tc.universities_colleges_id = #universitiesCollegesId#
@}
@ // 只查询课程节点,不查询章节和小节
AND t.course_info_parent_id is null

@ -136,3 +136,104 @@ getResourcesApplicationValues
@if(!isEmpty(applicationInfoOriginal)){
and t.application_info_original =#applicationInfoOriginal#
@}
queryMyApplicationByConditionQuery
===
* 根据当前登录人身份查询应用列表(可渲染排序)
SELECT
@pageTag(){
zz.*
@}
FROM
(
SELECT DISTINCT
t.*,
@// 查询教师和应用关联的排序值
@if(!isEmpty(teacherId)){
( SELECT teacher_merge_application_order_index FROM teacher_merge_application WHERE resources_application_id = t.resources_application_id ) AS order_index
@}
@// 查询学生和应用关联的排序值
@if(!isEmpty(studentId)){
( SELECT student_merge_application_order_index FROM student_merge_application WHERE resources_application_id = t.resources_application_id ) AS order_index
@}
FROM
resources_application t
LEFT JOIN universities_colleges_jurisdiction_experimental_system tb ON tb.type_id = t.resources_application_id
WHERE
1 = 1
@if(!isEmpty(resourcesApplicationId)){
and t.resources_application_id =#resourcesApplicationId#
@}
@if(!isEmpty(applicationName)){
and t.application_name =#applicationName#
@}
@if(!isEmpty(applicationLink)){
and t.application_link =#applicationLink#
@}
@if(!isEmpty(linkSecretKey)){
and t.link_secret_key =#linkSecretKey#
@}
@if(!isEmpty(applicationOneLevelRelation)){
and t.application_one_level_relation =#applicationOneLevelRelation#
@}
@if(!isEmpty(applicationSecondLevelRelation)){
and t.application_second_level_relation =#applicationSecondLevelRelation#
@}
@if(!isEmpty(applicationCarousel)){
and t.application_carousel =#applicationCarousel#
@}
@if(!isEmpty(applicationExperimentProgram)){
and t.application_experiment_program =#applicationExperimentProgram#
@}
@if(!isEmpty(applicationExperimentalCourse)){
and t.application_experimental_course =#applicationExperimentalCourse#
@}
@if(!isEmpty(applicationUserManual)){
and t.application_user_manual =#applicationUserManual#
@}
@if(!isEmpty(applicationInstallationPackage)){
and t.application_installation_package =#applicationInstallationPackage#
@}
@if(!isEmpty(applicationIntroduction)){
and t.application_introduction =#applicationIntroduction#
@}
@if(!isEmpty(applicationInfo)){
and t.application_info =#applicationInfo#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@if(!isEmpty(userId)){
and t.user_id =#userId#
@}
@if(!isEmpty(applicationIntroductionOriginal)){
and t.application_introduction_original =#applicationIntroductionOriginal#
@}
@if(!isEmpty(applicationInfoOriginal)){
and t.application_info_original =#applicationInfoOriginal#
@}
@// 查找老师所在的院校
@if(!isEmpty(teacherId)){
and tb.universities_colleges_id =
(select universities_colleges_id from teacher where teacher_id = #teacherId# and teacher_status = 1 limit 1)
@}
@// 查找学生所在的院校
@if(!isEmpty(studentId)){
and tb.universities_colleges_id =
(SELECT
rb.universities_colleges_id
FROM
student ra
LEFT JOIN school_class rb ON rb.class_id = ra.class_id
WHERE
ra.student_status = 1 and ra.student_id = #studentId#
LIMIT 1)
@}
AND tb.`type` = 1
AND tb.use_end_time > now()
) zz
ORDER BY
CASE zz.order_index WHEN NULL THEN 0 ELSE zz.order_index END DESC
Loading…
Cancel
Save