Merge remote-tracking branch 'origin/master'

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/java/com/ym/mec/biz/service/UploadFileService.java

@@ -62,7 +62,7 @@ public class UploadFileService {
 		File file = uploadFile(in, filePath, fileName);
 		if (maxSize > 0 && maxSize < file.length() / 1024) {
 			FileUtils.deleteQuietly(file);
-			uploadReturn.setMessage("超出允许的大小(50M)限制");
+			uploadReturn.setMessage("超出允许的大小(" + (maxSize / 1024) + "M)限制");
 			return uploadReturn;
 		}
 

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

@@ -407,7 +407,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		// 课程费用
 		StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId, musicGroupId);
 		if (studentRegistration == null) {
-			throw new BizException("用户 报名信息不存在");
+			throw new BizException("用户报名信息不存在");
 		}
 		MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId, musicGroupId);
 		if (musicGroupStudentFee == null) {

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}