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
0d35e562
Commit
0d35e562
authored
Jun 08, 2023
by
赵桢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改查询条件
parent
5a969125
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
464 additions
and
450 deletions
+464
-450
QuestionnaireCtrl.java
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
+30
-30
QuestionnaireDao.java
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
+0
-1
QuestionnaireServiceImpl.java
...a/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
+433
-418
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+1
-1
No files found.
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @
0d35e562
...
...
@@ -590,22 +590,22 @@ public class QuestionnaireCtrl {
Integer
id9
,
Integer
id10
,
Integer
id11
,
Integer
id12
,
Integer
id13
,
Integer
id14
,
Integer
id16
,
Integer
id17
,
Integer
id18
,
Integer
id19
,
Integer
id20
,
Integer
id21
,
Integer
id22
,
Integer
id23
,
Integer
id24
,
Integer
id25
,
Integer
id26
,
Integer
id27
,
Integer
id28
,
Integer
id29
,
Integer
id30
,
Integer
id31
,
Integer
id32
,
Integer
id33
,
Integer
id34
,
Integer
id35
,
Integer
id36
,
Integer
id37
,
Integer
id38
,
Integer
id39
,
Integer
id40
,
Integer
id41
,
Integer
id42
,
Integer
id43
,
Integer
id44
,
Integer
id45
,
Integer
id46
,
Integer
id47
,
Integer
id48
,
Integer
id49
,
Integer
id50
,
Integer
id51
,
Integer
id52
,
Integer
id53
,
Integer
id54
,
Integer
id55
,
Integer
id56
,
Integer
id57
,
Integer
id58
,
Integer
id59
,
Integer
id25
,
Integer
id26
,
Integer
id27
,
Integer
id28
,
Integer
id29
,
Integer
id30
,
Integer
id31
,
Integer
id32
,
Integer
id33
,
Integer
id34
,
Integer
id35
,
Integer
id36
,
Integer
id37
,
Integer
id38
,
Integer
id39
,
Integer
id40
,
Integer
id41
,
Integer
id42
,
Integer
id43
,
Integer
id44
,
Integer
id45
,
Integer
id46
,
Integer
id47
,
Integer
id48
,
Integer
id49
,
Integer
id50
,
Integer
id51
,
Integer
id52
,
Integer
id53
,
Integer
id54
,
Integer
id55
,
Integer
id56
,
Integer
id57
,
Integer
id58
,
Integer
id59
,
Integer
id60
,
Integer
id62
,
Integer
id63
,
Integer
id64
,
Integer
id65
,
Integer
id66
,
Integer
id67
,
Integer
id68
,
Integer
id69
,
Integer
id70
,
Integer
id71
,
Integer
id72
,
Integer
id73
,
Integer
id74
,
Integer
id75
,
Integer
id76
,
Integer
id77
,
Integer
id78
,
Integer
id79
,
Integer
id80
,
Integer
id81
,
Integer
id82
,
Integer
id83
,
Integer
id84
,
Integer
id85
,
Integer
id86
,
Integer
id87
,
Integer
id88
,
Integer
id89
,
Integer
id90
,
Integer
id91
,
Integer
id92
,
Integer
id93
,
Integer
id94
,
Integer
id95
,
Integer
id96
,
Integer
id97
,
Integer
id98
Integer
id62
,
Integer
id63
,
Integer
id64
,
Integer
id65
,
Integer
id66
,
Integer
id67
,
Integer
id68
,
Integer
id69
,
Integer
id70
,
Integer
id71
,
Integer
id72
,
Integer
id73
,
Integer
id74
,
Integer
id75
,
Integer
id76
,
Integer
id77
,
Integer
id78
,
Integer
id79
,
Integer
id80
,
Integer
id81
,
Integer
id82
,
Integer
id83
,
Integer
id84
,
Integer
id85
,
Integer
id86
,
Integer
id87
,
Integer
id88
,
Integer
id89
,
Integer
id90
,
Integer
id91
,
Integer
id92
,
Integer
id93
,
Integer
id94
,
Integer
id95
,
Integer
id96
,
Integer
id97
,
Integer
id98
)
{
questionnaireService
.
exportFullTimeWorkPersonNew
(
request
,
response
,
index
,
recordId
,
...
...
@@ -613,21 +613,21 @@ public class QuestionnaireCtrl {
id9
,
id10
,
id11
,
id12
,
id13
,
id14
,
id16
,
id17
,
id18
,
id19
,
id20
,
id21
,
id22
,
id23
,
id24
,
id25
,
id26
,
id27
,
id28
,
id29
,
id30
,
id31
,
id32
,
id33
,
id34
,
id35
,
id36
,
id37
,
id38
,
id39
,
id40
,
id41
,
id42
,
id43
,
id44
,
id45
,
id46
,
id47
,
id48
,
id49
,
id50
,
id51
,
id52
,
id53
,
id54
,
id55
,
id56
,
id57
,
id58
,
id59
,
id25
,
id26
,
id27
,
id28
,
id29
,
id30
,
id31
,
id32
,
id33
,
id34
,
id35
,
id36
,
id37
,
id38
,
id39
,
id40
,
id41
,
id42
,
id43
,
id44
,
id45
,
id46
,
id47
,
id48
,
id49
,
id50
,
id51
,
id52
,
id53
,
id54
,
id55
,
id56
,
id57
,
id58
,
id59
,
id60
,
id62
,
id63
,
id64
,
id65
,
id66
,
id67
,
id68
,
id69
,
id70
,
id71
,
id72
,
id73
,
id74
,
id75
,
id76
,
id77
,
id78
,
id79
,
id80
,
id81
,
id82
,
id83
,
id84
,
id85
,
id86
,
id87
,
id88
,
id89
,
id90
,
id91
,
id92
,
id93
,
id94
,
id95
,
id96
,
id97
,
id98
id62
,
id63
,
id64
,
id65
,
id66
,
id67
,
id68
,
id69
,
id70
,
id71
,
id72
,
id73
,
id74
,
id75
,
id76
,
id77
,
id78
,
id79
,
id80
,
id81
,
id82
,
id83
,
id84
,
id85
,
id86
,
id87
,
id88
,
id89
,
id90
,
id91
,
id92
,
id93
,
id94
,
id95
,
id96
,
id97
,
id98
);
}
...
...
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
View file @
0d35e562
...
...
@@ -132,7 +132,6 @@ public interface QuestionnaireDao {
);
List
<
IncubatedEnterprises
>
selectIncubatedEnterprisesListNew
(
@Param
(
"recordId"
)
String
recordId
,
@Param
(
"id16"
)
Integer
id16
,
@Param
(
"id17"
)
Integer
id17
,
@Param
(
"id18"
)
Integer
id18
,
...
...
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @
0d35e562
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/main/resources/mapper/Questionnaire.xml
View file @
0d35e562
...
...
@@ -219,7 +219,7 @@
LEFT JOIN t_record ON t_review.record_id=t_record.id
LEFT JOIN t_answer ON t_answer.record_id=t_review.record_id
<where>
t_record.process_status=3 OR t_record.process_status=2
(t_record.process_status=3 OR t_record.process_status=2)
<if
test=
"qnYear == null or qnYear == ''"
>
<!-- 年份 -->
AND t_record.qn_year = YEAR(NOW())
</if>
...
...
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