From 1adaa9d3f689803ff50d25fe21df108f00861a87 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 6 May 2023 16:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleTempstateFeign.java | 2 +- .../BusArrearsCarryVehicleApplyService.java | 70 ++++++++++--------- .../bussalesorder/BusSalesOrderService.java | 3 + .../BusSalesOrderVehicleService.java | 11 ++- 4 files changed, 51 insertions(+), 35 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index f8e4763470..c378e6b088 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -104,5 +104,5 @@ public interface BaseVehicleTempstateFeign { @ApiOperation("查询状态") @GetMapping("/selectByVinSidAndType") @ResponseBody - ResultBean selectByVinSidAndType(@RequestParam("carSid") String carSid, @Param("tempstateKey") String tempstateKey); + ResultBean selectByVinSidAndType(@RequestParam("carSid") String carSid, @RequestParam("tempstateKey") String tempstateKey); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 117ef07ad9..94fcbdb74b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -13,7 +13,6 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; @@ -33,13 +32,14 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; -import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService; import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; @@ -183,6 +183,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) { + /* AddRetrievalApplyDto addRetrievalApplyDto = new AddRetrievalApplyDto(); addRetrievalApplyDto.setVinNo(vehicleDetailsVo.getVinNo()); - BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehicleDetailsVo.getVehicleSid()).getData(); + BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehicleDetailsVo.getVinSid()).getData(); if (baseVehicleSelectVo != null) { addRetrievalApplyDto.setModelSid(baseVehicleSelectVo.getModelSid()); addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName()); @@ -1789,7 +1792,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(busArrearsCarryVehicleApply.getUseOrgSid()); + if (sysOrganizationVoResultBean.getData() != null) { + busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } + //根据合同和车辆sid查询销售订单车辆sid + BusSalesOrderVehicle busSaleOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(),vehicleDetailsVo.getVinSid()); + busDeliveredDto.setBusVinSid(busSaleOrderVehicle.getSid()); + busDeliveredService.saveOrUpdateDto(busDeliveredDto); } } } @@ -1876,29 +1903,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); - if (vehicleDetailsVos.size() > 0) { - for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) { - AddRetrievalApplyDto addRetrievalApplyDto = new AddRetrievalApplyDto(); - addRetrievalApplyDto.setVinNo(vehicleDetailsVo.getVinNo()); - BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehicleDetailsVo.getVehicleSid()).getData(); - if (baseVehicleSelectVo != null) { - addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName()); - } - BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getByContractNo(busArrearsCarryVehicleApply.getContractNo()); - addRetrievalApplyDto.setPaymentMethod(busSalesOrderDetailsVo.getPayType());// 付款方式 - addRetrievalApplyDto.setPaymentMethodKey(busSalesOrderDetailsVo.getPayTypeKey());// 付款方式 - addRetrievalApplyDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); // 款项状态 - addRetrievalApplyDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());// 款项状态 - addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney())); - addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo()); - addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName()); - addRetrievalApplyDto.setUseOrgName(busArrearsCarryVehicleApply.getUseOrgName()); - addRetrievalApplyDto.setUseOrgSid(busArrearsCarryVehicleApply.getUseOrgSid()); - busDeliveredService.addRetrievalApply(addRetrievalApplyDto); - } - } } return rb.success().setData(resultBean1.getData()); @@ -2199,7 +2203,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService fileList = query.getFileList(); if ("Activity_0tieuz3".equals(query.getTaskDefKey())) { //销售内勤审批 List carContract = query.getCarContract(); @@ -2231,14 +2235,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService fileList = query.getFileList(); if (fileList.isEmpty()) { return rb.setMsg("请上传其他附件"); - } else { - String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - busArrearsCarryVehicleApply.setOtherFile(fileLists); } } + if(!fileList.isEmpty()){ + String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setOtherFile(fileLists); + } baseMapper.updateById(busArrearsCarryVehicleApply); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 869ef7ed81..d0fef00f13 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo; import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery; @@ -44,6 +45,7 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; @@ -57,6 +59,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.CommonContractEnum; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index fbd16df18e..fd0ab585e0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -34,7 +34,6 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; @@ -377,6 +376,16 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + if (!resultBean.getData().isEmpty()) { + resultBean.getData().removeAll(Collections.singleton(null)); + List vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList()); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + qw.notIn("bv.linkSid", vinSidList); + } + } IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List list = pagging.getRecords();