Commit 2ec9416d by “Kongxiangkun”

投票明细增加分页

parent 4064808d
...@@ -162,7 +162,7 @@ public class ExportResearch { ...@@ -162,7 +162,7 @@ public class ExportResearch {
map.put("startDate", startDate); map.put("startDate", startDate);
map.put("endDate", endDate); map.put("endDate", endDate);
map.put("taskName", taskName); map.put("taskName", taskName);
List<TrResearchQuestionVo> trResearchQuestions = researchQuestionClient.listAll(researchId); List<TrResearchQuestionVo> trResearchQuestions = researchQuestionClient.listAll(researchId, null, null);
if (trResearchQuestions == null) { if (trResearchQuestions == null) {
trResearchQuestions = new ArrayList<TrResearchQuestionVo>(); trResearchQuestions = new ArrayList<TrResearchQuestionVo>();
} }
......
...@@ -170,7 +170,7 @@ public class ExportResearch2 { ...@@ -170,7 +170,7 @@ public class ExportResearch2 {
paramsVo.setTaskId(taskId); paramsVo.setTaskId(taskId);
paramsVo.setTaskName(taskName); paramsVo.setTaskName(taskName);
paramsVo.setSerialNo(serialNo); paramsVo.setSerialNo(serialNo);
List<TrResearchQuestionVo> trResearchQuestions = researchQuestionClient.listAll(researchId); List<TrResearchQuestionVo> trResearchQuestions = researchQuestionClient.listAll(researchId, null, null);
if (trResearchQuestions == null) { if (trResearchQuestions == null) {
trResearchQuestions = new ArrayList<TrResearchQuestionVo>(); trResearchQuestions = new ArrayList<TrResearchQuestionVo>();
} }
......
...@@ -314,7 +314,7 @@ public class ResearchController { ...@@ -314,7 +314,7 @@ public class ResearchController {
Long id = idVo.getId(); Long id = idVo.getId();
// 判断当前调研下是否有添加问题 // 判断当前调研下是否有添加问题
List<TrResearchQuestionVo> researchQuestionVoList = researchQuestionClient.listAll(id); List<TrResearchQuestionVo> researchQuestionVoList = researchQuestionClient.listAll(id, null, null);
if (CollectionUtils.isEmpty(researchQuestionVoList)) { if (CollectionUtils.isEmpty(researchQuestionVoList)) {
return Response.fail(ReturnCode.BIZ_FAIL.getCode(), "当前投票没有添加问题,禁止上架!"); return Response.fail(ReturnCode.BIZ_FAIL.getCode(), "当前投票没有添加问题,禁止上架!");
} }
......
...@@ -158,7 +158,7 @@ public class ResearchQuestionController { ...@@ -158,7 +158,7 @@ public class ResearchQuestionController {
@ApiParam(name = "researchId", value = "调研id", required = true) @RequestParam(name = "researchId") Long researchId @ApiParam(name = "researchId", value = "调研id", required = true) @RequestParam(name = "researchId") Long researchId
) { ) {
try { try {
return Response.ok(researchQuestionClient.listAll(researchId)); return Response.ok(researchQuestionClient.listAll(researchId, null, null));
// return Response.ok(researchQuestionClient.listAll(researchId)); // return Response.ok(researchQuestionClient.listAll(researchId));
} catch (Exception e) { } catch (Exception e) {
......
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