feat:0课酬二次确认

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -259,7 +259,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @Date: 2019/9/24
 	 * 课程交换
 	 */
-	void courseSwap(Long courseScheduleId1, Long courseScheduleId2, Boolean allowZeroSalary);
+	void courseSwap(Long courseScheduleId1, Long courseScheduleId2);
 
 	/**
 	 * @Author: Joburgess

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

@@ -3719,7 +3719,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void courseSwap(Long courseScheduleId1, Long courseScheduleId2, Boolean allowZeroSalary) {
+    public void courseSwap(Long courseScheduleId1, Long courseScheduleId2) {
         if (courseScheduleId1.equals(courseScheduleId2)) {
             throw new BizException("请选择不同的课程");
         }
@@ -3752,7 +3752,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<CourseSchedule> courseSchedules = new ArrayList<>();
         courseSchedules.add(courseSchedule1);
         courseSchedules.add(courseSchedule2);
-        courseAdjust(courseSchedules, allowZeroSalary);
+        courseAdjust(courseSchedules, true);
     }
 
     @Override

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -274,7 +274,7 @@ public class TeacherCourseScheduleController extends BaseController {
         if(Objects.isNull(courseScheduleId1)||Objects.isNull(courseScheduleId2)){
             return failed("请指定课程!");
         }
-        scheduleService.courseSwap(courseScheduleId1,courseScheduleId2, true);
+        scheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
         return succeed();
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -262,14 +262,11 @@ public class CourseScheduleController extends BaseController {
     @ApiOperation(value = "课时交换")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseSwap')")
     @GetMapping(value = "/courseSwap",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2, Boolean allowZeroSalary){
+    public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2){
         if(Objects.isNull(courseScheduleId1)||Objects.isNull(courseScheduleId2)){
             return failed("请指定课程");
         }
-        if(Objects.isNull(allowZeroSalary)){
-            allowZeroSalary = false;
-        }
-        courseScheduleService.courseSwap(courseScheduleId1,courseScheduleId2,allowZeroSalary);
+        courseScheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
         return succeed();
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EducationCourseScheduleController.java

@@ -65,14 +65,11 @@ public class EducationCourseScheduleController extends BaseController {
 
     @ApiOperation(value = "课时交换")
     @PostMapping(value = "/courseSwap",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2, Boolean allowZeroSalary){
+    public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2){
         if(Objects.isNull(courseScheduleId1)||Objects.isNull(courseScheduleId2)){
             return failed("请指定课程!");
         }
-        if(Objects.isNull(allowZeroSalary)){
-            allowZeroSalary = false;
-        }
-        scheduleService.courseSwap(courseScheduleId1,courseScheduleId2,allowZeroSalary);
+        scheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
         return succeed();
     }
 }