diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index 1a4924f835..a0f1d0c09e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -1448,26 +1448,28 @@ public class BusHandoverService extends MybatisBaseService itemsList = busHandoverItemsService.getItemsListByMainSid(sid).getData(); itemsList.removeAll(Collections.singleton(null)); for (BusHandoverItems v : itemsList) { - BusHandoverItemListDetailsVo detailsVo = new BusHandoverItemListDetailsVo(); - String handoverPhoto = v.getHandoverPhoto(); - String policyPhoto = v.getPolicyPhoto(); - BeanUtil.copyProperties(v, detailsVo); - if (StringUtils.isNotBlank(handoverPhoto)) { - List stringList = Arrays.asList(handoverPhoto.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - detailsVo.setDeliveryImages(stringList); - } - BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchDetailsByVinSid(v.getVinSid()); - if (null != busHandoverPrepareVehicle) { - List fileList = buscenterFileService.selectByLinkSid(busHandoverPrepareVehicle.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List policyPhotoList = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). - collect(Collectors.toList()); - detailsVo.setPolicyImages(policyPhotoList); + if ("主车".equals(v.getVehivelOrTrailer())) { + BusHandoverItemListDetailsVo detailsVo = new BusHandoverItemListDetailsVo(); + String handoverPhoto = v.getHandoverPhoto(); + String policyPhoto = v.getPolicyPhoto(); + BeanUtil.copyProperties(v, detailsVo); + if (StringUtils.isNotBlank(handoverPhoto)) { + List stringList = Arrays.asList(handoverPhoto.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + detailsVo.setDeliveryImages(stringList); + } + BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchDetailsByVinSid(v.getVinSid()); + if (null != busHandoverPrepareVehicle) { + List fileList = buscenterFileService.selectByLinkSid(busHandoverPrepareVehicle.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List policyPhotoList = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + detailsVo.setPolicyImages(policyPhotoList); + } } + detailsVo.setVinSid(v.getVinSid()); + items.add(detailsVo); } - detailsVo.setVinSid(v.getVinSid()); - items.add(detailsVo); } vo.setCarList(items); //接收车辆确认书照片