|
@@ -97,9 +97,6 @@ public class ExamDetailController {
|
|
if (semesterId == null) {
|
|
if (semesterId == null) {
|
|
throw ExceptionResultEnum.ERROR.exception("请选择学期");
|
|
throw ExceptionResultEnum.ERROR.exception("请选择学期");
|
|
}
|
|
}
|
|
- if (examId == null) {
|
|
|
|
- throw ExceptionResultEnum.ERROR.exception("请选择考试");
|
|
|
|
- }
|
|
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
|
|
DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
|
|
@@ -156,9 +153,6 @@ public class ExamDetailController {
|
|
if (semesterId == null) {
|
|
if (semesterId == null) {
|
|
throw ExceptionResultEnum.ERROR.exception("请选择学期");
|
|
throw ExceptionResultEnum.ERROR.exception("请选择学期");
|
|
}
|
|
}
|
|
- if (examId == null) {
|
|
|
|
- throw ExceptionResultEnum.ERROR.exception("请选择考试");
|
|
|
|
- }
|
|
|
|
if (Objects.isNull(printPlanIdList)) {
|
|
if (Objects.isNull(printPlanIdList)) {
|
|
printPlanIdList = new ArrayList<>();
|
|
printPlanIdList = new ArrayList<>();
|
|
}
|
|
}
|
|
@@ -185,7 +179,6 @@ public class ExamDetailController {
|
|
public Result findExaminationDetailById(@ApiParam(value = "考务场次id", required = true) @RequestParam String examDetailId,
|
|
public Result findExaminationDetailById(@ApiParam(value = "考务场次id", required = true) @RequestParam String examDetailId,
|
|
@ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
@ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
@ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
@ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
-
|
|
|
|
return ResultUtil.ok(examDetailService.findExaminationDetail(SystemConstant.convertIdToLong(examDetailId), pageNumber, pageSize));
|
|
return ResultUtil.ok(examDetailService.findExaminationDetail(SystemConstant.convertIdToLong(examDetailId), pageNumber, pageSize));
|
|
}
|
|
}
|
|
|
|
|