Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
Project
Project
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
external
on-site-service
Commits
e45b4234
Commit
e45b4234
authored
Jul 14, 2022
by
lining
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 错误的import删除
parent
f1001688
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
ServiceOrderService.java
...iteservice/miniapp/service/order/ServiceOrderService.java
+2
-7
No files found.
mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderService.java
View file @
e45b4234
...
...
@@ -10,6 +10,7 @@ import com.onsiteservice.core.result.Result;
import
com.onsiteservice.core.result.ResultGenerator
;
import
com.onsiteservice.dao.common.AbstractMapper
;
import
com.onsiteservice.dao.common.page.PageInfoVO
;
import
com.onsiteservice.dao.component.RecordComponent
;
import
com.onsiteservice.dao.mapper.service.*
;
import
com.onsiteservice.dao.mapper.user.UserMapper
;
import
com.onsiteservice.entity.address.ServiceAddress
;
...
...
@@ -23,14 +24,11 @@ import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderLogVO;
import
com.onsiteservice.miniapp.controller.order.vo.ServiceOrderVO
;
import
com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper
;
import
com.onsiteservice.util.AttrCopyUtils
;
import
com.onsiteservice.util.ListUtils
;
import
com.onsiteservice.util.RandomUtils
;
import
com.onsiteservice.util.aliyun.SmsUtils
;
import
com.onsiteservice.dao.component.RecordComponent
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.scheduling.annotation.Async
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.CollectionUtils
;
...
...
@@ -562,7 +560,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
}
private
List
<
ServiceOrderVO
>
buildServiceOrderVO
(
List
<
ServiceOrder
>
serviceOrderList
){
private
List
<
ServiceOrderVO
>
buildServiceOrderVO
(
List
<
ServiceOrder
>
serviceOrderList
)
{
// 地址信息
List
<
Long
>
addressIdList
=
serviceOrderList
.
parallelStream
().
map
(
ServiceOrder:
:
getAddressId
).
collect
(
Collectors
.
toList
());
List
<
ServiceAddress
>
serviceAddressList
=
serviceAddressMapper
.
selectByIdList
(
addressIdList
);
...
...
@@ -585,8 +583,5 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
}).
collect
(
Collectors
.
toList
());
}
}
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