"src/main/java/com/git@gitlab.ruzhoukj.com:wujipeng/ops.git" did not exist on "ea83ee81e883f8e005ca0b167638042c58e6a473"
Commit b99f583a authored by wujipeng's avatar wujipeng
Browse files

教师端-我的课程-汇总

parent 24a5784e
...@@ -76,15 +76,21 @@ public class ClassController extends BaseController { ...@@ -76,15 +76,21 @@ public class ClassController extends BaseController {
return Result.data(classService.todayCourse(userId)); return Result.data(classService.todayCourse(userId));
} }
@ApiModelProperty("今日课程-签到") @ApiOperation("今日课程-签到")
@PostMapping("/today/course/signIn") @PostMapping("/today/course/signIn")
public Result<Boolean> todayCourseSignIn(@RequestBody CalendarDTO calendarDTO) { public Result<Boolean> todayCourseSignIn(@RequestBody CalendarDTO calendarDTO) {
return Result.data(classService.todayCourseSignIn(calendarDTO)); return Result.data(classService.todayCourseSignIn(calendarDTO));
} }
@ApiModelProperty("学生端-我的课程-汇总") @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("教师端-我的课程-汇总")
@PostMapping("/teacher/course/summary")
public Result<Map<String, Integer>> teacherCourseSummary(@RequestBody ClassDTO classDTO) {
return Result.data(classService.teacherCourseSummary(classDTO));
}
} }
...@@ -30,4 +30,6 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> { ...@@ -30,4 +30,6 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> {
List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO); List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO);
List<ClassSubjectVO> queryTeacherCourse(@Param("userId") String userId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
} }
...@@ -33,4 +33,6 @@ public interface ClassService extends IService<ClassEntity> { ...@@ -33,4 +33,6 @@ public interface ClassService extends IService<ClassEntity> {
Map<String, Integer> studentCourseSummary(ClassDTO classDTO); Map<String, Integer> studentCourseSummary(ClassDTO classDTO);
Map<String, Integer> teacherCourseSummary(ClassDTO classDTO);
} }
...@@ -35,4 +35,6 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> { ...@@ -35,4 +35,6 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> {
List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO); List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO);
List<ClassSubjectVO> queryTeacherCourse(String userId, Date startDate, Date endDate);
} }
...@@ -336,6 +336,26 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl ...@@ -336,6 +336,26 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
return result; return result;
} }
@Override
public Map<String, Integer> teacherCourseSummary(ClassDTO classDTO) {
HashMap<String, Integer> result = new HashMap<>();
Date date = new Date();
//查询课程信息
List<ClassSubjectVO> classSubjectList = classSubjectService.queryTeacherCourse(classDTO.getUserId(), classDTO.getStartDate(), classDTO.getEndDate());
//本月课时
result.put("本月课时", classSubjectList.size());
//已完成课程
int completed = 0;
for (ClassSubjectVO subject : classSubjectList) {
if (subject.getDate().before(date)) completed++;
}
result.put("已完成课程", completed);
//待完成课程
result.put("待完成课程", classSubjectList.size() - completed);
//平均出勤率
return result;
}
private static String displayAttendanceStatus(String status) { private static String displayAttendanceStatus(String status) {
if (AttendanceConstants.STATUS_NORMAL.equals(status)) return "已签到"; if (AttendanceConstants.STATUS_NORMAL.equals(status)) return "已签到";
if (AttendanceConstants.STATUS_LATE.equals(status)) return "迟到"; if (AttendanceConstants.STATUS_LATE.equals(status)) return "迟到";
......
...@@ -272,4 +272,9 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla ...@@ -272,4 +272,9 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla
public List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO) { public List<ClassSubjectVO> queryListByUserIdAndDate(ClassSubjectDTO classSubjectDTO) {
return baseMapper.queryListByUserIdAndDate(classSubjectDTO); return baseMapper.queryListByUserIdAndDate(classSubjectDTO);
} }
@Override
public List<ClassSubjectVO> queryTeacherCourse(String userId, Date startDate, Date endDate) {
return baseMapper.queryTeacherCourse(userId, startDate, endDate);
}
} }
...@@ -154,5 +154,35 @@ ...@@ -154,5 +154,35 @@
#{item} #{item}
</foreach> </foreach>
</select> </select>
<select id="queryTeacherCourse" 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,
cs.location,
cs.type,
c.name as className
from
class_subject cs
left join
class c
on
cs.class_id = c.id
where
cs.teacher_id = #{userId}
and
cs.date
between
#{startDate}
and
#{endDate}
</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