diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java index 966ef94a..79e432af 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java @@ -634,9 +634,12 @@ public class ClassEntityServiceImpl extends ServiceImpl result = new HashMap<>(); result.put("class",classEntity); result.put("classModel",classModel); + result.put("studyEndDays",""); if (classEntity.getStartTime()!=null){ Date studyEndTime = DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()-1); classEntity.setStudyEndTime(DateUtils.stringToDate(DateUtils.format(studyEndTime)+" 23:59:59","yyyy-MM-dd HH:mm:ss")); + double days = Math.ceil((studyEndTime.getTime()-new Date().getTime())/60/60/24/1000); + result.put("studyEndDays",days>=0?days:0); } result.put("examStartTime",""); result.put("examEndTime","");