Commit 059e8e67 authored by tangwei's avatar tangwei

修改bug

parent 8a5d7637
...@@ -135,18 +135,21 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc ...@@ -135,18 +135,21 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
AircraftDto aircraftDto = new AircraftDto(); AircraftDto aircraftDto = new AircraftDto();
Aircraft one = this.getOne(queryWrapper); Aircraft one = this.getOne(queryWrapper);
Bean.toPo(one,aircraftDto); Bean.toPo(one,aircraftDto);
//填充航空器附件信息 if(one!=null){
FeignClientResult<List<FileInfoModel>> fileInfoModelResult = Systemctl.fileInfoClient.queryByEntity( //填充航空器附件信息
agencyCode, Aircraft.class.getSimpleName(), String.valueOf(one.getSequenceNbr())); FeignClientResult<List<FileInfoModel>> fileInfoModelResult = Systemctl.fileInfoClient.queryByEntity(
List<FileInfoModel> fileInfoModels = fileInfoModelResult.getResult(); agencyCode, Aircraft.class.getSimpleName(), String.valueOf(one.getSequenceNbr()));
List<FileInfoModel> fileInfoModels = fileInfoModelResult.getResult();
if (!ValidationUtil.isEmpty(fileInfoModels)) {
aircraftDto.setAppearanceImages(processToStr(fileInfoModels, AircraftFileTypeEnum.APPEARANCE.getCode())); if (!ValidationUtil.isEmpty(fileInfoModels)) {
aircraftDto.setPlaneImages(processToStr(fileInfoModels, AircraftFileTypeEnum.PLANE.getCode())); aircraftDto.setAppearanceImages(processToStr(fileInfoModels, AircraftFileTypeEnum.APPEARANCE.getCode()));
aircraftDto.setRescueImages(processToStr(fileInfoModels, AircraftFileTypeEnum.RESCUE.getCode())); aircraftDto.setPlaneImages(processToStr(fileInfoModels, AircraftFileTypeEnum.PLANE.getCode()));
aircraftDto.setPositionImages(processToStr(fileInfoModels, AircraftFileTypeEnum.POSITION.getCode())); aircraftDto.setRescueImages(processToStr(fileInfoModels, AircraftFileTypeEnum.RESCUE.getCode()));
aircraftDto.setModels(processToStr(fileInfoModels, AircraftFileTypeEnum.MODEL.getCode())); aircraftDto.setPositionImages(processToStr(fileInfoModels, AircraftFileTypeEnum.POSITION.getCode()));
aircraftDto.setModels(processToStr(fileInfoModels, AircraftFileTypeEnum.MODEL.getCode()));
}
} }
return aircraftDto; return aircraftDto;
} }
public AircraftDto queryBySeq(String agencyCode, Long seq) { public AircraftDto queryBySeq(String agencyCode, Long seq) {
......
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