修改最小页数量

distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java

@@ -1,15 +1,11 @@
 package com.qmth.distributed.print.api;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
-import com.qmth.distributed.print.business.bean.result.analyze.GradeInitResult;
-import com.qmth.distributed.print.business.entity.ExamPaperStructure;
 import com.qmth.distributed.print.business.enums.ExamPaperStructureStatusEnum;
 import com.qmth.distributed.print.business.service.ExamPaperStructureService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
-import com.qmth.distributed.print.business.service.GradeBatchPaperService;
 import com.qmth.distributed.print.business.service.GradeInitializeService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -55,7 +51,7 @@ public class WorkController {
     @RequestMapping(value = "/exam/task/ready", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result getFlowTaskReady(@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(2) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(examTaskService.getFlowTaskReadyList(new Page<>(pageNumber, pageSize), SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), sysUser.getId()));
     }
@@ -76,8 +72,7 @@ public class WorkController {
     @ApiOperation(value = "阅卷待办任务-数量")
     @RequestMapping(value = "/structure/task/ready_count", method = RequestMethod.POST)
     public Result countStructure() {
-        long count = examPaperStructureService.countByPropositionTeacherId();
-        return ResultUtil.ok(count);
+        return ResultUtil.ok(examPaperStructureService.countByPropositionTeacherId());
     }
 
     /**
@@ -88,10 +83,9 @@ public class WorkController {
     @ApiOperation(value = "阅卷待办任务-列表")
     @RequestMapping(value = "/structure/task/ready", method = RequestMethod.POST)
     public Result list(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                       @RequestParam @Min(2) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         String[] structureStatusEnums = new String[]{ExamPaperStructureStatusEnum.FINISH.name()};
-        IPage<ExamPaperStructure> examPaperStructureIPage = examPaperStructureService.listByPropositionTeacherId(null, null, pageNumber, pageSize, structureStatusEnums);
-        return ResultUtil.ok(examPaperStructureIPage);
+        return ResultUtil.ok(examPaperStructureService.listByPropositionTeacherId(null, null, pageNumber, pageSize, structureStatusEnums));
     }
 
     /**
@@ -100,8 +94,7 @@ public class WorkController {
     @ApiOperation(value = "教研待办任务-数量")
     @RequestMapping(value = "/grade/task/ready_count", method = RequestMethod.POST)
     public Result countReport() {
-        long count = gradeInitializeService.countByPropositionTeacherId();
-        return ResultUtil.ok(count);
+        return ResultUtil.ok(gradeInitializeService.countByPropositionTeacherId());
     }
 
     /**
@@ -110,10 +103,9 @@ public class WorkController {
     @ApiOperation(value = "阅卷待办任务-列表")
     @RequestMapping(value = "/grade/task/ready", method = RequestMethod.POST)
     public Result gradeList(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                            @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                            @RequestParam @Min(2) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        IPage<GradeInitResult> needAnalyzedPaper = gradeInitializeService.listNeedAnalyzedPaperToWork(requestUser, pageNumber, pageSize);
-        return ResultUtil.ok(needAnalyzedPaper);
+        return ResultUtil.ok(gradeInitializeService.listNeedAnalyzedPaperToWork(requestUser, pageNumber, pageSize));
     }
 }