Merge remote-tracking branch 'origin/master'

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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -57,17 +57,6 @@ public class CourseSchedule {
 
 	private boolean complaintStatus;
 
-	@ApiModelProperty(value = "当前课次",required = false)
-	private Integer currentClassTimes;
-
-	public Integer getCurrentClassTimes() {
-		return currentClassTimes;
-	}
-
-	public void setCurrentClassTimes(Integer currentClassTimes) {
-		this.currentClassTimes = currentClassTimes;
-	}
-
 	public void setId(Long id) {
 		this.id = id;
 	}

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

@@ -119,7 +119,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		for (Integer key:classGroupByID.keySet()){
 			Integer maxClassTime = null == maxClassTimes.get(key) ? 0 : maxClassTimes.get(key);
 			for(CourseSchedule courseSchedule:classGroupByID.get(key)){
-				courseSchedule.setCurrentClassTimes(++maxClassTime);
 				courseSchedules.add(courseSchedule);
 			}
 		}

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

@@ -264,42 +264,4 @@
                 #{date}
             </foreach>
     </select>
-    <select id="findCoursesByDates" resultMap="CourseSchedule">
-        SELECT
-        *
-        FROM
-        course_schedule cs
-        WHERE
-        cs.class_date_ IN
-        <foreach collection="dates" item="date" open="(" close=")" separator=",">
-            DATE_FORMAT(#{date},'%Y-%m-%d')
-        </foreach>
-    </select>
-
-    <select id="findOverLapCoursesInDay" resultMap="CourseSchedule">
-        SELECT
-        *
-        FROM
-        course_schedule cs
-        WHERE
-        cs.class_date_ IN
-        <foreach collection="dates" item="date" open="(" close=")" separator=",">
-            DATE_FORMAT(#{date},'%Y-%m-%d')
-        </foreach>
-        AND (
-        DATE_FORMAT(cs.start_class_time_,"%H:%i:%s") &gt; DATE_FORMAT(#{endClassTime}, '%H:%i:%s' ) OR DATE_FORMAT(cs.end_class_time_,"%H:%i:%s") &lt; DATE_FORMAT( #{endClassTime}, '%H:%i:%s' )
-        )=0
-    </select>
-
-    <select id="findCourseSchedulesByIds" resultMap="CourseSchedule">
-        SELECT
-        *
-        FROM
-        course_schedule cs
-        WHERE
-        cs.id_ IN
-        <foreach collection="ids" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </select>
 </mapper>