Browse Source

fix: 1.修复vip课加课课程名;
refactor: 1.学生课外训练统计信息

Joburgess 5 years ago
parent
commit
9a3ed44d80

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

@@ -88,13 +88,15 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 					LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 					if(createDateTime.isBefore(monDayDate)){
 						StudentExtracurricularExercisesSituation studentExercisesSituation = studentExtracurricularExercisesSituationDao.findStudentExercisesSituationsWithMonDay(createMonday.toString(), extracurricularExercisesReply.getUserId());
-						if(new Integer(1).equals(extracurricularExercisesReply.getIsReplied())){
-							studentExercisesSituation.setExercisesMessageNum(1);
+						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);
 						}
-						if(new Integer(1).equals(extracurricularExercisesReply.getIsRepliedTimely())){
-							studentExercisesSituation.setExercisesMessageTimelyNum(1);
-						}
-						studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
 					}
 				}
 			}

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

@@ -143,8 +143,10 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 		if(createDateTime.isBefore(monDayDate)){
 			StudentExtracurricularExercisesSituation studentExercisesSituation = studentExtracurricularExercisesSituationDao.findStudentExercisesSituationsWithMonDay(createMonday.toString(), existExtra.getUserId());
-			studentExercisesSituation.setExercisesReplyNum(1);
-			studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
+			if(Objects.nonNull(studentExercisesSituation)){
+				studentExercisesSituation.setExercisesReplyNum(1);
+				studentExtracurricularExercisesSituationDao.update(studentExercisesSituation);
+			}
 		}
 
 		int submitStudentNum=extracurricularExercisesReplyDao.countIsSubmitStudents(existExtra.getExtracurricularExercisesId());