Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -2043,6 +2043,13 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             bv.setTaskDefKey(busMainDeposit.get().getTaskDefKey());
             bv.setComment(com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(dto.getInstanceId());
+            //更新已选择的车架号的状态为审批中
+            List<String> list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinSidList(list);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             return complete(bv);
         }
         return rb;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2794,6 +2794,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String imagesFile = vo.getImagesFile();
         if (StringUtils.isNotBlank(imagesFile)) {
             List<String> imagess = Arrays.asList(imagesFile);
+            imagess.removeAll(Collections.singleton(null));
+            if (!imagess.isEmpty()) {
+                for (int i = 0; i < imagess.size(); i++) {
+                    if (!imagess.get(i).contains(fileUploadComponent.getUrlPrefix())) {
+                        imagess.set(i, fileUploadComponent.getUrlPrefix() + imagess.get(i));
+                    }
+                }
+            }
             vo.setImages(imagess);
         }
         //根据销售部门sid查询分公司名称
@@ -3169,6 +3177,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bv.setTaskDefKey(busSalesOrder.get().getNodeId());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getProcInsId());
+            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            AppOrderDetailsVo vo = resultBean.getData();
+            if ("现车".equals(vo.getOrderType())) {
+                //更新已选择的车架号的状态为审批中
+                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
+                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                busMainDepositUpdateQuery.setVinSidList(list);
+                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            }
             return complete(bv);
         }
         return rb;