Commit ace1c97b authored by tangwei's avatar tangwei

增加排序

parent 666229b5
...@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment