小班详情中距离考试周结束天数最少为0天
This commit is contained in:
@@ -642,7 +642,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
result.put("examStartTime",DateUtils.stringToDate(DateUtils.format(examStartTime),"yyyy-MM-dd"));
|
result.put("examStartTime",DateUtils.stringToDate(DateUtils.format(examStartTime),"yyyy-MM-dd"));
|
||||||
Date examEndTime = DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()-1+classModel.getExamDays());
|
Date examEndTime = DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()-1+classModel.getExamDays());
|
||||||
result.put("examEndTime",DateUtils.stringToDate(DateUtils.format(examEndTime)+" 23:59:59","yyyy-MM-dd HH:mm:ss"));
|
result.put("examEndTime",DateUtils.stringToDate(DateUtils.format(examEndTime)+" 23:59:59","yyyy-MM-dd HH:mm:ss"));
|
||||||
result.put("examEndDays",Math.ceil((examStartTime.getTime()-new Date().getTime())/60/60/24/1000));
|
double d = Math.ceil((examStartTime.getTime()-new Date().getTime())/60/60/24/1000);
|
||||||
|
result.put("examEndDays",d>=0?d:0);
|
||||||
}
|
}
|
||||||
result.put("courses",courses);
|
result.put("courses",courses);
|
||||||
result.put("admins",admins);
|
result.put("admins",admins);
|
||||||
|
|||||||
Reference in New Issue
Block a user