评价计划调整

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -101,12 +101,13 @@ public class AssessmentPlanAnswerController {
         return RT.ok(page);
     }
 
-    @GetMapping(value = "/answer-student-list")
+    @GetMapping(value = "/answer-student-page")
     @ApiOperation(value="考核计划答题列表-学生答题情况(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<List<AssessmentPlanAnswerStudentVo>> answerStudent(@Valid AssessmentPlanAnswerStudentDto dto){
-        List<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudent(dto);
-        return RT.ok(page);
+    public RT<PageOutput<AssessmentPlanAnswerStudentVo>> answerStudent(@Valid AssessmentPlanAnswerStudentDto dto){
+        Page<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudent(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<AssessmentPlanAnswerStudentVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentVo.class);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
@@ -173,7 +174,6 @@ public class AssessmentPlanAnswerController {
     @ApiOperation(value="考核计划答题列表-学生答题情况导出")
     @SaCheckPermission("assessmenttemplateplan:detail")
     public RT<List<AssessmentPlanAnswerStudentVo>> answerExportQuery(@Valid AssessmentPlanAnswerStudentDto dto){
-        List<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudent(dto);
-        return RT.ok(page);
+        return RT.ok();
     }
 }

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentTemplatePlanMapper.java

@@ -38,7 +38,7 @@ public interface AssessmentTemplatePlanMapper extends MPJBaseMapper<AssessmentTe
 
     List<AssessmentTemplatePlanPageVo> getMobilePage(@Param("dto") AssessmentTemplatePlanPageDto dto);
 
-    List<AssessmentPlanAnswerStudentVo> getAnswerStudent(@Param("dto") AssessmentPlanAnswerStudentDto dto);
+    Page<AssessmentPlanAnswerStudentVo> getAnswerStudent(Page<AssessmentPlanAnswerStudentDto> page, @Param("dto") AssessmentPlanAnswerStudentDto dto);
 
     List<Long> getSemesterClass(Long id);
 }

src/main/java/com/xjrsoft/module/assessment/service/IAssessmentTemplatePlanService.java

@@ -81,7 +81,7 @@ public interface IAssessmentTemplatePlanService extends MPJBaseService<Assessmen
     List<AssessmentTemplatePlanPageVo> getMobilePage(AssessmentTemplatePlanPageDto dto);
 
 
-    List<AssessmentPlanAnswerStudentVo> getAnswerStudent(AssessmentPlanAnswerStudentDto dto);
+    Page<AssessmentPlanAnswerStudentVo> getAnswerStudent(Page<AssessmentPlanAnswerStudentDto> page, AssessmentPlanAnswerStudentDto dto);
 
     List<Long> getSemesterClass(Long id);
 

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -399,12 +399,12 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
     }
 
     @Override
-    public List<AssessmentPlanAnswerStudentVo> getAnswerStudent(AssessmentPlanAnswerStudentDto dto) {
+    public Page<AssessmentPlanAnswerStudentVo> getAnswerStudent(Page<AssessmentPlanAnswerStudentDto> page, AssessmentPlanAnswerStudentDto dto) {
         List<String> roleList = StpUtil.getRoleList();
         if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
         }
-        return templatePlanMapper.getAnswerStudent(dto);
+        return templatePlanMapper.getAnswerStudent(page, dto);
     }
 
     @Override