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 d4a22fee
authored
Jun 20, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口字段变更, timelines -> orders
1 parent
cf2e8e56
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/OrderAssignRecommendResp.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java
project-order/src/main/java/com/dituhui/pea/order/dto/OrderAssignRecommendResp.java
View file @
d4a22fe
...
@@ -20,7 +20,7 @@ public class OrderAssignRecommendResp {
...
@@ -20,7 +20,7 @@ public class OrderAssignRecommendResp {
private
String
startTime
;
private
String
startTime
;
private
String
endTime
;
private
String
endTime
;
private
InsertInfo
insertInfo
;
private
InsertInfo
insertInfo
;
private
List
<
TimeLineDTO
>
timeline
s
;
private
List
<
TimeLineDTO
>
order
s
;
}
}
@Data
@Data
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java
View file @
d4a22fe
...
@@ -88,7 +88,7 @@ public class OrderAssignImpl implements OrderAssign {
...
@@ -88,7 +88,7 @@ public class OrderAssignImpl implements OrderAssign {
item
.
setDesc
(
String
.
format
(
"将被插入在第%d单,受此影响原第%d单变化第%d单,第3单将增加5公里路程,比预计晚到30分钟,建议调整;"
,
rr
.
index
+
1
,
rr
.
index
+
1
,
rr
.
index
+
2
));
item
.
setDesc
(
String
.
format
(
"将被插入在第%d单,受此影响原第%d单变化第%d单,第3单将增加5公里路程,比预计晚到30分钟,建议调整;"
,
rr
.
index
+
1
,
rr
.
index
+
1
,
rr
.
index
+
2
));
item
.
setStartTime
(
"08:00"
);
item
.
setStartTime
(
"08:00"
);
item
.
setStartTime
(
"18:00"
);
item
.
setStartTime
(
"18:00"
);
item
.
set
Timeline
s
(
this
.
packTimelines
(
orderAppointments
,
orderTips
));
item
.
set
Order
s
(
this
.
packTimelines
(
orderAppointments
,
orderTips
));
items
.
add
(
item
);
items
.
add
(
item
);
}
}
...
@@ -202,11 +202,8 @@ public class OrderAssignImpl implements OrderAssign {
...
@@ -202,11 +202,8 @@ public class OrderAssignImpl implements OrderAssign {
}
}
private
HashMap
<
String
,
List
<
LabelValueDTO
>>
packOrderTips
(
List
<
OrderRequest
>
orders
)
{
private
HashMap
<
String
,
List
<
LabelValueDTO
>>
packOrderTips
(
List
<
OrderRequest
>
orders
)
{
HashMap
<
String
,
List
<
LabelValueDTO
>>
map
=
new
HashMap
<>();
return
orders
.
stream
().
collect
(
Collectors
.
toMap
(
for
(
OrderRequest
order
:
orders
)
{
OrderRequest:
:
getOrderId
,
this
::
packOrderTip
,
(
l1
,
l2
)
->
l1
,
HashMap:
:
new
));
map
.
put
(
order
.
getOrderId
(),
this
.
packOrderTip
(
order
));
}
return
map
;
}
}
private
List
<
LabelValueDTO
>
packOrderTip
(
OrderRequest
order
)
{
private
List
<
LabelValueDTO
>
packOrderTip
(
OrderRequest
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