1、教务端课程交换

2、vip课退课费用及相关逻辑调整
3、补签到、签退

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

@@ -1,43 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.biz.dal.dto.StudentAttendanceDto;
-import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.StudentAttendanceService;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author Joburgess
- * @Date 2020/1/17
- */
-@RequestMapping("studentAttendance")
-@Api(tags = "学生签到服务")
-@RestController
-public class StudentAttendanceController extends BaseController {
-
-    @Autowired
-    private ClassGroupService classGroupService;
-    @Autowired
-    private StudentAttendanceService studentAttendanceService;
-
-    @ApiOperation(value = "查询课程学生列表")
-    @GetMapping("/findAttendanceStudentByCourseWithPage")
-    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/findAttendanceStudentByCourseWithPage')")
-    public Object findAttendanceStudentByCourseWithPage(CourseScheduleQueryInfo queryInfo){
-        return succeed(classGroupService.findAttendanceStudentByCourseWithPage(queryInfo));
-    }
-
-    @ApiOperation(value = "更新学生签到记录")
-    @PostMapping("/updateStudentAttendances")
-    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/updateStudentAttendances')")
-    public Object updateStudentAttendances(@RequestBody StudentAttendanceDto studentAttendanceInfo){
-        studentAttendanceService.updateStudentAttendances(studentAttendanceInfo);
-        return succeed();
-    }
-
-}

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceOldController.java → mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceController.java

@@ -1,7 +1,9 @@
 package com.ym.mec.web.controller.student;
 
 import com.ym.mec.biz.dal.dto.StudentAttendanceDto;
+import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
+import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -11,13 +13,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-@RequestMapping("studentAttendanceOld")
+@RequestMapping("studentAttendance")
 @Api(tags = "学生考勤服务")
 @RestController
-public class StudentAttendanceOldController extends BaseController {
+public class StudentAttendanceController extends BaseController {
 
     @Autowired
     private StudentAttendanceService studentAttendanceService;
+    @Autowired
+    private ClassGroupService classGroupService;
 
     @ApiOperation(value = "点名完成")
     @PostMapping("/addStudentAttendances")
@@ -39,4 +43,19 @@ public class StudentAttendanceOldController extends BaseController {
         return succeed(studentAttendanceService.findStudentAttendance(queryInfo));
     }
 
+    @ApiOperation(value = "查询课程学生列表")
+    @GetMapping("/findAttendanceStudentByCourseWithPage")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/findAttendanceStudentByCourseWithPage')")
+    public Object findAttendanceStudentByCourseWithPage(CourseScheduleQueryInfo queryInfo){
+        return succeed(classGroupService.findAttendanceStudentByCourseWithPage(queryInfo));
+    }
+
+    @ApiOperation(value = "更新学生签到记录")
+    @PostMapping("/updateStudentAttendances")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/updateStudentAttendances')")
+    public Object updateStudentAttendances(@RequestBody StudentAttendanceDto studentAttendanceInfo){
+        studentAttendanceService.updateStudentAttendances(studentAttendanceInfo);
+        return succeed();
+    }
+
 }