投票明细增加分页

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

@@ -117,17 +117,19 @@ public class TrResearchQuestionController {
      * @return
      */
     @GetMapping("/list")
-    public List<TrResearchQuestion> listAll(@RequestParam("researchId") Long researchId) {
+    public List<TrResearchQuestion> listAll(@RequestParam("researchId") Long researchId,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("pageNo") Integer pageNo) {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("researchId", researchId);
+        map.put("pageSize", pageSize);
+        map.put("pageNo", pageNo);
         return researchQuestionService.listPage(map);
     }
 
     @GetMapping("/list/all")
-    public List<TrResearchQuestion> list(@RequestParam("researchId") Long researchId,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("pageNo") Integer pageNo) {
-        return researchQuestionService.listAll(researchId, pageSize, pageNo);
+    public List<TrResearchQuestion> list(@RequestParam("researchId") Long researchId) {
+        return researchQuestionService.listAll(researchId);
     }
 
     /**

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

@@ -179,7 +179,7 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
             if (CollectionUtils.isNotEmpty(viewAnswerVos)) {
 
             }
-            List<TrResearchQuestion> trResearchQuestions = researchQuestionService.listAll(researchId, null, null);
+            List<TrResearchQuestion> trResearchQuestions = researchQuestionService.listAll(researchId);
             if (CollectionUtils.isEmpty(trResearchQuestions)) {
                 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
      * @return
      */
-    List<TrResearchQuestion> listAll(Long researchId, Integer pageSize, Integer pageNo);
+    List<TrResearchQuestion> listAll(Long researchId);
 
     /**
      * 选择跳题时的问题列表

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

@@ -424,11 +424,20 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
     @Override
     public List<TrResearchQuestion> listPage(Map<String, Object> map) {
         Long researchId = (Long) map.get("researchId");
+        Integer pageNo = (Integer) map.get("pageNo");
+        Integer pageSize = (Integer) map.get("pageSize");
+        if (pageNo == null) {
+            pageNo = 1;
+        }
+        if (pageSize == null) {
+            pageSize = Integer.MAX_VALUE;
+        }
         TrResearchQuestion example = new TrResearchQuestion();
         example.setResearchId(researchId);
         example.setDeleted(0);
         EntityWrapper<TrResearchQuestion> ew = new EntityWrapper<>(example);
         ew.orderBy("no", true);
+        ew.last("limit " + (pageNo - 1) * pageSize + "," + pageSize);
         List<TrResearchQuestion> records = researchQuestionMapper.selectList(ew);
         OtherOptionVo otherOptionVo = null;
         // 组装问题选项
@@ -483,20 +492,12 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
     }
 
     @Override
-    public List<TrResearchQuestion> listAll(Long researchId, Integer pageSize, Integer pageNo) {
-        LOG.info("获取投票列表入参 researchId:{}, pageSize:{}, pageNo:{}", researchId, pageSize, pageNo);
-        if (pageNo == null) {
-            pageNo = 1;
-        }
-        if (pageSize == null) {
-            pageSize = Integer.MAX_VALUE;
-        }
+    public List<TrResearchQuestion> listAll(Long researchId) {
         TrResearchQuestion question = new TrResearchQuestion();
         question.setResearchId(researchId);
         question.setDeleted(0);
         EntityWrapper<TrResearchQuestion> ew = new EntityWrapper<>(question);
         ew.orderBy("no", true);
-        ew.last("limit " + (pageNo - 1) * pageSize + "," + pageSize);
         List<TrResearchQuestion> questionList = researchQuestionMapper.selectList(ew);
         LOG.info("获取投票列表返回 questionList:{}", JSONUtil.toJsonStr(questionList));