Commit e7d4a11d authored by wujipeng's avatar wujipeng
Browse files

优化

parent dd4cc268
......@@ -3,6 +3,7 @@ package com.platform.business.controller;
import com.platform.business.model.dto.CalendarDTO;
import com.platform.business.model.dto.ClassDTO;
import com.platform.business.model.vo.CalendarVO;
import com.platform.business.model.vo.ClassVO;
import com.platform.business.service.ClassService;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
......@@ -44,13 +45,13 @@ public class ClassController extends BaseController {
@ApiOperation("课程安排表")
@PostMapping("/schedule")
public Result schedule(@RequestBody ClassDTO classDTO) {
public Result<List<ClassVO>> schedule(@RequestBody ClassDTO classDTO) {
return Result.data(classService.schedule(classDTO));
}
@ApiOperation("课程安排表-教师端")
@PostMapping("/schedule/teacher")
public Result scheduleTeacher(@RequestBody ClassDTO classDTO) {
public Result<List<ClassVO>> scheduleTeacher(@RequestBody ClassDTO classDTO) {
return Result.data(classService.scheduleTeacher(classDTO));
}
......
......@@ -19,10 +19,11 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> {
List<ClassSubjectVO> countByTeacherId(String id);
List<ClassSubjectVO> queryOneself(String userId);
List<ClassSubjectVO> queryOneself(@Param("classIds") List<Integer> classIds);
List<ClassSubjectVO> queryOneselfTeacher(@Param("userId") String userId);
List<ClassSubjectVO> queryByTeacherId(String id);
List<CalendarVO> todayCourse(@Param("classIds") List<Integer> classIds);
}
......@@ -18,9 +18,9 @@ public interface ClassService extends IService<ClassEntity> {
boolean deleteStu(String studentId);
Object schedule(ClassDTO classDTO);
List<ClassVO> schedule(ClassDTO classDTO);
Object scheduleTeacher(ClassDTO classDTO);
List<ClassVO> scheduleTeacher(ClassDTO classDTO);
List<CalendarVO> todayCourse(String userId);
......
......@@ -26,8 +26,11 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> {
SysTeacherCountVO queryByTeacherUserName(String userName);
List<ClassSubjectVO> queryOneself(String userId);
List<ClassSubjectVO> queryOneself(List<Integer> classIds);
List<ClassSubjectVO> queryOneselfTeacher(String userId);
List<CalendarVO> todayCourse(List<Integer> classIds);
}
......@@ -82,10 +82,13 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
}
@Override
public Object schedule(ClassDTO classDTO) {
public List<ClassVO> schedule(ClassDTO classDTO) {
//查询考试信息
List<ExamStudentVO> examStudentList = examStudentService.queryOneself(classDTO.getUserId());
List<ClassSubjectVO> classSubjectList = classSubjectService.queryOneself(classDTO.getUserId());
//获取班级id
List<Integer> classIds = classStudentService.queryClassIdByUserId(classDTO.getUserId());
//查询课程信息
List<ClassSubjectVO> classSubjectList = classSubjectService.queryOneself(classIds);
List<ClassVO> result = Lists.newArrayList();
List<Date> dateList = getDatesBetweenTwoDate(classDTO.getStartDate(), classDTO.getEndDate());
for (Date date : dateList) {
......@@ -111,11 +114,11 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
}
@Override
public Object scheduleTeacher(ClassDTO classDTO) {
public List<ClassVO> scheduleTeacher(ClassDTO classDTO) {
//查询考试信息
List<ExamStudentVO> examStudentList = examStudentService.queryOneselfTeacher(classDTO.getUserId());
//TODO 加上权限
List<ClassSubjectVO> classSubjectList = classSubjectService.queryOneself(classDTO.getUserId());
//查询课程信息
List<ClassSubjectVO> classSubjectList = classSubjectService.queryOneselfTeacher(classDTO.getUserId());
List<ClassVO> result = Lists.newArrayList();
List<Date> dateList = getDatesBetweenTwoDate(classDTO.getStartDate(), classDTO.getEndDate());
for (Date date : dateList) {
......
......@@ -208,8 +208,13 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla
}
@Override
public List<ClassSubjectVO> queryOneself(String userId) {
return baseMapper.queryOneself(userId);
public List<ClassSubjectVO> queryOneself(List<Integer> classIds) {
return baseMapper.queryOneself(classIds);
}
@Override
public List<ClassSubjectVO> queryOneselfTeacher(String userId) {
return baseMapper.queryOneselfTeacher(userId);
}
@Override
......
......@@ -64,21 +64,50 @@
</select>
<select id="queryOneself" resultType="com.platform.business.model.vo.ClassSubjectVO">
select
class_subject.id,
class_subject.class_id,
class_subject.subject_times,
class_subject.date,
class_subject.week,
class_subject.time_frame,
class_subject.subject_hour,
class_subject.subject_name,
class_subject.teacher_id,
class_subject.remark,
class.name as className
cs.id,
cs.class_id,
cs.subject_times,
cs.date,
cs.week,
cs.time_frame,
cs.subject_hour,
cs.subject_name,
cs.teacher_id,
cs.remark,
c.name as className
from
class_subject
left join class
on class_subject.class_id = class.id
class_subject cs
left join
class c
on
cs.class_id = c.id
where
cs.class_id in
<foreach item="item" index="index" collection="classIds" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="queryOneselfTeacher" resultType="com.platform.business.model.vo.ClassSubjectVO">
select
cs.id,
cs.class_id,
cs.subject_times,
cs.date,
cs.week,
cs.time_frame,
cs.subject_hour,
cs.subject_name,
cs.teacher_id,
cs.remark,
c.name as className
from
class_subject cs
left join
class c
on
cs.class_id = c.id
where
cs.teacher_id = #{userId}
</select>
<select id="todayCourse" resultType="com.platform.business.model.vo.CalendarVO">
select
......@@ -101,4 +130,5 @@
#{item}
</foreach>
</select>
</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