Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,7 @@ public class SysUserContracts {
 
 	public enum ContractType implements BaseEnum<String, ContractType> {
 
-		REGISTER("注册"), INSTRUMENT("乐器借用"), COURSES("课程购买");
+		REGISTER("注册"), INSTRUMENT("乐器借用"), COURSES("课程购买"), PRACTICE("陪练课购买");
 
 		private String desc;
 

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

@@ -881,7 +881,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
 		sysUserContracts.setCreateTime(date);
-		sysUserContracts.setType(ContractType.REGISTER);
+		sysUserContracts.setType(ContractType.PRACTICE);
 		sysUserContracts.setUrl(pdfFilePath);
 		sysUserContracts.setUserId(userId);
 

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

@@ -3145,7 +3145,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         LOGGER.info("清空老师和学生考勤,user:{},参数:{}",user.getId(),courseScheduleIds);
         List<Long> courseScheduleId = courseScheduleTeacherSalaryService.querySettlementScheduleId(courseScheduleIds);
         if(courseScheduleId == null || courseScheduleId.size() == 0){
-            throw new BizException("没有可修改的课程");
+            throw new BizException("课程已结算，无法清除考勤");
         }
         teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
         studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);