update

src/main/java/cn/com/qmth/scancentral/controller/admin/AuditorController.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.scancentral.controller.admin;
 
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.boot.core.collection.PageResult;
 
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.controller.BaseController;
@@ -49,9 +48,9 @@ public class AuditorController extends BaseController {
 
     @ApiOperation(value = "审核员任务历史")
     @RequestMapping(value = "/check/assigned/task/history", method = RequestMethod.POST)
-    public List<AnswerQueryVo> history(@RequestParam Long id, @RequestParam Long pageSize) {
+    public PageResult<AnswerQueryVo> history(@RequestParam Long examId,@RequestParam String subjectCode, @RequestParam Long pageSize, @RequestParam Long pageNumber) {
         User user = getAccessUser();
-        return studentService.getAssignedCheckTaskHistory(id, pageSize, user);
+        return studentService.getAssignedCheckTaskHistory(examId,subjectCode, pageNumber,pageSize, user);
     }
 
     @ApiOperation(value = "审核员任务提交")

src/main/java/cn/com/qmth/scancentral/controller/admin/CheckAssignedController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.boot.core.collection.PageResult;
 import com.qmth.boot.core.concurrent.service.ConcurrentService;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.boot.core.exception.ReentrantException;
@@ -120,9 +121,9 @@ public class CheckAssignedController extends BaseController {
 
     @ApiOperation(value = "管理员任务历史")
     @RequestMapping(value = "task/history", method = RequestMethod.POST)
-    public List<AnswerQueryVo> history(@RequestParam Long id, @RequestParam Long pageSize) {
+    public PageResult<AnswerQueryVo> history(@RequestParam Long examId, @RequestParam String subjectCode, @RequestParam Long pageNumber, @RequestParam Long pageSize) {
         User user = getAccessUser();
-        return studentService.getAssignedCheckTaskHistory(id, pageSize, user);
+        return studentService.getAssignedCheckTaskHistory(examId, subjectCode,pageNumber,pageSize, user);
     }
 
     @ApiOperation(value = "管理员任务提交")
@@ -134,14 +135,14 @@ public class CheckAssignedController extends BaseController {
 
     @ApiOperation(value = "管理员任务状态")
     @PostMapping("task/status")
-    public TaskStatusVo status(@RequestParam Long examId) {
+    public TaskStatusVo status(@RequestParam Long examId, @RequestParam String subjectCode) {
         User user = getAccessUser();
         return studentService.getAssignedCheckTaskStatus(examId, user);
     }
 
     @ApiOperation(value = "管理员任务释放")
     @PostMapping("task/release")
-    public Object release(@RequestParam Long examId) {
+    public Object release(@RequestParam Long examId, @RequestParam String subjectCode) {
         User user = getAccessUser();
         studentService.releaseAssignedCheckTaskByUser(examId, user.getAccount());
         return success(true);

src/main/java/cn/com/qmth/scancentral/dao/StudentDao.java

@@ -83,8 +83,8 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
                                     @Param("checkCount") int checkCount,@Param("pageNumber") int pageNumber,
             @Param("pageSize") int pageSize);
 
-    List<AnswerQueryVo> getAssignedCheckTaskHistory(@Param("id") Long id, @Param("pageSize") Long pageSize,
-            @Param("userId") Long userId, @Param("examId") Long examId);
+    IPage<AnswerQueryVo> getAssignedCheckTaskHistory(Page<AnswerQueryVo> page,@Param("examId") Long examId, @Param("subjectCode") String subjectCode,
+            @Param("userId") Long userId);
 
     void updateAssignedCheckCount(@Param("id") Long id);
 

src/main/java/cn/com/qmth/scancentral/service/StudentService.java

@@ -161,7 +161,7 @@ public interface StudentService extends IService<StudentEntity> {
 
     AssignedTaskSaveVo submitAssignedCheckTask(AssginedTaskResult result, User user);
 
-    List<AnswerQueryVo> getAssignedCheckTaskHistory(Long id, Long pageSize, User user);
+    PageResult<AnswerQueryVo> getAssignedCheckTaskHistory(Long examId,String subjectCode, Long pageNumber,Long pageSize, User user);
 
     AnswerQueryVo getAssignedCheckTask(Long examId,String subjectCode, User user);
 

src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -1878,14 +1878,12 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     }
 
     @Override
-    public List<AnswerQueryVo> getAssignedCheckTaskHistory(Long id, Long pageSize, User user) {
-        StudentEntity student = this.getById(id);
-        List<AnswerQueryVo> result = this.baseMapper.getAssignedCheckTaskHistory(id, pageSize, user.getId(),
-                student.getExamId());
-        for (AnswerQueryVo t : result) {
+    public PageResult<AnswerQueryVo> getAssignedCheckTaskHistory(Long examId,String subjectCode,Long pageNumber, Long pageSize, User user) {
+        IPage<AnswerQueryVo> result = this.baseMapper.getAssignedCheckTaskHistory(new Page<>(pageNumber, pageSize),examId,subjectCode,user.getId());
+        for (AnswerQueryVo t : result.getRecords()) {
             t = toTaskVo(t);
         }
-        return result;
+        return  PageUtil.of(result);
     }
 
     @Override

src/main/resources/mapper/StudentMapper.xml

@@ -604,13 +604,8 @@
                  left join sc_subject s on s.code = t.subject_code and s.exam_id = t.exam_id
         where h.user_id = #{userId}
           and h.exam_id = #{examId}
-          and h.id <= (select id
-                          from sc_assigned_check_history
-                          where student_id = #{id}
-                            and user_id = #{userId}
-                            and exam_id = #{examId})
+          and t.subject_code = #{subjectCode}
         order by h.id desc
-            limit #{pageSize}
     </select>
 
     <update id="updateAssignedCheckCount">