From fa2886a9bdddb4e42ba49e0f87292b6bd389e139 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 20 Oct 2023 09:53:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++- .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 71549b764f..332fed1a1a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -536,6 +536,7 @@ FROM anrui_base.base_vehicle_state bs JOIN bus_sales_order bo ON bs.saleOrderSid = bo.`sid` + left join bus_sales_order_vehicle bv on bv.sid = bs.busSid WHERE bo.createBySid = #{userSid} AND bo.useOrgSid = #{useOrgSid} AND bs.finSourceKey = '2' @@ -543,7 +544,7 @@ AND bs.carryVehicleState = '0' AND bs.carryInvoiceState = '0' AND bs.busState = '401' - AND bs.vinNo != '' + AND length(bv.linkNo)>0 From 8de8edbff5a2e4964f293e6fac6c997a0771e375 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 20 Oct 2023 10:51:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basedistributor/BaseDistributorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 6203e167bf..abdfd30fad 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -1402,7 +1402,7 @@ public class BaseDistributorService extends MybatisBaseService Date: Fri, 20 Oct 2023 11:22:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E6=8E=A8=E9=80=81=E5=BC=80=E7=A5=A8=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 82e883752c..6201cf46af 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -90,7 +90,6 @@ useOrgName, purchaseSystemSid, orgSidPath, - staffSid, createBySid, invoiceType as openTickTypeValue, invoiceTypeKey as openTickTypeKey From 06b38e265ca6d5b69a15712b2c1f2ea355bbecd2 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 20 Oct 2023 13:36:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusAdvanceGinvoiceapplyService.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 8478e7efde..c49ac942ac 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -1089,6 +1089,33 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); vo.setArrearsCollectionAppendxs(qklpfjImages); + //《公司股东会对外担保决议》(公司担保) + List pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy(); + List gsgdhdwdbjy = new ArrayList<>(); + if (pcgsgdhdwdbjy != null) { + for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { + gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl()); + } + } + vo.setGsgdhdwdbjy(gsgdhdwdbjy); + //《责任人担保承诺书》 + List pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns(); + List zrrdbcns = new ArrayList<>(); + if (pczrrdbcns != null) { + for (FinBillFileVo pczrrdbcn : pczrrdbcns) { + zrrdbcns.add(pczrrdbcn.getFileUrl()); + } + } + vo.setZrrdbcns(zrrdbcns); + //资方信审截图 + List pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt(); + List zfxsjt = new ArrayList<>(); + if (pczfxsjt != null) { + for (FinBillFileVo pczfxs : pczfxsjt) { + zfxsjt.add(pczfxs.getFileUrl()); + } + } + vo.setZfxsjt(zfxsjt); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false);