修改bug

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

@@ -188,10 +188,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         //查询车辆当前任务状态
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
+        queryWrapper.notIn("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
         List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesService.list(queryWrapper);
 
-        Map<String, String> appleMap = alertFormValue!=null&&alertFormValue.size()>0?alertFormValue.stream().collect(Collectors.toMap(PowerTransferCompanyResources::getResourcesId, PowerTransferCompanyResources::getStatus)):null;
+        Map<String, String> appleMap = alertFormValue!=null&&alertFormValue.size()>0?alertFormValue.stream().collect(Collectors.toMap(PowerTransferCompanyResources::getResourcesId, PowerTransferCompanyResources::getCarStatus)):null;
         if (!ObjectUtils.isEmpty(result)) {
             List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
             if (!ValidationUtil.isEmpty(fireCarListMapList)) {
@@ -285,6 +285,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
             //资源状态
             powerTransferCompanyResources.setStatus(FireCarStatusEnum.执行中.getCode());
+            //资源状态
+            powerTransferCompanyResources.setCarStatus(FireCarStatusEnum.出动.getCode());
             powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
         }
         return powerTransferCompanyResourcesList;