|
@@ -164,7 +164,7 @@ public class RoomServiceImpl implements RoomService {
|
|
RoleEnum roleEnum;
|
|
RoleEnum roleEnum;
|
|
RoomResult roomResult = new RoomResult();
|
|
RoomResult roomResult = new RoomResult();
|
|
String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
- String endClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
|
|
|
+ String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
roomResult.setSurplusTime(DateUtil.secondsBetween(new Date(),DateUtil.stringToDate(classDate + " " + endClassTime,DateUtil.EXPANDED_DATE_TIME_FORMAT)));
|
|
roomResult.setSurplusTime(DateUtil.secondsBetween(new Date(),DateUtil.stringToDate(classDate + " " + endClassTime,DateUtil.EXPANDED_DATE_TIME_FORMAT)));
|
|
RoomResult.MemberResult userResult = new RoomResult.MemberResult();
|
|
RoomResult.MemberResult userResult = new RoomResult.MemberResult();
|
|
List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
|
|
List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
|