Merge branch 'online1'

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

@@ -90,16 +90,16 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 					LocalDate createDateTime = LocalDateTime.ofInstant(extracurricularExercisesReply.getCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
 					LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 					if(createDateTime.isBefore(monDayDate)){
-						StudentExtracurricularExercisesSituation studentExercisesSituation = studentExtracurricularExercisesSituationDao.findStudentExercisesSituationsWithMonDay(createMonday.toString(), extracurricularExercisesReply.getUserId());
-						if(Objects.nonNull(studentExercisesSituation)){
-							if(new Integer(1).equals(extracurricularExercisesReply.getIsReplied())){
-								studentExercisesSituation.setExercisesMessageNum(1);
-							}
-							if(new Integer(1).equals(extracurricularExercisesReply.getIsRepliedTimely())){
-								studentExercisesSituation.setExercisesMessageTimelyNum(1);
-							}
-							studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
-						}
+//						StudentExtracurricularExercisesSituation studentExercisesSituation = studentExtracurricularExercisesSituationDao.findStudentExercisesSituationsWithMonDay(createMonday.toString(), extracurricularExercisesReply.getUserId());
+//						if(Objects.nonNull(studentExercisesSituation)){
+//							if(new Integer(1).equals(extracurricularExercisesReply.getIsReplied())){
+//								studentExercisesSituation.setExercisesMessageNum(1);
+//							}
+//							if(new Integer(1).equals(extracurricularExercisesReply.getIsRepliedTimely())){
+//								studentExercisesSituation.setExercisesMessageTimelyNum(1);
+//							}
+//							studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
+//						}
 					}
 				}
 			}

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

@@ -261,16 +261,16 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                     break;
             }
             if(createDateTime.isBefore(monDayDate)&&isOk){
-                StudentExtracurricularExercisesSituation studentExercisesSituation = studentExtracurricularExercisesSituationDao.findStudentExercisesSituationsWithMonDay(createMonday.toString(), byStudentAndCourseHomewok.getUserId());
-                if(Objects.nonNull(studentExercisesSituation)){
-                    if(YesOrNoEnum.YES.equals(byStudentAndCourseHomewok.getIsReplied())){
-                        studentExercisesSituation.setExercisesMessageNum(1);
-                    }
-                    if(new Integer(1).equals(byStudentAndCourseHomewok.getIsRepliedTimely())){
-                        studentExercisesSituation.setExercisesMessageTimelyNum(1);
-                    }
-                    studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
-                }
+//                StudentExtracurricularExercisesSituation studentExercisesSituation = studentExtracurricularExercisesSituationDao.findStudentExercisesSituationsWithMonDay(createMonday.toString(), byStudentAndCourseHomewok.getUserId());
+//                if(Objects.nonNull(studentExercisesSituation)){
+//                    if(YesOrNoEnum.YES.equals(byStudentAndCourseHomewok.getIsReplied())){
+//                        studentExercisesSituation.setExercisesMessageNum(1);
+//                    }
+//                    if(new Integer(1).equals(byStudentAndCourseHomewok.getIsRepliedTimely())){
+//                        studentExercisesSituation.setExercisesMessageTimelyNum(1);
+//                    }
+//                    studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
+//                }
             }
         }
         return true;