Skip to content

R
research-project
Commit e5e64d3f by “Kongxiangkun”
Options

投票明细增加分页

parent e033a28d
Showing with 19 additions and 16 deletions
cloud-research-service/src/main/java/com/yizhi/research/application/controller/TrResearchQuestionController.java
...@@ -117,17 +117,19 @@ public class TrResearchQuestionController { ...@@ -117,17 +117,19 @@ public class TrResearchQuestionController {
* @return * @return
*/ */
@GetMapping("/list") @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<String, Object> map = new HashMap<String, Object>();
map.put("researchId", researchId); map.put("researchId", researchId);
map.put("pageSize", pageSize);
map.put("pageNo", pageNo);
return researchQuestionService.listPage(map); return researchQuestionService.listPage(map);
} }
@GetMapping("/list/all") @GetMapping("/list/all")
public List<TrResearchQuestion> list(@RequestParam("researchId") Long researchId, public List<TrResearchQuestion> list(@RequestParam("researchId") Long researchId) {
@RequestParam("pageSize") Integer pageSize, return researchQuestionService.listAll(researchId);
@RequestParam("pageNo") Integer pageNo) {
return researchQuestionService.listAll(researchId, pageSize, pageNo);
} }
/** /**
......
cloud-research-service/src/main/java/com/yizhi/research/application/download/DownloadResearchDetails.java
...@@ -179,7 +179,7 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa ...@@ -179,7 +179,7 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
if (CollectionUtils.isNotEmpty(viewAnswerVos)) { if (CollectionUtils.isNotEmpty(viewAnswerVos)) {
} }
List<TrResearchQuestion> trResearchQuestions = researchQuestionService.listAll(researchId, null, null); List<TrResearchQuestion> trResearchQuestions = researchQuestionService.listAll(researchId);
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> ...@@ -56,7 +56,7 @@ public interface ITrResearchQuestionService extends IService<TrResearchQuestion>
* @param researchId 所属调研id * @param researchId 所属调研id
* @return * @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 ...@@ -424,11 +424,20 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
@Override @Override
public List<TrResearchQuestion> listPage(Map<String, Object> map) { public List<TrResearchQuestion> listPage(Map<String, Object> map) {
Long researchId = (Long) map.get("researchId"); 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(); TrResearchQuestion example = new TrResearchQuestion();
example.setResearchId(researchId); example.setResearchId(researchId);
example.setDeleted(0); example.setDeleted(0);
EntityWrapper<TrResearchQuestion> ew = new EntityWrapper<>(example); EntityWrapper<TrResearchQuestion> ew = new EntityWrapper<>(example);
ew.orderBy("no", true); ew.orderBy("no", true);
ew.last("limit " + (pageNo - 1) * pageSize + "," + pageSize);
List<TrResearchQuestion> records = researchQuestionMapper.selectList(ew); List<TrResearchQuestion> records = researchQuestionMapper.selectList(ew);
OtherOptionVo otherOptionVo = null; OtherOptionVo otherOptionVo = null;
// 组装问题选项 // 组装问题选项
...@@ -483,20 +492,12 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio ...@@ -483,20 +492,12 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
} }
@Override @Override
public List<TrResearchQuestion> listAll(Long researchId, Integer pageSize, Integer pageNo) { public List<TrResearchQuestion> listAll(Long researchId) {
LOG.info("获取投票列表入参 researchId:{}, pageSize:{}, pageNo:{}", researchId, pageSize, 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);
LOG.info("获取投票列表返回 questionList:{}", JSONUtil.toJsonStr(questionList)); LOG.info("获取投票列表返回 questionList:{}", JSONUtil.toJsonStr(questionList));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment