1、vip课活动区分薪水与缴费编辑

2、请假时间限制修改为小时
3、教师端课程调整修改为22:00以前
4、课表预览完善

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

@@ -50,7 +50,7 @@ public class VipGroupActivity {
 	/** 薪水只读标识（1-只读 0-可写） */
 	private String salaryReadonlyFlag;
 
-	private Integer paymentReadonlyFlag;
+	private String paymentReadonlyFlag;
 	
 	/** 赠送课时支付薪水标识（1-计课酬  0-不计课酬） */
 	private String giveClassPaySalaryFlag;
@@ -70,11 +70,11 @@ public class VipGroupActivity {
 
 	private Integer enable;
 
-	public Integer getPaymentReadonlyFlag() {
+	public String getPaymentReadonlyFlag() {
 		return paymentReadonlyFlag;
 	}
 
-	public void setPaymentReadonlyFlag(Integer paymentReadonlyFlag) {
+	public void setPaymentReadonlyFlag(String paymentReadonlyFlag) {
 		this.paymentReadonlyFlag = paymentReadonlyFlag;
 	}
 

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

@@ -1891,13 +1891,13 @@
                 AND cs.class_group_id_=#{classGroupId}
             </if>
             <if test="startTime!=null and endTime==null">
-                AND course_start_time_ &gt; #{startTime}
+                AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &gt; #{startTime}
             </if>
             <if test="startTime==null and endTime!=null">
-                AND course_start_time_ &lt; #{endTime}
+                AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; #{endTime}
             </if>
             <if test="startTime!=null and endTime!=null">
-                AND course_start_time_ BETWEEN #{startTime} AND #{endTime}
+                AND CONCAT(cs.class_date_,' ',cs.start_class_time_) BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="courseStatus!=null">
                 AND cs.status_ = #{courseStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}