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

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

@@ -503,6 +503,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(!GroupStatusEnum.NORMAL.equals(practiceGroup.getGroupStatus())){
 				throw new BizException("非进行中网管课不支持加课");
 			}
+			groupEndDate = practiceGroup.getCoursesExpireDate();
 			organId=practiceGroup.getOrganId();
 
 			List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao
@@ -639,7 +640,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 					if (groupEndDate != null) {
 						if (calendar.getTime().after(groupEndDate)) {
-							throw new BizException("排课时间超出排课截止日期（{}）", groupEndDate);
+							throw new BizException("排课时间超出排课截止日期（{}）", DateUtil.dateToString(groupEndDate, DateUtil.DATE_FORMAT_MIN));
 						}
 					}
 

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

@@ -3196,7 +3196,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if (vipGroupList != null && vipGroupList.size() > 0) {
 			Date date = new Date();
 			for (VipGroup vipGroup : vipGroupList) {
-				if(Objects.nonNull(vipGroup.getCoursesExpireDate())&&vipGroup.getCoursesExpireDate().compareTo(date)<0&&!DateUtil.isSameDay(vipGroup.getCoursesExpireDate(), date)){
+				if(Objects.nonNull(vipGroup.getCoursesExpireDate())&&(vipGroup.getCoursesExpireDate().compareTo(date)>0||DateUtil.isSameDay(vipGroup.getCoursesExpireDate(), date))){
 					continue;
 				}
 				vipGroup.setStatus(VipGroupStatusEnum.FINISHED);

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2402,7 +2402,7 @@
                 LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
                 LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND cssp.user_id_ = sa.user_id_
             </if>
-            <if test="searchType != 'ERR_ATTENDANCE'">
+            <if test="searchType != 'NO_ATTENDANCE'">
                 LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
             </if>
             <include refid="endFindCourseSchedulesCondition"/>