Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-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
youjj
cloud-platform
Commits
a57c79b9
Commit
a57c79b9
authored
Aug 06, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
网关日志限制修改
parent
149a94eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+4
-1
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+4
-0
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
a57c79b9
...
@@ -301,7 +301,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
...
@@ -301,7 +301,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
Integer
page
;
Integer
page
;
@ApiModelProperty
(
"每页限制"
)
@ApiModelProperty
(
"每页限制"
)
Integer
limit
;
Integer
limit
;
/**
* 会员等级
*/
Integer
memberLevel
;
List
<
Integer
>
companyIds
;
List
<
Integer
>
companyIds
;
}
}
...
...
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
a57c79b9
...
@@ -115,6 +115,7 @@
...
@@ -115,6 +115,7 @@
from base_order b
from base_order b
LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
LEFT JOIN order_tour_detail t on t.order_id = b.id
LEFT JOIN order_tour_detail t on t.order_id = b.id
LEFT JOIN order_member_detail on m.order_id = b.id
<where>
<where>
<if
test=
"crtUser != null"
>
<if
test=
"crtUser != null"
>
and b.crt_user = #{crtUser}
and b.crt_user = #{crtUser}
...
@@ -128,6 +129,9 @@
...
@@ -128,6 +129,9 @@
<if
test=
"type != null"
>
<if
test=
"type != null"
>
and b.type = #{type}
and b.type = #{type}
</if>
</if>
<if
test=
"memberLevel != null and memberLevel != ''"
>
and m.member_level = #{memberLevel}
</if>
<if
test=
"no != null and no != '' "
>
<if
test=
"no != null and no != '' "
>
and no like CONCAT ("%", #{no}, "%")
and no like CONCAT ("%", #{no}, "%")
</if>
</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