|
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.qmth.themis.business.annotation.ApiJsonObject;
|
|
import com.qmth.themis.business.annotation.ApiJsonObject;
|
|
import com.qmth.themis.business.annotation.ApiJsonProperty;
|
|
import com.qmth.themis.business.annotation.ApiJsonProperty;
|
|
import com.qmth.themis.business.constant.SystemConstant;
|
|
import com.qmth.themis.business.constant.SystemConstant;
|
|
|
|
+import com.qmth.themis.business.dto.response.TEStudentDto;
|
|
|
|
+import com.qmth.themis.business.dto.response.TEStudentExamRecordDto;
|
|
import com.qmth.themis.business.entity.TBUser;
|
|
import com.qmth.themis.business.entity.TBUser;
|
|
import com.qmth.themis.business.entity.TEExamStudent;
|
|
import com.qmth.themis.business.entity.TEExamStudent;
|
|
import com.qmth.themis.business.entity.TEStudent;
|
|
import com.qmth.themis.business.entity.TEStudent;
|
|
@@ -41,9 +43,9 @@ public class TEStudentController {
|
|
|
|
|
|
@ApiOperation(value = "学生查询接口")
|
|
@ApiOperation(value = "学生查询接口")
|
|
@RequestMapping(value = "/query", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/query", method = RequestMethod.GET)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudent.class)})
|
|
|
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentDto.class)})
|
|
public Result query(@ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
public Result query(@ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
- IPage<Map> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
|
|
|
|
|
|
+ IPage<TEStudentDto> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
|
|
Map map = new HashMap<>();
|
|
Map map = new HashMap<>();
|
|
map.put(SystemConstant.RECORDS, teExamStudentIPage);
|
|
map.put(SystemConstant.RECORDS, teExamStudentIPage);
|
|
return ResultUtil.ok(map);
|
|
return ResultUtil.ok(map);
|
|
@@ -105,12 +107,12 @@ public class TEStudentController {
|
|
|
|
|
|
@ApiOperation(value = "学生考试记录查询接口")
|
|
@ApiOperation(value = "学生考试记录查询接口")
|
|
@RequestMapping(value = "/studentExamRecordQuery", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/studentExamRecordQuery", method = RequestMethod.GET)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudent.class)})
|
|
|
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentExamRecordDto.class)})
|
|
public Result studentExamRecordQuery(@ApiParam(value = "学生id", required = true) @RequestParam Long id, @ApiParam(value = "批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
public Result studentExamRecordQuery(@ApiParam(value = "学生id", required = true) @RequestParam Long id, @ApiParam(value = "批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
if (Objects.isNull(id) || Objects.equals(id, "")) {
|
|
if (Objects.isNull(id) || Objects.equals(id, "")) {
|
|
throw new BusinessException(ExceptionResultEnum.STUDENT_ID_IS_NULL);
|
|
throw new BusinessException(ExceptionResultEnum.STUDENT_ID_IS_NULL);
|
|
}
|
|
}
|
|
- IPage<Map> studentExamRecordQuery = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), id, name);
|
|
|
|
|
|
+ IPage<TEStudentExamRecordDto> studentExamRecordQuery = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), id, name);
|
|
Map map = new HashMap<>();
|
|
Map map = new HashMap<>();
|
|
map.put(SystemConstant.RECORDS, studentExamRecordQuery);
|
|
map.put(SystemConstant.RECORDS, studentExamRecordQuery);
|
|
return ResultUtil.ok(map);
|
|
return ResultUtil.ok(map);
|