Merge remote-tracking branch 'origin/master'

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<BaseDistributorMa
                 finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(useOrgSid);
             }
         } else {
-            if ("02".equals(search)){
+            if ("02".equals(invoiceKey)){
                 finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
             }else {
                 finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search);

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
     </select>
 
     <select id="selectByContractNoToVin" resultType="java.lang.String">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -240,7 +240,7 @@
             AND bs.carryVehicleState = '0'
             AND bs.carryInvoiceState = '0'
             AND bs.busState = '401'
-            AND bs.vinNo != ''
+            AND length(bsov.linkNo)>0
         </where>
     </select>
 

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

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<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy();
+        List<String> gsgdhdwdbjy = new ArrayList<>();
+        if (pcgsgdhdwdbjy != null) {
+            for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
+                gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl());
+            }
+        }
+        vo.setGsgdhdwdbjy(gsgdhdwdbjy);
+        //《责任人担保承诺书》
+        List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns();
+        List<String> zrrdbcns = new ArrayList<>();
+        if (pczrrdbcns != null) {
+            for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
+                zrrdbcns.add(pczrrdbcn.getFileUrl());
+            }
+        }
+        vo.setZrrdbcns(zrrdbcns);
+        //资方信审截图
+        List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt();
+        List<String> 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);