作业列表和智能陪练过期时间

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

@@ -46,7 +46,7 @@ public class CourseHomeworkStudentDetailDto {
     private String attachments;
 
     @ApiModelProperty(value = "学生作业是否过期",required = false)
-    private boolean expiredFlag;
+    private boolean expire;
 
     @ApiModelProperty(value = "学生作业评分",required = false)
     private Long score;
@@ -96,12 +96,12 @@ public class CourseHomeworkStudentDetailDto {
         this.submitDate = submitDate;
     }
 
-    public boolean isExpiredFlag() {
-        return expiredFlag;
+    public boolean getExpire() {
+        return expire;
     }
 
-    public void setExpiredFlag(boolean expiredFlag) {
-        this.expiredFlag = expiredFlag;
+    public void setExpire(boolean expire) {
+        this.expire = expire;
     }
 
     public StandardEnum getStandardFlag() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicCompareRecord.java

@@ -76,14 +76,14 @@ public class SysMusicCompareRecord extends BaseEntity {
 	private String partIndex;
 
 	//文件是否过期
-	private boolean expiredFlag;
+	private boolean expire;
 
-	public boolean isExpiredFlag() {
-		return expiredFlag;
+	public boolean getExpire() {
+		return expire;
 	}
 
-	public void setExpiredFlag(boolean expiredFlag) {
-		this.expiredFlag = expiredFlag;
+	public void setExpire(boolean expire) {
+		this.expire = expire;
 	}
 
 	public SysMusicCompareRecord() {

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

@@ -105,7 +105,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		detail.setStudentName(extraExerciseReply.getStudentName());
 		detail.setExpiryDate(extraExerciseReply.getExpireDate());
 		detail.setType("EXTRA");
-		detail.setExpiredFlag(DateUtil.isOverdue(extraExerciseReply.getCreateTime(),
+		detail.setExpire(DateUtil.isOverdue(extraExerciseReply.getCreateTime(),
 				sysConfigDao.findConfigValue("file_expiration_time")));
 
 		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);

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

@@ -226,7 +226,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 		}
 		
         CourseHomeworkStudentDetailDto courseHomeworkStudentDetail = studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
-        courseHomeworkStudentDetail.setExpiredFlag(DateUtil.isOverdue(courseHomeworkStudentDetail.getSubmitDate(),
+        courseHomeworkStudentDetail.setExpire(DateUtil.isOverdue(courseHomeworkStudentDetail.getSubmitDate(),
                 sysConfigDao.findConfigValue("file_expiration_time")));
         if(courseHomeworkStudentDetail == null){
         	courseHomeworkStudentDetail = new CourseHomeworkStudentDetailDto();

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

@@ -168,7 +168,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		jsonObject.put("heardLevel", userLastEvaluationData.getHeardLevel());
 		jsonObject.put("videoFilePath", userLastEvaluationData.getVideoFilePath());
 		jsonObject.put("partIndex", userLastEvaluationData.getPartIndex());
-		jsonObject.put("expiredFlag",DateUtil.isOverdue(userLastEvaluationData.getCreateTime(),
+		jsonObject.put("expire",DateUtil.isOverdue(userLastEvaluationData.getCreateTime(),
 				sysConfigDao.findConfigValue("file_expiration_time")));
 
 		SysMusicScore sysMusicScore = sysMusicScoreDao.get(userLastEvaluationData.getSysMusicScoreId());
@@ -327,7 +327,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 			dataList = new ArrayList<>();
 		}
 		Function<Date,Boolean> expirationFun = (submitTime)->DateUtil.isOverdue(submitTime,sysConfigDao.findConfigValue("file_expiration_time"));
-		dataList.forEach(e->e.setExpiredFlag(expirationFun.apply(e.getCreateTime())));
+		dataList.forEach(e->e.setExpire(expirationFun.apply(e.getCreateTime())));
 
 		pageInfo.setRows(dataList);
 		Map<String, Object> result = new HashMap<>();