|
@@ -36,10 +36,14 @@ import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
|
import vip.xiaonuo.common.util.CommonDownloadUtil;
|
|
import vip.xiaonuo.common.util.CommonDownloadUtil;
|
|
|
import vip.xiaonuo.common.util.CommonResponseUtil;
|
|
import vip.xiaonuo.common.util.CommonResponseUtil;
|
|
|
|
|
+import vip.xiaonuo.disk.domain.Chapter;
|
|
|
|
|
+import vip.xiaonuo.disk.domain.ClassHour;
|
|
|
import vip.xiaonuo.disk.domain.CourseStudentRelate;
|
|
import vip.xiaonuo.disk.domain.CourseStudentRelate;
|
|
|
import vip.xiaonuo.disk.domain.ResourceRecordUserRelate;
|
|
import vip.xiaonuo.disk.domain.ResourceRecordUserRelate;
|
|
|
import vip.xiaonuo.disk.mapper.CourseStudentRelateMapper;
|
|
import vip.xiaonuo.disk.mapper.CourseStudentRelateMapper;
|
|
|
import vip.xiaonuo.disk.param.coursestudentrelate.*;
|
|
import vip.xiaonuo.disk.param.coursestudentrelate.*;
|
|
|
|
|
+import vip.xiaonuo.disk.service.ChapterService;
|
|
|
|
|
+import vip.xiaonuo.disk.service.ClassHourService;
|
|
|
import vip.xiaonuo.disk.service.CourseStudentRelateService;
|
|
import vip.xiaonuo.disk.service.CourseStudentRelateService;
|
|
|
import vip.xiaonuo.sys.modular.user.entity.SysUser;
|
|
import vip.xiaonuo.sys.modular.user.entity.SysUser;
|
|
|
import vip.xiaonuo.sys.modular.user.param.SysUserImportParam;
|
|
import vip.xiaonuo.sys.modular.user.param.SysUserImportParam;
|
|
@@ -70,6 +74,10 @@ public class CourseStudentRelateServiceImpl extends ServiceImpl<CourseStudentRel
|
|
|
private CourseStudentRelateMapper courseStudentRelateMapper;
|
|
private CourseStudentRelateMapper courseStudentRelateMapper;
|
|
|
@Resource
|
|
@Resource
|
|
|
private SysUserService sysUserService;
|
|
private SysUserService sysUserService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private ChapterService chapterService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private ClassHourService classHourService;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Page<CourseStudentRelate> page(CourseStudentRelatePageParam courseStudentRelatePageParam) {
|
|
public Page<CourseStudentRelate> page(CourseStudentRelatePageParam courseStudentRelatePageParam) {
|
|
@@ -262,17 +270,38 @@ public class CourseStudentRelateServiceImpl extends ServiceImpl<CourseStudentRel
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public Page<Map<String,Object>> downList(Map param)
|
|
|
|
|
|
|
+ public Page<Map<String,Object>> downList(Map<String,Object> param)
|
|
|
{
|
|
{
|
|
|
|
|
+ String courseId="";
|
|
|
|
|
+ if(param.get("courseId") != null && StringUtils.isNotEmpty(param.get("courseId").toString())){
|
|
|
|
|
+ courseId=param.get("courseId").toString();
|
|
|
|
|
+ }else if(param.get("gradesId") != null && StringUtils.isNotEmpty(param.get("gradesId").toString()))
|
|
|
|
|
+ {
|
|
|
|
|
+ param.put("gradesId", param.get("gradesId").toString());
|
|
|
|
|
+ }else if(param.get("chapterId") != null && StringUtils.isNotEmpty(param.get("chapterId").toString()))
|
|
|
|
|
+ {
|
|
|
|
|
+ Chapter chapter = chapterService.queryEntity(param.get("chapterId").toString());
|
|
|
|
|
+ courseId=chapter.getCourseId();
|
|
|
|
|
+ }
|
|
|
|
|
+ else if(param.get("hourId") != null && StringUtils.isNotEmpty(param.get("hourId").toString()))
|
|
|
|
|
+ {
|
|
|
|
|
+ ClassHour classHour = classHourService.queryEntity(param.get("hourId").toString());
|
|
|
|
|
+ Chapter chapter = chapterService.queryEntity(classHour.getChapterId());
|
|
|
|
|
+ courseId=chapter.getCourseId();
|
|
|
|
|
+ }
|
|
|
|
|
+ param.put("courseId", courseId);
|
|
|
|
|
|
|
|
- HttpServletRequest request = getRequest();
|
|
|
|
|
- Page<Object> objectPage =null;
|
|
|
|
|
- if(StringUtils.isEmpty(request.getParameter("size"))&&StringUtils.isEmpty(request.getParameter("current"))) {
|
|
|
|
|
|
|
+ int current = 1;
|
|
|
|
|
+ int size = Integer.MAX_VALUE;
|
|
|
|
|
|
|
|
- objectPage = new Page<>(1, 1000);
|
|
|
|
|
- }else{
|
|
|
|
|
- objectPage =CommonPageRequest.defaultPage();
|
|
|
|
|
|
|
+ if(param.get("current") != null && param.get("current") instanceof Integer){
|
|
|
|
|
+ current = (Integer) param.get("current");
|
|
|
}
|
|
}
|
|
|
|
|
+ if(param.get("size") != null && param.get("size") instanceof Integer){
|
|
|
|
|
+ size = (Integer) param.get("size");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ Page<Object> objectPage = new Page<>(current, size);
|
|
|
return courseStudentRelateMapper.downList(param,objectPage);
|
|
return courseStudentRelateMapper.downList(param,objectPage);
|
|
|
}
|
|
}
|
|
|
|
|
|