课外作业已过期判断

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkWrapper.java

@@ -141,6 +141,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty(value = "作业类型 来源（HOMEWORK,EXTRACURRICULAR,EXTRA）",required = true)
         private ELessonTrainingType type;
 
+        @ApiModelProperty("是否可布置")
+        private Boolean assignFlag;
+
         private String studentIdList;
 
         @ApiModelProperty("练习内容")

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -816,11 +816,16 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                 }
             }
             for (CourseHomeworkWrapper.CourseHomeworkList courseHomeworkList : courseHomeworkLists) {
-
+                courseHomeworkList.setAssignFlag(false);
                 // 如果是未布置的 设置时间
                 if(courseHomeworkList.getHomeWorkStatus().equals(EHomeWorkStatus.UNASSIGNED)){
+                    courseHomeworkList.setAssignFlag(true);
                     courseHomeworkList.setAssignTime(queryInfo.getStartTime());
                     courseHomeworkList.setStudentIdList(groupIds.get(courseHomeworkList.getMusicGroupId()));
+                    // 如果结束时间小于当前时间  设置为已过期
+                    if(queryInfo.getEndTime().before(new Date())){
+                        courseHomeworkList.setAssignFlag(false);
+                    }
                 }
 
                 // 乐团信息