Merge remote-tracking branch 'origin/master'

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<BusHandoverMapper, Bu
         List<BusHandoverItems> 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<String> 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<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(busHandoverPrepareVehicle.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
-                fileList.removeAll(Collections.singleton(null));
-                if (!fileList.isEmpty()) {
-                    List<String> 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<String> 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<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(busHandoverPrepareVehicle.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+                    fileList.removeAll(Collections.singleton(null));
+                    if (!fileList.isEmpty()) {
+                        List<String> 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);
         //接收车辆确认书照片

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

@@ -22,7 +22,7 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
         SysFlowableConfigVvo sysFlowableConfigVvo = new SysFlowableConfigVvo();
         //查询该用户当前时间是否有转办人
         String userSid = query.getUserSid();
-        Date nowDate = query.getNowDate();
+        Date nowDate = new Date();
         SysFlowableConfig sysFlowableConfig = baseMapper.selectByUserSid(userSid,nowDate);
         BeanUtil.copyProperties(sysFlowableConfig,sysFlowableConfigVvo);
         return rb.success().setData(sysFlowableConfigVvo);