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

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

@@ -212,7 +212,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                 courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
                 courseHomework.setGroupType(courseSchedule.getGroupType());
                 courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
-                courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
+                courseHomework.setExpiryDate(DateUtil.addDays(date, 3));
                 courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments) ? 0 : courseScheduleStudentPayments.size());
                 courseHomeworkService.insert(courseHomework);
             }
@@ -220,7 +220,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
 //                    List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
                 Teacher teacher = teacherDao.get(courseScheduleReview.getTeacherId());
-                String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 1), "MM月dd日");
+                String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 3), "MM月dd日");
                 for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
                     StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
                     if(Objects.isNull(existHomework)){

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

@@ -98,12 +98,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 		List<Student> labeledStudentList = studentDao.queryByOperatingTempTag(1);
 		for(Student s : labeledStudentList){
 			dto = map.get(s.getUserId());
-			if(dto != null){
-				if(dto.getTotalCourseTimes() == dto.getFreePracticeCourseTimes()){
-					s.setOperatingTempTag(0);
-					s.setOperatingTag(0);
-					updateStudentList.add(s);
-				}
+			if (dto == null || dto.getTotalCourseTimes() == dto.getFreePracticeCourseTimes()) {
+				s.setOperatingTempTag(0);
+				s.setOperatingTag(0);
+				updateStudentList.add(s);
 			}
 		}