Commit dd4cc268 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 78da26d3
Pipeline #349 failed with stages
in 0 seconds
......@@ -13,5 +13,5 @@ public class CalendarDTO {
private String userId;
private Integer courseId;
private Integer subjectId;
}
......@@ -25,16 +25,16 @@ import java.util.List;
public class CalendarVO {
@ApiModelProperty(value = "课程时段")
private String courseTimePeriod;
private String subjectTimePeriod;
@ApiModelProperty(value = "课程类型")
private String courseType;
private String subjectType;
@ApiModelProperty(value = "课程id")
private Integer courseId;
private Integer subjectId;
@ApiModelProperty(value = "课程名称")
private String courseName;
private String subjectName;
@ApiModelProperty(value = "教师名称")
private String teacherName;
......@@ -54,6 +54,6 @@ public class CalendarVO {
@ApiModelProperty(value = "课程时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date courseTime;
private Date subjectTime;
}
......@@ -155,8 +155,8 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
classSubjectAttendanceMap.put(classSubjectAttendanceEntity.getSubjectId(), classSubjectAttendanceEntity.getCheckInTime());
}
for (CalendarVO calendarVO : result) {
if(classSubjectAttendanceMap.containsKey(calendarVO.getCourseId())){
calendarVO.setSignInTime(classSubjectAttendanceMap.get(calendarVO.getCourseId()));
if(classSubjectAttendanceMap.containsKey(calendarVO.getSubjectId())){
calendarVO.setSignInTime(classSubjectAttendanceMap.get(calendarVO.getSubjectId()));
calendarVO.setIsSignIn(true);
} else {
calendarVO.setIsSignIn(false);
......@@ -169,7 +169,7 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
public Boolean todayCourseSignIn(CalendarDTO calendarDTO) {
ClassSubjectAttendanceEntity classSubjectAttendance = new ClassSubjectAttendanceEntity();
classSubjectAttendance.setUserId(calendarDTO.getUserId());
classSubjectAttendance.setSubjectId(calendarDTO.getCourseId());
classSubjectAttendance.setSubjectId(calendarDTO.getSubjectId());
classSubjectAttendance.setCheckInTime(new Date());
return classSubjectAttendanceService.save(classSubjectAttendance);
}
......
......@@ -82,13 +82,13 @@
</select>
<select id="todayCourse" resultType="com.platform.business.model.vo.CalendarVO">
select
time_frame as courseTimePeriod,
type as courseType,
cs.id as courseId,
subject_name as courseName,
time_frame as subjectTimePeriod,
type as subjectType,
cs.id as subjectId,
subject_name as subjectName,
u.nick_name as teacherName,
location,
date as courseTime
date as subjectTime
from
class_subject cs
left join
......
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