投票列表增加分页参数

cloud-research-api/src/main/java/com/yizhi/research/application/feign/ResearchQuestionClient.java

@@ -60,7 +60,9 @@ public interface ResearchQuestionClient {
      * @return
      * @return
      */
      */
     @GetMapping("/researchQuestion/list")
     @GetMapping("/researchQuestion/list")
-    List<TrResearchQuestionVo> listAll(@RequestParam("researchId") Long researchId);
+    List<TrResearchQuestionVo> listAll(@RequestParam("researchId") Long researchId,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("pageNo") Integer pageNo);
 
 
     /**
     /**
      * 选择跳题时的问题列表
      * 选择跳题时的问题列表

cloud-research-service/src/main/java/com/yizhi/research/application/controller/TrResearchQuestionController.java

@@ -124,8 +124,10 @@ public class TrResearchQuestionController {
     }
     }
 
 
     @GetMapping("/list/all")
     @GetMapping("/list/all")
-    public List<TrResearchQuestion> list(@RequestParam("researchId") Long researchId) {
-        return researchQuestionService.listAll(researchId);
+    public List<TrResearchQuestion> list(@RequestParam("researchId") Long researchId,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("pageNo") Integer pageNo) {
+        return researchQuestionService.listAll(researchId, pageSize, pageNo);
     }
     }
 
 
     /**
     /**

cloud-research-service/src/main/java/com/yizhi/research/application/download/DownloadResearchDetails.java

@@ -177,7 +177,7 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
             if (CollectionUtils.isNotEmpty(viewAnswerVos)) {
             if (CollectionUtils.isNotEmpty(viewAnswerVos)) {
 
 
             }
             }
-            List<TrResearchQuestion> trResearchQuestions = researchQuestionService.listAll(researchId);
+            List<TrResearchQuestion> trResearchQuestions = researchQuestionService.listAll(researchId, null, null);
             if (CollectionUtils.isEmpty(trResearchQuestions)) {
             if (CollectionUtils.isEmpty(trResearchQuestions)) {
                 trResearchQuestions = new ArrayList<>();
                 trResearchQuestions = new ArrayList<>();
             }
             }

cloud-research-service/src/main/java/com/yizhi/research/application/service/ITrResearchQuestionService.java

@@ -56,7 +56,7 @@ public interface ITrResearchQuestionService extends IService<TrResearchQuestion>
      * @param researchId 所属调研id
      * @param researchId 所属调研id
      * @return
      * @return
      */
      */
-    List<TrResearchQuestion> listAll(Long researchId);
+    List<TrResearchQuestion> listAll(Long researchId, Integer pageSize, Integer pageNo);
 
 
     /**
     /**
      * 选择跳题时的问题列表
      * 选择跳题时的问题列表

cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/TrResearchQuestionServiceImpl.java

@@ -482,12 +482,19 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
     }
     }
 
 
     @Override
     @Override
-    public List<TrResearchQuestion> listAll(Long researchId) {
+    public List<TrResearchQuestion> listAll(Long researchId, Integer pageSize, Integer pageNo) {
+        if (pageNo == null) {
+            pageNo = 1;
+        }
+        if (pageSize == null) {
+            pageSize = Integer.MAX_VALUE;
+        }
         TrResearchQuestion question = new TrResearchQuestion();
         TrResearchQuestion question = new TrResearchQuestion();
         question.setResearchId(researchId);
         question.setResearchId(researchId);
         question.setDeleted(0);
         question.setDeleted(0);
         EntityWrapper<TrResearchQuestion> ew = new EntityWrapper<>(question);
         EntityWrapper<TrResearchQuestion> ew = new EntityWrapper<>(question);
         ew.orderBy("no", true);
         ew.orderBy("no", true);
+        ew.last("limit" + (pageNo - 1) * pageSize + "," + pageSize);
         List<TrResearchQuestion> questionList = researchQuestionMapper.selectList(ew);
         List<TrResearchQuestion> questionList = researchQuestionMapper.selectList(ew);
 
 
         TrResearchQuestionOption option = new TrResearchQuestionOption();
         TrResearchQuestionOption option = new TrResearchQuestionOption();