增加排序

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireBrigadeResourceDto.java

@@ -48,6 +48,9 @@ public class FireBrigadeResourceDto extends BaseDto {
     @ApiModelProperty(value = "车辆状态描述")
     private String carStateDesc;
 
+    @ApiModelProperty(value = "排序")
+    private int carStateNum;
+
     @ApiModelProperty(value = "队伍下人员数量")
     private int personCount;
 

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

@@ -299,6 +299,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                             //bug: 6268
                             fireCarDto.setCarState(FireCarStatusEnum.备勤.getName());
                             fireCarDto.setCarStateDesc(FireCarStatusEnum.备勤.getName());
+                            //备勤
+                            fireCarDto.setCarStateNum(1);
                         }
                     }
                     List<Map<String, String>> maps = dutyPersonShiftMapper.nowDutyCarPersonNum();
@@ -323,12 +325,17 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         if (!CollectionUtils.isEmpty(fullTimeFireBrigadeList)) {
             Map<String, List<FireBrigadeResourceDto>> resultMap = fireCarDtoList.stream()
                     .collect(Collectors.groupingBy(FireBrigadeResourceDto::getTeamId));
+
+
+
             if (!ValidationUtil.isEmpty(fullTimeFireBrigadeList)) {
                 fullTimeFireBrigadeList.forEach(brigade -> {
                     if (!CollectionUtils.isEmpty(resultMap.get(brigade.getSequenceNbr().toString()))) {
                         FireBrigadeResourceDto fireCarResourceDto = new FireBrigadeResourceDto();
                         List<FireBrigadeResourceDto> fireBrigadeResourceDtoList = resultMap
                                 .get(brigade.getSequenceNbr().toString());
+                        fireBrigadeResourceDtoList.sort(Comparator.comparing(FireBrigadeResourceDto::getCarStateNum));
+                        
                         long onDutyCarCount = fireBrigadeResourceDtoList.stream()
                                 .filter(car -> FireCarStatusEnum.执勤.getCode().equals(car.getCarState())).count();
                         long outCarCount = fireBrigadeResourceDtoList.size() - onDutyCarCount;