Merge remote-tracking branch 'origin/developer' into developer

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

@@ -4,6 +4,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import org.apache.commons.lang3.ObjectUtils;
@@ -76,6 +77,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     TemplateServiceImpl templateService;
 
     @Autowired
+    DutyCarServiceImpl iDutyCarService;
+
+
+    @Autowired
     AlertFormValueServiceImpl alertFormValueService;
 
     @Autowired
@@ -271,13 +276,19 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                         if (appleMap != null) {
                             String state = appleMap.containsKey(car.get("id")) ? appleMap.get(car.get("id")) : null;
                             fireCarDto.setCarState(state);
-                            fireCarDto
-                                    .setCarStateDesc(state != null ? FireCarStatusEnum.getEnum(state).getName() : null);
+                            fireCarDto.setCarStateDesc(state != null ? FireCarStatusEnum.getEnum(state).getName() : null);
                         } else {
                             fireCarDto.setCarState(null);
                             fireCarDto.setCarStateDesc(null);
                         }
                     }
+
+                    if (fireCarDto.getId() != null) {
+                        int num = 0;
+                        num = iDutyCarService.getDutyCarCount(Long.valueOf(fireCarDto.getId()));
+                        fireCarDto.setPersonCount(num);
+                    }
+
                     fireCarDtoList.add(fireCarDto);
                 });
             }