Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
ace1c97b
Commit
ace1c97b
authored
Mar 03, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加排序
parent
666229b5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+3
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
ace1c97b
...
@@ -288,6 +288,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -288,6 +288,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
fireCarDto
.
setCarStateDesc
(
FireCarStatusEnum
.
执勤
.
getName
());
fireCarDto
.
setCarStateDesc
(
FireCarStatusEnum
.
执勤
.
getName
());
}
else
{
}
else
{
fireCarDto
.
setCarStateDesc
(
FireCarStatusEnum
.
备勤
.
getName
());
fireCarDto
.
setCarStateDesc
(
FireCarStatusEnum
.
备勤
.
getName
());
//备勤
fireCarDto
.
setCarStateNum
(
1
);
}
}
}
else
{
}
else
{
if
(
appleMap
!=
null
)
{
if
(
appleMap
!=
null
)
{
...
@@ -334,7 +336,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -334,7 +336,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
FireBrigadeResourceDto
fireCarResourceDto
=
new
FireBrigadeResourceDto
();
FireBrigadeResourceDto
fireCarResourceDto
=
new
FireBrigadeResourceDto
();
List
<
FireBrigadeResourceDto
>
fireBrigadeResourceDtoList
=
resultMap
List
<
FireBrigadeResourceDto
>
fireBrigadeResourceDtoList
=
resultMap
.
get
(
brigade
.
getSequenceNbr
().
toString
());
.
get
(
brigade
.
getSequenceNbr
().
toString
());
fireBrigadeResourceDtoList
.
sort
(
Comparator
.
comparing
(
FireBrigadeResourceDto:
:
getCarStateNum
));
Collections
.
sort
(
fireBrigadeResourceDtoList
,
Comparator
.
comparing
(
FireBrigadeResourceDto:
:
getCarStateNum
));
long
onDutyCarCount
=
fireBrigadeResourceDtoList
.
stream
()
long
onDutyCarCount
=
fireBrigadeResourceDtoList
.
stream
()
.
filter
(
car
->
FireCarStatusEnum
.
执勤
.
getCode
().
equals
(
car
.
getCarState
())).
count
();
.
filter
(
car
->
FireCarStatusEnum
.
执勤
.
getCode
().
equals
(
car
.
getCarState
())).
count
();
...
...
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