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
6ed7394f
Commit
6ed7394f
authored
Oct 17, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出行列表添加出车时间和还车时间筛选
parent
274d680a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
VehicleDepartureController.java
...xfc/platform/vehicle/rest/VehicleDepartureController.java
+4
-4
No files found.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java
View file @
6ed7394f
...
@@ -36,7 +36,7 @@ public class VehicleDepartureController {
...
@@ -36,7 +36,7 @@ public class VehicleDepartureController {
/**
/**
* @param numberPlate 车牌
* @param numberPlate 车牌
* @param code 车辆编码
* @param code 车辆编码
* @param
time
* @param
* @param departureId 出发分公司id
* @param departureId 出发分公司id
* @param page
* @param page
* @param limit
* @param limit
...
@@ -65,7 +65,7 @@ public class VehicleDepartureController {
...
@@ -65,7 +65,7 @@ public class VehicleDepartureController {
@GetMapping
(
"small/page"
)
@GetMapping
(
"small/page"
)
@IgnoreUserToken
@IgnoreUserToken
public
RestResponse
pageBySmall
(
String
numberPlate
,
@RequestParam
(
value
=
"code"
,
required
=
false
)
Integer
code
,
String
time
,
Integer
page
,
Integer
limit
,
Integer
uid
,
HttpServletRequest
request
)
{
public
RestResponse
pageBySmall
(
String
numberPlate
,
@RequestParam
(
value
=
"code"
,
required
=
false
)
Integer
code
,
String
startTime
,
String
endTime
,
Integer
page
,
Integer
limit
,
Integer
uid
,
HttpServletRequest
request
)
{
if
(
page
==
null
||
limit
==
null
)
{
if
(
page
==
null
||
limit
==
null
)
{
page
=
1
;
page
=
1
;
limit
=
10
;
limit
=
10
;
...
@@ -74,10 +74,10 @@ public class VehicleDepartureController {
...
@@ -74,10 +74,10 @@ public class VehicleDepartureController {
if
(
userDTO
!=
null
)
{
if
(
userDTO
!=
null
)
{
if
(
userDTO
.
getDataAll
()
==
2
)
{
if
(
userDTO
.
getDataAll
()
==
2
)
{
List
<
Integer
>
companyList
=
vehicleBiz
.
dataCompany
(
userDTO
.
getDataZone
(),
userDTO
.
getDataCompany
());
List
<
Integer
>
companyList
=
vehicleBiz
.
dataCompany
(
userDTO
.
getDataZone
(),
userDTO
.
getDataCompany
());
return
RestResponse
.
data
(
vehicleDepartureService
.
pageNotAllData
(
numberPlate
,
code
,
null
,
null
,
t
ime
,
page
,
limit
,
companyList
));
return
RestResponse
.
data
(
vehicleDepartureService
.
pageNotAllData
(
numberPlate
,
code
,
null
,
null
,
startTime
,
endT
ime
,
page
,
limit
,
companyList
));
}
}
}
}
return
RestResponse
.
suc
(
vehicleDepartureService
.
page
(
numberPlate
,
code
,
null
,
null
,
t
ime
,
page
,
limit
));
return
RestResponse
.
suc
(
vehicleDepartureService
.
page
(
numberPlate
,
code
,
null
,
null
,
startTime
,
endT
ime
,
page
,
limit
));
}
}
/**
/**
...
...
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