From 07feca51e567fb4332f978d98a69e91c40dd7c64 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Mon, 5 Dec 2022 15:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E6=98=93=E8=AE=A2=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDepositVehicleService.java | 4 ++ .../busmaindeposit/BusMainDepositService.java | 67 ++++++++++--------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java index 890d43ec3d..87aba66c89 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java @@ -3,9 +3,11 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.common.enums.DictCommonEnum; +import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo; import com.yxt.anrui.buscenter.api.busdepositvehicle.*; import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; +import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; @@ -51,6 +53,8 @@ public class BusDepositVehicleService extends MybatisBaseService 0) { + for (AppBusDepositVehicleCarListDto carListDto : dto.getCarList()) { + BusDepositVehicle busDepositVehicle = new BusDepositVehicle(); + busDepositVehicle.setBillSid(busMainDeposit.getSid()); + busDepositVehicle.setBrandName(carListDto.getBrand()); + busDepositVehicle.setModelName(carListDto.getModel()); + busDepositVehicle.setRemarks(carListDto.getRemarks()); + busDepositVehicle.setReserve_deposit_date(carListDto.getDepositDate()); + busDepositVehicle.setReserve_position(carListDto.getLocation()); + busDepositVehicle.setReserve_price(carListDto.getPrice()); + busDepositVehicle.setModelConfigSid(carListDto.getConfigSid()); + busDepositVehicle.setModelSid(carListDto.getModelSid()); + busDepositVehicle.setVehicleSid(carListDto.getCarSid()); + busDepositVehicle.setCreateBySid(dto.getUserSid()); + busDepositVehicle.setColour(carListDto.getColour()); + busDepositVehicle.setVinNo(carListDto.getVin()); + busDepositVehicleService.insert(busDepositVehicle); + } } } @@ -1681,9 +1684,9 @@ public class BusMainDepositService extends MybatisBaseService> stringList = finCollectionConfirmationFeign.billeNoList(); - if(stringList.getSuccess()){ - if(!stringList.getData().isEmpty()){ - qw.in("bmd.billNo",stringList.getData()); + if (stringList.getSuccess()) { + if (!stringList.getData().isEmpty()) { + qw.in("bmd.billNo", stringList.getData()); } } qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结 @@ -1890,7 +1893,7 @@ public class BusMainDepositService extends MybatisBaseService carList = dto.getCarList(); for (AppBusDepositVehicleCarListDto carListDto : carList) { String carSid = carListDto.getCarSid(); @@ -2252,15 +2255,19 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) { - //更新已选择的车架号的状态为未锁定 - AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); - List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); - BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); - busMainDepositUpdateQuery.setVinSidList(list); - busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); - busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); - baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) { + //更新已选择的车架号的状态为未锁定 + AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); + if (appBusDepositVehicleDetailVo != null) { + List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + } + } } return rb.success().setData(resultBean.getData()); }