Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hqzhdj
cloud-web
Commits
252040b2
Commit
252040b2
authored
Sep 16, 2025
by
“Kongxiangkun”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
投票明细增加分页
parent
1947ab67
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
cloud-web-manage/src/main/java/com/yizhi/application/report/research/DownloadResearchAnalyze.java
+1
-1
cloud-web-manage/src/main/java/com/yizhi/application/research/controller/manage/ExportResearch.java
+1
-1
cloud-web-manage/src/main/java/com/yizhi/application/research/controller/manage/ResearchController.java
+1
-1
cloud-web-student/src/main/java/com/yizhi/application/research/controller/ResearchQuestionsController.java
+2
-4
No files found.
cloud-web-manage/src/main/java/com/yizhi/application/report/research/DownloadResearchAnalyze.java
View file @
252040b2
...
...
@@ -79,7 +79,7 @@ public class DownloadResearchAnalyze extends AbstractDefaultTask<String, Map<Str
List
<
ViewAnswerVo
>
viewAnswerVos
=
new
ArrayList
<
ViewAnswerVo
>();
List
<
ViewAnswerVo
>
viewAnswerVos1
;
List
<
TrResearchQuestionOptionVo
>
trResearchQuestionOptions
=
researchQuestionOptionClient
.
listOption
(
research
.
getId
());
List
<
TrResearchQuestionVo
>
trResearchQuestions
=
researchQuestionClient
.
listAll
(
research
.
getId
()
,
null
,
null
);
List
<
TrResearchQuestionVo
>
trResearchQuestions
=
researchQuestionClient
.
listAll
(
research
.
getId
());
if
(
trResearchQuestions
==
null
)
{
trResearchQuestions
=
new
ArrayList
<
TrResearchQuestionVo
>();
}
...
...
cloud-web-manage/src/main/java/com/yizhi/application/research/controller/manage/ExportResearch.java
View file @
252040b2
...
...
@@ -162,7 +162,7 @@ public class ExportResearch {
map
.
put
(
"startDate"
,
startDate
);
map
.
put
(
"endDate"
,
endDate
);
map
.
put
(
"taskName"
,
taskName
);
List
<
TrResearchQuestionVo
>
trResearchQuestions
=
researchQuestionClient
.
listAll
(
researchId
,
null
,
null
);
List
<
TrResearchQuestionVo
>
trResearchQuestions
=
researchQuestionClient
.
listAll
(
researchId
);
if
(
trResearchQuestions
==
null
)
{
trResearchQuestions
=
new
ArrayList
<
TrResearchQuestionVo
>();
}
...
...
cloud-web-manage/src/main/java/com/yizhi/application/research/controller/manage/ResearchController.java
View file @
252040b2
...
...
@@ -314,7 +314,7 @@ public class ResearchController {
Long
id
=
idVo
.
getId
();
// 判断当前调研下是否有添加问题
List
<
TrResearchQuestionVo
>
researchQuestionVoList
=
researchQuestionClient
.
listAll
(
id
,
null
,
null
);
List
<
TrResearchQuestionVo
>
researchQuestionVoList
=
researchQuestionClient
.
listAll
(
id
);
if
(
CollectionUtils
.
isEmpty
(
researchQuestionVoList
))
{
return
Response
.
fail
(
ReturnCode
.
BIZ_FAIL
.
getCode
(),
"当前投票没有添加问题,禁止上架!"
);
}
...
...
cloud-web-student/src/main/java/com/yizhi/application/research/controller/ResearchQuestionsController.java
View file @
252040b2
...
...
@@ -125,7 +125,7 @@ public class ResearchQuestionsController {
if
(
state
!=
2
)
{
return
Response
.
ok
(
1
);
}
return
Response
.
ok
(
researchQuestionClient
.
listAll
(
researchId
,
null
,
null
));
return
Response
.
ok
(
researchQuestionClient
.
listAll
(
researchId
));
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
""
,
e
);
return
Response
.
fail
(
ReturnCode
.
SERVICE_UNAVAILABLE
.
getCode
(),
ReturnCode
.
SERVICE_UNAVAILABLE
.
getMsg
());
...
...
@@ -135,12 +135,10 @@ public class ResearchQuestionsController {
@GetMapping
(
"/list/all"
)
@ApiOperation
(
value
=
"调研问题列表pc端"
,
notes
=
"所有问题"
,
response
=
TrResearchQuestionVo
.
class
)
public
Response
<
TrResearchQuestionVo
>
listAll
(
@ApiParam
(
name
=
"pageNo"
,
value
=
"当前页"
)
@RequestParam
(
name
=
"pageNo"
,
required
=
false
)
Integer
pageNo
,
@ApiParam
(
name
=
"pageSize"
,
value
=
"每页的个数"
)
@RequestParam
(
name
=
"pageSize"
,
required
=
false
)
Integer
pageSize
,
@ApiParam
(
name
=
"researchId"
,
value
=
"调研id"
,
required
=
true
)
@RequestParam
(
name
=
"researchId"
)
Long
researchId
)
{
try
{
return
Response
.
ok
(
researchQuestionClient
.
listAll
(
researchId
,
pageSize
,
pageNo
));
return
Response
.
ok
(
researchQuestionClient
.
listAll
(
researchId
));
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
""
,
e
);
return
Response
.
fail
(
Constants
.
RESEARCH_MSG_BIZ_ERROR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment