|
@@ -197,14 +197,18 @@ public class ClassGradeController extends BaseController {
|
|
@ApiOperation("查询班级学员列表")
|
|
@ApiOperation("查询班级学员列表")
|
|
@PreAuthorize("@ss.hasPermi('grade:grade:list')")
|
|
@PreAuthorize("@ss.hasPermi('grade:grade:list')")
|
|
@GetMapping("/listGrade")
|
|
@GetMapping("/listGrade")
|
|
- public TableDataInfo<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo) {
|
|
|
|
|
|
+ public AjaxResult<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo) {
|
|
ClassGrade gradeGrade = iClassGradeService.getById(bo.getGradeId());
|
|
ClassGrade gradeGrade = iClassGradeService.getById(bo.getGradeId());
|
|
if (StringUtils.isNotBlank(gradeGrade.getSevenCode())){
|
|
if (StringUtils.isNotBlank(gradeGrade.getSevenCode())){
|
|
bo.setSevenCode(gradeGrade.getSevenCode());
|
|
bo.setSevenCode(gradeGrade.getSevenCode());
|
|
}
|
|
}
|
|
|
|
+ AjaxResult ajax = AjaxResult.success();
|
|
startPage();
|
|
startPage();
|
|
List<ClassGradeStudentVo> list = iClassGradeService.listGrade(bo);
|
|
List<ClassGradeStudentVo> list = iClassGradeService.listGrade(bo);
|
|
- return getDataTable(list);
|
|
|
|
|
|
+ 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;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|