Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
Details
Activity
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
王衍超
cloud-fb
Commits
9a0ca2de
Commit
9a0ca2de
authored
Jul 19, 2021
by
高晓磊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询派单记录和运输记录去掉开始时间和结束时间不能有一个为空的校验
parent
aa1673f4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
TransportRecordController.java
...m/xyst/dinas/transport/web/TransportRecordController.java
+0
-2
VehicleDriverUserController.java
...xyst/dinas/transport/web/VehicleDriverUserController.java
+8
-8
No files found.
backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/TransportRecordController.java
View file @
9a0ca2de
...
...
@@ -91,6 +91,4 @@ public class TransportRecordController {
return
ResponseObj
.
success
(
"查询成功"
,
byId
);
}
}
backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/VehicleDriverUserController.java
View file @
9a0ca2de
...
...
@@ -120,10 +120,10 @@ public class VehicleDriverUserController {
@RequestParam
(
value
=
"vehicleId"
,
required
=
false
)
UUID
vehicleId
,
@RequestParam
(
value
=
"isOrderByPlanCycleType"
,
required
=
false
,
defaultValue
=
"true"
)
Boolean
isOrderByPlanCycleType
)
{
boolean
a
=
(
startDate
==
null
&&
endDate
!=
null
)
||
(
startDate
!=
null
&&
endDate
==
null
);
if
(
a
)
{
return
ResponseObj
.
error
(
"请同时输入开始和结束时间"
);
}
//
boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
//
if (a) {
//
return ResponseObj.error("请同时输入开始和结束时间");
//
}
DriverUser
driverUser
=
DriverUserContextHolder
.
getContext
().
getDriverUser
();
Page
<
KObject
>
kObject
=
vehicleDriverUserService
.
pageByVehicleId
(
pageNo
,
pageSize
,
status
,
vehicleId
,
startDate
,
endDate
,
isOrderByPlanCycleType
,
driverUser
.
getId
());
...
...
@@ -162,10 +162,10 @@ public class VehicleDriverUserController {
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@RequestParam
(
name
=
"endDate"
,
required
=
false
)
Date
endDate
,
@RequestParam
(
value
=
"vehicleId"
,
required
=
false
)
UUID
vehicleId
)
{
boolean
a
=
(
startDate
==
null
&&
endDate
!=
null
)
||
(
startDate
!=
null
&&
endDate
==
null
);
if
(
a
)
{
return
ResponseObj
.
error
(
"请同时输入开始和结束时间"
);
}
//
boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
//
if (a) {
//
return ResponseObj.error("请同时输入开始和结束时间");
//
}
DriverUser
driverUser
=
DriverUserContextHolder
.
getContext
().
getDriverUser
();
Page
<
Map
<
String
,
Object
>>
kObject
=
vehicleDriverUserService
.
transportRecordPage
(
pageNo
,
pageSize
,
vehicleId
,
startDate
,
endDate
,
driverUser
.
getId
());
...
...
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