Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
platform
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
platform
Commits
bb48d4bf
Commit
bb48d4bf
authored
Jul 08, 2023
by
张宇杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
f3a52e3d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
13 deletions
+22
-13
QuestionnaireCtrl.java
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
+2
-2
QuestionnaireDao.java
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
+1
-1
QuestionnaireService.java
src/main/java/com/tiptimes/service/QuestionnaireService.java
+1
-1
QuestionnaireServiceImpl.java
...a/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
+2
-2
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+16
-7
No files found.
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @
bb48d4bf
...
...
@@ -585,8 +585,8 @@ public class QuestionnaireCtrl {
*/
@RequestMapping
(
value
=
{
"/queryArray"
})
@ResponseBody
public
void
queryArray
(
Options
options
){
questionnaireService
.
queryArray
(
options
);
public
List
<
Options
>
queryArray
(
Options
options
){
return
questionnaireService
.
queryArray
(
options
);
}
/**
...
...
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
View file @
bb48d4bf
...
...
@@ -122,7 +122,7 @@ public interface QuestionnaireDao {
List
<
Record
>
AboutViewListCopy
(
Record
record
);
Integer
queryArray
(
Options
options
);
List
<
Options
>
queryArray
(
Options
options
);
List
<
SiteCondition
>
selectSiteConditionListTemp
(
@Param
(
"recordId"
)
String
recordId
,
...
...
src/main/java/com/tiptimes/service/QuestionnaireService.java
View file @
bb48d4bf
...
...
@@ -140,7 +140,7 @@ public interface QuestionnaireService {
List
<
Record
>
AboutViewListCopy
(
Record
record
);
void
queryArray
(
Options
options
);
List
<
Options
>
queryArray
(
Options
options
);
void
exportFullTimeWorkPersonNew
(
HttpServletRequest
request
,
HttpServletResponse
response
,
String
index
,
String
recordId
,
Integer
qnYear
,
String
createId
,
Integer
id1
,
Integer
id2
,
Integer
id3
,
...
...
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @
bb48d4bf
...
...
@@ -1425,8 +1425,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
}
@Override
public
void
queryArray
(
Options
options
){
questionnaireDao
.
queryArray
(
options
);
public
List
<
Options
>
queryArray
(
Options
options
){
return
questionnaireDao
.
queryArray
(
options
);
}
/**
...
...
src/main/resources/mapper/Questionnaire.xml
View file @
bb48d4bf
...
...
@@ -1720,13 +1720,22 @@
ORDER BY spaceName;
</select>
<select
id=
"queryArray"
resultType=
"
java.lang.Integer
"
>
<select
id=
"queryArray"
resultType=
"
com.tiptimes.model.Options
"
>
SELECT t_options.id FROM t_options
WHERE t_options.question_id IN
(SELECT t_questions.id FROM t_questions
WHERE t_questions.questionnaire_uuid = (
SELECT t_questionnaire.id FROM t_questionnaire
WHERE t_questionnaire.qn_year = #{qnYear}))
</select>
WHERE t_options.question_id IN
(SELECT t_questions.id FROM t_questions
WHERE t_questions.questionnaire_uuid = (
SELECT t_questionnaire.id FROM t_questionnaire
WHERE t_questionnaire.qn_year = #{qnYear}))
</select>
<!-- <select id="queryArray" resultType="java.lang.Integer">-->
<!-- SELECT t_options.id FROM t_options-->
<!-- WHERE t_options.question_id IN-->
<!-- (SELECT t_questions.id FROM t_questions-->
<!-- WHERE t_questions.questionnaire_uuid = (-->
<!-- SELECT t_questionnaire.id FROM t_questionnaire-->
<!-- WHERE t_questionnaire.qn_year = #{qnYear}))-->
<!-- </select>-->
</mapper>
\ No newline at end of file
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