Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -22,20 +22,10 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private java.util.Date expireDate;
 
-    private Integer repliedTimely;
-
     private String statusStr;
     private String isRepliedStr;
     private String isViewStr;
 
-    public Integer getRepliedTimely() {
-        return repliedTimely;
-    }
-
-    public void setRepliedTimely(Integer repliedTimely) {
-        this.repliedTimely = repliedTimely;
-    }
-
     public String getStatusStr() {
         return statusStr;
     }

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

@@ -174,28 +174,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			List<Integer> teacherIds = dataList.stream().map(ExtraExerciseStudentsDto::getTeacherId).collect(Collectors.toList());
 			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
 			Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));
-			List<ExtracurricularExercisesMessage> replyTeacherMessages = extracurricularExercisesMessageDao.findReplyTeacherMessages(replyIds);
-			Map<Long, List<ExtracurricularExercisesMessage>> replyMessagesMap = replyTeacherMessages.stream().collect(Collectors.groupingBy(ExtracurricularExercisesMessage::getExtracurricularExercisesReplyId));
-			if(Objects.isNull(replyMessagesMap)){
-				replyMessagesMap=new HashMap<>();
-			}
 			for (ExtraExerciseStudentsDto extraExerciseStudentsDto : dataList) {
 				extraExerciseStudentsDto.setTeacherName(idNameMap.get(extraExerciseStudentsDto.getTeacherId()));
-				extraExerciseStudentsDto.setRepliedTimely(0);
-				List<ExtracurricularExercisesMessage> replyMessages = replyMessagesMap.get(extraExerciseStudentsDto.getId());
-				if(CollectionUtils.isEmpty(replyMessages)){
-					continue;
-				}
-				for (ExtracurricularExercisesMessage replyMessage : replyMessages) {
-					if(replyMessage.getCreateTime().before(extraExerciseStudentsDto.getSubmitTime())){
-						continue;
-					}
-					int h = DateUtil.hoursBetween(extraExerciseStudentsDto.getSubmitTime(), replyMessage.getCreateTime());
-					if(h<=12){
-						extraExerciseStudentsDto.setRepliedTimely(1);
-					}
-					break;
-				}
 			}
 		}
 		if (count == 0) {