Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
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
pseer
gxpt_ht
Commits
4eb6a013
Commit
4eb6a013
authored
Jan 22, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改保洁记录为空的问题
parent
ee78c786
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
RoomStatusServiceImpl.java
...java/share/system/service/impl/RoomStatusServiceImpl.java
+6
-2
No files found.
share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java
View file @
4eb6a013
...
@@ -72,10 +72,14 @@ public class RoomStatusServiceImpl implements RoomStatusService {
...
@@ -72,10 +72,14 @@ public class RoomStatusServiceImpl implements RoomStatusService {
List
<
SOrder
>
orderList
=
orderService
.
listByRoomInfo
(
storeId
,
roomIds
,
day
);
List
<
SOrder
>
orderList
=
orderService
.
listByRoomInfo
(
storeId
,
roomIds
,
day
);
Map
<
Long
,
List
<
SOrder
>>
orderMap
=
Optional
.
ofNullable
(
orderList
).
orElse
(
new
ArrayList
<>()).
parallelStream
().
collect
(
Collectors
.
groupingBy
(
SOrder:
:
getRoomId
));
Map
<
Long
,
List
<
SOrder
>>
orderMap
=
Optional
.
ofNullable
(
orderList
).
orElse
(
new
ArrayList
<>()).
parallelStream
().
collect
(
Collectors
.
groupingBy
(
SOrder:
:
getRoomId
));
Map
<
Long
,
SCleanRecords
>
cleanRecordMap
=
cleanRecordsService
.
lastCleanRoomByRoomIds
(
roomIds
);
Map
<
Long
,
SCleanRecords
>
cleanRecordMap
=
cleanRecordsService
.
lastCleanRoomByRoomIds
(
roomIds
);
if
(
Objects
.
isNull
(
cleanRecordMap
))
{
cleanRecordMap
=
new
HashMap
<>();
}
List
<
RoomStatusVo
>
voList
=
new
ArrayList
<>();
List
<
RoomStatusVo
>
voList
=
new
ArrayList
<>();
Map
<
Long
,
SCleanRecords
>
finalCleanRecordMap
=
cleanRecordMap
;
roomIds
.
stream
().
forEach
(
roomId
->
{
roomIds
.
stream
().
forEach
(
roomId
->
{
voList
.
addAll
(
generatorRoomStatusList
(
store
,
roomId
,
orderMap
.
get
(
roomId
),
cleanRecordMap
.
get
(
roomId
),
day
,
OrderTypeEnum
.
RESERVER
.
getCode
()));
voList
.
addAll
(
generatorRoomStatusList
(
store
,
roomId
,
orderMap
.
get
(
roomId
),
finalCleanRecordMap
.
get
(
roomId
),
day
,
OrderTypeEnum
.
RESERVER
.
getCode
()));
voList
.
addAll
(
generatorRoomStatusList
(
store
,
roomId
,
orderMap
.
get
(
roomId
),
cleanRecordMap
.
get
(
roomId
),
DateUtils
.
addDays
(
day
,
1
),
OrderTypeEnum
.
RESERVER
.
getCode
()));
voList
.
addAll
(
generatorRoomStatusList
(
store
,
roomId
,
orderMap
.
get
(
roomId
),
finalCleanRecordMap
.
get
(
roomId
),
DateUtils
.
addDays
(
day
,
1
),
OrderTypeEnum
.
RESERVER
.
getCode
()));
});
});
return
voList
;
return
voList
;
}
}
...
...
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