fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -28,8 +28,6 @@ import com.zhongzheng.modules.grade.bo.*;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.service.*;
 import com.zhongzheng.modules.grade.vo.*;
-import com.zhongzheng.modules.order.bo.OrderQueryBo;
-import com.zhongzheng.modules.order.vo.OrderListExportVo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.models.auth.In;
 import lombok.RequiredArgsConstructor;
@@ -197,41 +195,16 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("查询班级学员列表")
     @PreAuthorize("@ss.hasPermi('grade:grade:list')")
     @GetMapping("/listGrade")
-    public AjaxResult<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo) {
+    public TableDataInfo<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo) {
         ClassGrade gradeGrade = iClassGradeService.getById(bo.getGradeId());
         if (StringUtils.isNotBlank(gradeGrade.getSevenCode())){
             bo.setSevenCode(gradeGrade.getSevenCode());
         }
-        AjaxResult ajax = AjaxResult.success();
         startPage();
         List<ClassGradeStudentVo> list = iClassGradeService.listGrade(bo);
-        ajax.put("ClassGradeStudentVoList",list);
-        ajax.put("continuePush",list.stream().filter(s->s.getPeriodPlush().equals(1)).collect(Collectors.toList()).size());
-        ajax.put("waitPush",list.stream().filter(s->!s.getPeriodPlush().equals(1)).collect(Collectors.toList()).size());
-        return ajax;
-    }
-
-    /**
-     * 查询所有班级用户列表
-     */
-    @ApiOperation("查询所有班级用户列表")
-    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
-    @GetMapping("/listGradeAll")
-    public TableDataInfo<ClassGradeStudentVo> listGradeAll(ClassGradeUserQueryBo bo) {
-        startPage();
-        List<ClassGradeStudentVo> list = iClassGradeService.listGradeAll(bo);
         return getDataTable(list);
     }
 
-    @ApiOperation("导出所有班级用户列表")
-    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
-    @GetMapping("/listGradeAllExport")
-    public AjaxResult<ClassGradeStudentAllExportVo> listGradeAllExport(ClassGradeUserQueryBo bo) {
-        List<ClassGradeStudentAllExportVo> list = iClassGradeService.listGradeAllExport(bo);
-        ExcelUtil<ClassGradeStudentAllExportVo> util = new ExcelUtil<>(ClassGradeStudentAllExportVo.class);
-        return util.exportExcel(list,"报班学员记录");
-    }
-
     /**
      * 导出班级学员列表
      */
@@ -270,39 +243,6 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 查询学时学员记录列表
-     */
-    @ApiOperation("查询学员学时列表")
-    @PreAuthorize("@ss.hasPermi('grade:user:list')")
-    @GetMapping("/listUserPeriod/manage")
-    public TableDataInfo<ClassPeriodStudentVo> listUserPeriodManage(ClassGradeUserQueryBo bo) {
-        startPage();
-        List<ClassPeriodStudentVo> list = iClassGradeUserService.listUserPeriodManage(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 查询学时学员记录统计
-     */
-    @ApiOperation("查询学时学员记录统计")
-    @GetMapping("/listUserPeriod/total")
-    public AjaxResult<UserPeriodTotalVo> listUserPeriodTotal(ClassGradeUserQueryBo bo) {
-        return AjaxResult.success(iClassGradeUserService.listUserPeriodTotal(bo));
-    }
-
-    /**
-     * 查询学时学员记录列表(新)
-     */
-    @ApiOperation("查询学员学时列表(新)")
-    @GetMapping("/listUserPeriod/new")
-    public TableDataInfo<ClassPeriodStudentNewVo> listUserPeriodNew(ClassGradeUserQueryBo bo) {
-        startPage();
-        List<ClassPeriodStudentNewVo> list = iClassGradeUserService.listUserPeriodNew(bo);
-        return getDataTable(list);
-    }
-
     /**
      * 查询学时学员记录列表
      */
@@ -315,25 +255,6 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    @ApiOperation("导出学员学时学习记录列表")
-    @GetMapping("/exportListUserPeriodRecord")
-    public AjaxResult<ClassPeriodStudentExportProcessVo> exportListUserPeriodRecord(ClassGradeUserQueryBo bo) {
-        List<ClassPeriodStudentExportProcessVo> list = iClassGradeUserService.exportListUserPeriodRecord(bo);
-        ExcelUtil<ClassPeriodStudentExportProcessVo> util = new ExcelUtil<>(ClassPeriodStudentExportProcessVo.class);
-        return util.exportExcel(list,"学员学时学习记录列表");
-    }
-
-    /**
-     * 班级管理列表
-     */
-    @ApiOperation("班级管理列表")
-    @GetMapping("/listUserPeriodRecord/new")
-    public TableDataInfo<ClassPeriodStudentVo> listUserPeriodRecordNew(ClassGradeUserQueryBo bo) {
-        startPage();
-        List<ClassPeriodStudentVo> list = iClassGradeUserService.listUserPeriodRecordNew(bo);
-        return getDataTable(list);
-    }
-
     @ApiOperation("按周查询学员学时学习记录列表")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listUserPeriodWeekRecord")
@@ -353,14 +274,6 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    @ApiOperation("查询学员视频学习记录列表")
-    @GetMapping("/listUserVideoRecord/new")
-    public TableDataInfo<ClassPeriodStudentVo> listUserVideoRecordNew(ClassGradeUserQueryBo bo) {
-        startPage();
-        List<ClassPeriodStudentVo> list = iClassGradeUserService.listUserVideoRecordNew(bo);
-        return getDataTable(list);
-    }
-
     /**
      * 查询学时学员记录列表
      */