diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index fd063e76eb..0274137916 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -69,5 +69,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { @Update("update fin_vehicle_invoice set isTakeTicket = '是' where sid = #{sid}") void updateIsLPBySid(String sid); - List getFinSelectInvoiceVoListByBusVinSid(String busVinSid); + List getFinSelectInvoiceVoListByVinNo(String vinNo); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 4e50e226b2..871b955a45 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -260,7 +260,7 @@ where vehicleSid = #{vinSid} and contractNo = #{contractNo} - + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 0ae4d5bfc2..150f874a27 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -617,10 +617,28 @@ public class FinVehicleInvoiceService extends MybatisBaseService receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedService.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid()); if (receiveInvoiceVoResultBean.getData() != null) { - List finSelectVoList = baseMapper.getFinSelectInvoiceVoListByBusVinSid(busSalesOrderVehicle.getSid()); - finSelectVoList.removeAll(Collections.singleton(null)); - if (!finSelectVoList.isEmpty()) { - deliveredFinVo.setFinSelectVoList(finSelectVoList); + FinVehicleInvoice invoice = selectByVinAndContractNo(vinSid, contractNo).getData(); + if (null != invoice) { + if (StringUtils.isNotBlank(invoice.getVIN())) { + String linkNo = invoice.getVIN(); + String vinNo = ""; + if (linkNo.length() > 8) { + String substringLinkNo = linkNo.substring(linkNo.length() - 8); + vinNo = substringLinkNo; + } else { + vinNo = linkNo; + } + List finSelectVoList = baseMapper.getFinSelectInvoiceVoListByVinNo(vinNo); + finSelectVoList.removeAll(Collections.singleton(null)); + if (!finSelectVoList.isEmpty()) { + for (FinSelectInvoiceVo finSelectInvoiceVo : finSelectVoList) { + if (StringUtils.isBlank(finSelectInvoiceVo.getCollectionTypeValue())) { + finSelectInvoiceVo.setCollectionTypeValue("款项结转"); + } + } + deliveredFinVo.setFinSelectVoList(finSelectVoList); + } + } } InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo(); if (invoiceVo != null) {