Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
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
王飞
vehicle-quality-review
Commits
599c6579
Commit
599c6579
authored
1 year ago
by
盖献康
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gaixiankang' into 'dev'
bug - 70905 See merge request
!249
parents
dd25fdc9
b83d2e71
dev
gaixiankang
gaoying
master
songyuanshuo
wangdingyi
wangfei
19.0
18.0
17.0
16.0
15.0
14.0
13.0
12.0
11.0
10.0
9.0
8.0
7.0
6.0
5.0
4.0
3.0
2.0
1.0
1 merge request
!275
dev - master 4.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
ReviewStandardListByPageRequest.java
...om/ruoyi/web/request/ReviewStandardListByPageRequest.java
+3
-0
ReviewStandardMapper.xml
...review/src/main/resources/mapper/ReviewStandardMapper.xml
+5
-1
No files found.
quality-review/src/main/java/com/ruoyi/web/request/ReviewStandardListByPageRequest.java
View file @
599c6579
...
...
@@ -42,4 +42,7 @@ public class ReviewStandardListByPageRequest extends PageDomain {
*/
@ApiModelProperty
(
"文本内容"
)
private
String
text
;
@ApiModelProperty
(
"测试方法"
)
private
String
testMethod
;
}
This diff is collapsed.
Click to expand it.
quality-review/src/main/resources/mapper/ReviewStandardMapper.xml
View file @
599c6579
...
...
@@ -41,7 +41,10 @@
<select
id=
"selectReviewStandardList"
parameterType=
"com.ruoyi.web.request.ReviewStandardListByPageRequest"
resultType=
"com.ruoyi.web.response.ReviewStandardResponse"
>
select
id, chapter, text
id,
chapter,
text,
test_method AS testMethod
from
t_review_standard
<where>
...
...
@@ -49,6 +52,7 @@
<if
test=
"type != null and type != ''"
>
and `type` = #{type}
</if>
<if
test=
"chapter != null and chapter != ''"
>
and chapter like concat('%', #{chapter}, '%')
</if>
<if
test=
"text != null and text != ''"
>
and text like concat('%', #{text}, '%')
</if>
<if
test=
"testMethod != null and testMethod != ''"
>
and test_method like concat('%', #{testMethod}, '%')
</if>
</where>
ORDER BY
chapter
...
...
This diff is collapsed.
Click to expand it.
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