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

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

@@ -557,7 +557,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							//基础技能提高课
 							if (type == CourseScheduleType.HIGH) {
 								BigDecimal salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
-								if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
+								if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
 									salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
 								}
 								courseScheduleTeacherSalary.setExpectSalary(salary);
@@ -2650,8 +2650,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							}
 						}
 
-
-
 						//课堂课课酬
 						if (newCourseSchedule.getType() == CourseScheduleType.CLASSROOM) {
 							BigDecimal salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
@@ -2660,7 +2658,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						//基础技能提高课
 						if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
 							BigDecimal salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
-							if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
+							if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
 								salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
 							}
 							ts.setExpectSalary(salary);