"...java/com/git@gitlab.ruzhoukj.com:wujipeng/integration.git" did not exist on "a5cf2b719b005f8f7073af93216700dadbb3a793"
Commit c81bee54 authored by wujipeng's avatar wujipeng
Browse files

教师端-教学管理-我的课程-详情

parent b99f583a
...@@ -46,31 +46,37 @@ public class ClassController extends BaseController { ...@@ -46,31 +46,37 @@ public class ClassController extends BaseController {
return toAjax(classService.deleteStu(studentId)); return toAjax(classService.deleteStu(studentId));
} }
@ApiOperation("学生端-我的课程-日历") @ApiOperation("学生端-学习中心-我的课程-日历")
@PostMapping("/schedule") @PostMapping("/schedule")
public Result<List<ClassVO>> schedule(@RequestBody ClassDTO classDTO) { public Result<List<ClassVO>> schedule(@RequestBody ClassDTO classDTO) {
return Result.data(classService.schedule(classDTO)); return Result.data(classService.schedule(classDTO));
} }
@ApiOperation("学生端-我的课程-日历-详情") @ApiOperation("学生端-学习中心-我的课程-日历-详情")
@PostMapping("/schedule/detail") @PostMapping("/schedule/detail")
public Result<ClassSubjectVO> scheduleDetail(@RequestBody ClassSubjectDTO classSubjectDTO) { public Result<ClassSubjectVO> scheduleDetail(@RequestBody ClassSubjectDTO classSubjectDTO) {
return Result.data(classService.scheduleDetail(classSubjectDTO)); return Result.data(classService.scheduleDetail(classSubjectDTO));
} }
@ApiOperation("课程安排表-教师端") @ApiOperation("教师端-教学管理-我的课程-日历")
@PostMapping("/schedule/teacher") @PostMapping("/schedule/teacher")
public Result<List<ClassVO>> scheduleTeacher(@RequestBody ClassDTO classDTO) { public Result<List<ClassVO>> scheduleTeacher(@RequestBody ClassDTO classDTO) {
return Result.data(classService.scheduleTeacher(classDTO)); return Result.data(classService.scheduleTeacher(classDTO));
} }
@ApiOperation("教师端-教学管理-我的课程-详情")
@PostMapping("/schedule/teacher/detail")
public Result<ClassSubjectVO> scheduleTeacherDetail(@RequestBody ClassSubjectDTO classSubjectDTO) {
return Result.data(classService.scheduleTeacherDetail(classSubjectDTO));
}
@ApiOperation("班级列表") @ApiOperation("班级列表")
@GetMapping("/list") @GetMapping("/list")
public Result list() { public Result list() {
return Result.data(classService.list()); return Result.data(classService.list());
} }
@ApiOperation("今日课程") @ApiOperation("学生端-学习中心-我的课程-今日课程")
@GetMapping("/today/course/{userId}") @GetMapping("/today/course/{userId}")
public Result<List<CalendarVO>> todayCourse(@PathVariable String userId) { public Result<List<CalendarVO>> todayCourse(@PathVariable String userId) {
return Result.data(classService.todayCourse(userId)); return Result.data(classService.todayCourse(userId));
...@@ -82,13 +88,13 @@ public class ClassController extends BaseController { ...@@ -82,13 +88,13 @@ public class ClassController extends BaseController {
return Result.data(classService.todayCourseSignIn(calendarDTO)); return Result.data(classService.todayCourseSignIn(calendarDTO));
} }
@ApiOperation("学生端-我的课程-汇总") @ApiOperation("学生端-学习中心-我的课程-汇总")
@PostMapping("/student/course/summary") @PostMapping("/student/course/summary")
public Result<Map<String, Integer>> studentCourseSummary(@RequestBody ClassDTO classDTO) { public Result<Map<String, Integer>> studentCourseSummary(@RequestBody ClassDTO classDTO) {
return Result.data(classService.studentCourseSummary(classDTO)); return Result.data(classService.studentCourseSummary(classDTO));
} }
@ApiOperation("教师端-我的课程-汇总") @ApiOperation("教师端-教学管理-我的课程-汇总")
@PostMapping("/teacher/course/summary") @PostMapping("/teacher/course/summary")
public Result<Map<String, Integer>> teacherCourseSummary(@RequestBody ClassDTO classDTO) { public Result<Map<String, Integer>> teacherCourseSummary(@RequestBody ClassDTO classDTO) {
return Result.data(classService.teacherCourseSummary(classDTO)); return Result.data(classService.teacherCourseSummary(classDTO));
......
...@@ -30,6 +30,9 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> { ...@@ -30,6 +30,9 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> {
List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO); List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO);
List<ClassSubjectVO> queryListByUserIdAndDateTeacher(ClassSubjectDTO classSubjectDTO);
List<ClassSubjectVO> queryTeacherCourse(@Param("userId") String userId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); List<ClassSubjectVO> queryTeacherCourse(@Param("userId") String userId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
} }
...@@ -27,6 +27,8 @@ public interface ClassService extends IService<ClassEntity> { ...@@ -27,6 +27,8 @@ public interface ClassService extends IService<ClassEntity> {
List<ClassVO> scheduleTeacher(ClassDTO classDTO); List<ClassVO> scheduleTeacher(ClassDTO classDTO);
ClassSubjectVO scheduleTeacherDetail(ClassSubjectDTO classSubjectDTO);
List<CalendarVO> todayCourse(String userId); List<CalendarVO> todayCourse(String userId);
Boolean todayCourseSignIn(CalendarDTO calendarDTO); Boolean todayCourseSignIn(CalendarDTO calendarDTO);
...@@ -35,4 +37,6 @@ public interface ClassService extends IService<ClassEntity> { ...@@ -35,4 +37,6 @@ public interface ClassService extends IService<ClassEntity> {
Map<String, Integer> teacherCourseSummary(ClassDTO classDTO); Map<String, Integer> teacherCourseSummary(ClassDTO classDTO);
} }
...@@ -35,6 +35,9 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> { ...@@ -35,6 +35,9 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> {
List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO); List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO);
List<ClassSubjectVO> queryListByUserIdAndDateTeacher(ClassSubjectDTO classSubjectDTO);
List<ClassSubjectVO> queryTeacherCourse(String userId, Date startDate, Date endDate); List<ClassSubjectVO> queryTeacherCourse(String userId, Date startDate, Date endDate);
} }
...@@ -255,6 +255,25 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl ...@@ -255,6 +255,25 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
return result; return result;
} }
@Override
public ClassSubjectVO scheduleTeacherDetail(ClassSubjectDTO classSubjectDTO) {
Date now = new Date();
ClassSubjectVO result = new ClassSubjectVO();
List<ClassSubjectVO> data = classSubjectService.queryListByUserIdAndDateTeacher(classSubjectDTO);
for (ClassSubjectVO classSubjectVO : data) {
if(now.before(classSubjectVO.getDate())){
classSubjectVO.setStatus("未开始");
} else if (now.after(classSubjectVO.getDate())) {
classSubjectVO.setStatus("已结束");
} else {
classSubjectVO.setStatus("进行中");
}
}
result.setData(data);
result.setSubjectNum(data.size());
return result;
}
@Override @Override
public List<CalendarVO> todayCourse(String userId) { public List<CalendarVO> todayCourse(String userId) {
//获取学生的班级id //获取学生的班级id
......
...@@ -273,6 +273,11 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla ...@@ -273,6 +273,11 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla
return baseMapper.queryListByUserIdAndDate(classSubjectDTO); return baseMapper.queryListByUserIdAndDate(classSubjectDTO);
} }
@Override
public List<ClassSubjectVO> queryListByUserIdAndDateTeacher(ClassSubjectDTO classSubjectDTO) {
return baseMapper.queryListByUserIdAndDateTeacher(classSubjectDTO);
}
@Override @Override
public List<ClassSubjectVO> queryTeacherCourse(String userId, Date startDate, Date endDate) { public List<ClassSubjectVO> queryTeacherCourse(String userId, Date startDate, Date endDate) {
return baseMapper.queryTeacherCourse(userId, startDate, endDate); return baseMapper.queryTeacherCourse(userId, startDate, endDate);
......
...@@ -184,5 +184,23 @@ ...@@ -184,5 +184,23 @@
and and
#{endDate} #{endDate}
</select> </select>
<select id="queryListByUserIdAndDateTeacher" resultType="com.platform.business.model.vo.ClassSubjectVO">
select
cs.time_frame,
cs.subject_name,
u.nick_name,
cs.type,
cs.date
from
class_subject c
left join
user u
on
cs.teacher_id = u.id
where
date = #{date}
and
cs.teacher_id = #{teacherId}
</select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment