Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 5d33774c
authored
Jun 30, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
1 parent
990b2a51
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java
View file @
5d33774
...
@@ -22,7 +22,7 @@ public class ScheduleController {
...
@@ -22,7 +22,7 @@ public class ScheduleController {
public
Result
<?>
getScheduleOverview
(
@RequestParam
long
page
,
@RequestParam
long
size
,
@RequestParam
String
date
,
public
Result
<?>
getScheduleOverview
(
@RequestParam
long
page
,
@RequestParam
long
size
,
@RequestParam
String
date
,
@RequestParam
String
levelType
,
@RequestParam
(
"levelValue"
)
List
<
String
>
levelIds
)
{
@RequestParam
String
levelType
,
@RequestParam
(
"levelValue"
)
List
<
String
>
levelIds
)
{
Result
<?>
res
=
null
;
Result
<?>
res
=
null
;
try
{
try
{
res
=
scheduleService
.
getScheduleOverview
(
page
,
size
,
date
,
levelType
,
levelIds
);
res
=
scheduleService
.
getScheduleOverview
(
page
,
size
,
date
,
levelType
,
levelIds
);
}
catch
(
BusinessException
e
)
{
}
catch
(
BusinessException
e
)
{
return
Result
.
failed
(
e
.
getMessage
());
return
Result
.
failed
(
e
.
getMessage
());
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
View file @
5d33774
...
@@ -22,6 +22,7 @@ import java.util.List;
...
@@ -22,6 +22,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Service
@Service
public
class
ScheduleServiceImpl
implements
ScheduleService
{
public
class
ScheduleServiceImpl
implements
ScheduleService
{
...
@@ -162,7 +163,10 @@ public class ScheduleServiceImpl implements ScheduleService {
...
@@ -162,7 +163,10 @@ public class ScheduleServiceImpl implements ScheduleService {
dynamics
.
add
(
new
LabelValueDTO
(
"交通工具"
,
"电动车"
));
dynamics
.
add
(
new
LabelValueDTO
(
"交通工具"
,
"电动车"
));
List
<
String
>
orderIds
=
orderAppointments
.
stream
().
map
(
OrderAppointment:
:
getOrderId
).
collect
(
Collectors
.
toList
());
List
<
String
>
orderIds
=
orderAppointments
.
stream
().
map
(
OrderAppointment:
:
getOrderId
).
collect
(
Collectors
.
toList
());
List
<
OrderRequest
>
orderRequests
=
orderRequestMPDao
.
selectByOrderIds
(
orderIds
);
List
<
OrderRequest
>
orderRequests
=
new
ArrayList
<>();
if
(
orderIds
!=
null
&&
!
orderIds
.
isEmpty
())
{
orderRequests
=
orderRequestMPDao
.
selectByOrderIds
(
orderIds
);
}
List
<
ScheduleEngineerOverviewResp
.
Order
>
orders
=
new
ArrayList
<>();
List
<
ScheduleEngineerOverviewResp
.
Order
>
orders
=
new
ArrayList
<>();
for
(
OrderRequest
o
:
orderRequests
)
{
for
(
OrderRequest
o
:
orderRequests
)
{
ScheduleEngineerOverviewResp
.
Order
item
=
new
ScheduleEngineerOverviewResp
.
Order
();
ScheduleEngineerOverviewResp
.
Order
item
=
new
ScheduleEngineerOverviewResp
.
Order
();
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment