查询返回类型修改

mec-education/src/main/java/com/ym/mec/education/controller/VipGroupController.java

@@ -32,10 +32,18 @@ public class VipGroupController {
         return BaseResponse.success(vipGroupService.getInfo(vipGroupReq));
     }
     @PostMapping("/courseList")
-    @ApiOperation("小课详情-le")
+    @ApiOperation("小课详情-班級")
     public PageResponse courseList(@RequestBody VipGroupReq vipGroupReq){
 
         return vipGroupService.courseList(vipGroupReq);
 
     }
+
+    @PostMapping("/attendanceList")
+    @ApiOperation("小课详情-點名")
+    public PageResponse attendanceList(@RequestBody VipGroupReq vipGroupReq){
+
+        return vipGroupService.attendanceList(vipGroupReq);
+
+    }
 }

mec-education/src/main/java/com/ym/mec/education/service/IVipGroupService.java

@@ -19,4 +19,6 @@ public interface IVipGroupService extends IService<VipGroup> {
     BaseResponse getInfo(VipGroupReq vipGroupReq);
 
     PageResponse courseList(VipGroupReq vipGroupReq);
+
+    PageResponse attendanceList(VipGroupReq vipGroupReq);
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/DemoGroupCoursesPlanServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service("IDemoGroupCoursesPlanService")
+@Service("iDemoGroupCoursesPlanService")
 public class DemoGroupCoursesPlanServiceImpl extends ServiceImpl<DemoGroupCoursesPlanMapper, DemoGroupCoursesPlan> implements IDemoGroupCoursesPlanService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -81,10 +81,8 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
             if (totalCount != 0) {
                 studentAttendanceResp.setAttendanceRate(normalCount + "/" + totalCount);
             }
-            QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
-            courseScheduleQueryWrapper.lambda().eq(true, CourseSchedule::getClassGroupId, classGroupReq.getGroupId())
-                    .eq(true, CourseSchedule::getTeacherId, item.getTeacherId());
-            CourseSchedule courseSchedule = courseScheduleService.getOne(courseScheduleQueryWrapper);
+
+            CourseSchedule courseSchedule = courseScheduleService.getById(item.getCourseScheduleId());
             if (Objects.nonNull(courseSchedule)) {
                 studentAttendanceResp.setClassDate(DateUtil.date2String(courseSchedule.getClassDate())
                         + " " + DateUtil.date2Week(courseSchedule.getClassDate()))

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -52,7 +52,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     private IClassGroupTeacherMapperService classGroupTeacherMapperService;
 
     @Autowired
-    private IDemoGroupCoursesPlanService demoGroupCoursesPlanService;
+    private IDemoGroupCoursesPlanService iDemoGroupCoursesPlanService;
 
     @Autowired
     private ITeacherLeaveRecordService teacherLeaveRecordService;
@@ -172,7 +172,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
                     List<Long> demoId = demoGroupList.stream().map(e ->e.getId()).collect(Collectors.toList());
                     QueryWrapper<DemoGroupCoursesPlan> planQueryWrapper = new QueryWrapper<>();
                     planQueryWrapper.in("demo_group_id_",demoId);
-                    List<DemoGroupCoursesPlan> demoGroupCoursesPlans =  demoGroupCoursesPlanService.list(planQueryWrapper);
+                    List<DemoGroupCoursesPlan> demoGroupCoursesPlans =  iDemoGroupCoursesPlanService.list(planQueryWrapper);
                     if(!CollectionUtils.isEmpty(demoGroupCoursesPlans)){
                         Map<Date, List<DemoGroupCoursesPlan>> collect = demoGroupCoursesPlans.stream()
                                 .collect(

mec-education/src/main/java/com/ym/mec/education/service/impl/VipGroupServiceImpl.java

@@ -149,6 +149,7 @@ public class VipGroupServiceImpl extends ServiceImpl<VipGroupMapper, VipGroup> i
      * @param vipGroupReq
      * @return
      */
+    @Override
     public PageResponse attendanceList(VipGroupReq vipGroupReq) {
         QueryWrapper<VipGroupClassGroupMapper> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("vip_group_id_",vipGroupReq.getVipGroupId());