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

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

@@ -450,9 +450,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         System.out.println(DateUtil.dateToString(new Date(), "HH:mm:ss"));
 		if(allCourseSchedules.size()>1){
 		    //记录连续冲突的次数
-		    Integer repeatTimes=1;
+		    int repeatTimes=1;
 			for (int i=1;i<allCourseSchedules.size();i++){
-				for(int j=repeatTimes;j>0;j--){
+				int temp_repeat=repeatTimes;
+				for(int j=1;j<=temp_repeat;j++){
                     //当前课程
                     CourseSchedule preCourseSchedule = allCourseSchedules.get(i-j);
                     //后面一节课程

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

@@ -1562,6 +1562,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean awardedMonthlyRewards() {
+		//获取
 		List<Map<Integer, Integer>> list = courseScheduleDao.queryVipGroupTeachereClassTimesByMonth(new Date(), CourseStatusEnum.OVER);
 
 		if (list != null && list.size() > 0) {

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

@@ -143,6 +143,9 @@
 			<if test="teacherId">
 				AND FIND_IN_SET(#{teacherId},csrr.teacher_id_)
 			</if>
+			<if test="search">
+				AND csrr.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
 			<if test="rewardMode">
 				AND csrr.reward_mode_ = #{rewardMode}
 			</if>