Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -145,4 +145,9 @@ public interface BaseVehicleCertificateFeign {
     @GetMapping("/getCertificateInfo")
     @ResponseBody
     ResultBean<HandoverCertVo> getCertificateInfoOne(@RequestParam("vinSid") String vinSid, @RequestParam("useOrgSid") String useOrgSid);
+
+    @ApiOperation("合格证移交")
+    @PostMapping("/certificateYJ")
+    @ResponseBody
+    ResultBean certificateYJ(@RequestBody String[] sids);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -87,6 +87,11 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
         return null;
     }
 
+    @Override
+    public ResultBean certificateYJ(String[] sids) {
+        return null;
+    }
+
   /*  @Override
     public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -102,4 +102,7 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     int updateCertificate(@Param("dto") CertificateDto dto);
 
     HandoverCertVo getCertificateInfoOne(@Param("vinSid") String vinSid, @Param("useOrgSid") String useOrgSid);
+
+    @Update("update base_vehicle_certificate set certificateState = #{tranKey},certificateStateValue = #{tranValue} where sid = #{sid}")
+    void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -5,6 +5,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -69,7 +70,6 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
-
     /**
      * 台账信息条件分页列表
      *
@@ -309,6 +309,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         return baseVehicleCertificateService.getCertificateInfoOne(vinSid, useOrgSid);
     }
 
+    @Override
+    public ResultBean certificateYJ(String[] sids) {
+        return baseVehicleCertificateService.certificateYJ(sids);
+    }
+
    /* @Override
     public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
         return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -2,10 +2,16 @@ package com.yxt.anrui.base.biz.basevehiclecertificate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -38,13 +44,12 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
 
     @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
-
     @Autowired
     CommonAppendixService commonAppendixService;
-
     @Autowired
     private FileUploadComponent fileUploadComponent;
-
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
     /**
      * 台账信息条件分页查询
      *
@@ -235,4 +240,24 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         }
         return rb.success().setData(handoverCertVo);
     }
+
+    public ResultBean certificateYJ(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
+            if ("004".equals(baseVehicleCertificate.getCertificateState()) && "003".equals(baseVehicleCertificate.getTransferStateKey())){
+                String tranKey = "005";
+                String tranValue = "移交中";
+                baseMapper.updateTransferState(sid,tranKey,tranValue);
+                String vehicleSid = baseVehicleCertificate.getVehicleSid();
+                BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData();
+                if (busSalesOrderDetailsVo == null){
+                    return rb.setMsg("暂无销售订单，不可移交");
+                }
+                String staffSid = busSalesOrderDetailsVo.getStaffSid();
+
+            }
+        }
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -168,8 +168,8 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     ResultBean<String> printApplyPdf(@RequestParam("sid")String sid,@RequestParam("name")String name);
 
-
-
-
-
+    @ApiOperation(value = "根据车辆sid查询已办结的欠款提车申请")
+    @PostMapping(value = "/selComByVehSid")
+    @ResponseBody
+    ResultBean<BusArrearsCarryVehicleApplyVo> selComByVehSid(@RequestParam("vehSid") String vehSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -166,4 +166,9 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 	public ResultBean<String> printApplyPdf(String sid,String name) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<BusArrearsCarryVehicleApplyVo> selComByVehSid(String vehSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -319,4 +319,9 @@ public interface BusSalesOrderFeign {
     @GetMapping("/yuyanTestBean")
     @ResponseBody
     ResultBean yuyanTestBean(@SpringQueryMap BusSaleOrderNodeQuery query);
+
+    @ApiOperation("根据车辆sid查询最新的已办结的销售订单")
+    @PostMapping("/selNewComSaleByVehSid")
+    @ResponseBody
+    ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(@RequestParam("vehSid") String vehSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -295,4 +295,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean yuyanTestBean(BusSaleOrderNodeQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(String vehSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -83,4 +83,5 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
 
     BusArrearsCarryVehicleApply selSubmitLc(String vehSid);
 
+    BusArrearsCarryVehicleApplyVo selComByVehSid(String vehSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -133,4 +133,14 @@
           AND bacva.`nodeState` != "待提交"
   AND bacva.`nodeState` != "终止"
     </select>
+
+    <select id="selComByVehSid"
+            resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo">
+        SELECT *
+        FROM bus_arrears_carry_vehicle_apply bacva
+                     LEFT JOIN bus_arrears_carry_vehicle_details bacvd
+                ON bacva.`sid` = bacvd.`applySid`
+        WHERE bacva.`nodeState` = "已办结"
+          AND bacvd.`vinSid` = #{vehSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -258,5 +258,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.printApplyPdf(sid,name);
     }
 
+    @Override
+    public ResultBean<BusArrearsCarryVehicleApplyVo> selComByVehSid(String vehSid) {
+        return busArrearsCarryVehicleApplyService.selComByVehSid(vehSid);
+    }
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -2741,4 +2741,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         return imgUrl;
     }
+
+    public ResultBean<BusArrearsCarryVehicleApplyVo> selComByVehSid(String vehSid) {
+        ResultBean rb = new ResultBean<>();
+        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = baseMapper.selComByVehSid(vehSid);
+        return rb.success().setData(busArrearsCarryVehicleApplyVo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -211,4 +211,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     List<String> selectByContractNoToVin(String contractId);
 
     BusSalesOrder selectDetailsByContractNo(String contractId);
+
+    BusSalesOrderDetailsVo selNewComSaleByVehSid(String vehSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -5,24 +5,24 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo">
         SELECT bo.sid,
-               bo.nodeState,
-               bo.billNo,
-               DATE_FORMAT(bo.createDate, '%Y-%m-%d')         as createDate,
-               bo.customerName,
-               bo.mobile,
-               bm.brandName,
-               bp.singleFinalPrice,
-               bp.quantity,
-               bo.payType,
-               bd.depositAll,
-               case bo.isInsurance
-                   when 0 then '否'
-                   when 1 then '是' end                        as isInsurance,
-               if(length(bo.nodeState) > 0, nodeState, '待提交') as nodeState
+        bo.nodeState,
+        bo.billNo,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
+        bo.customerName,
+        bo.mobile,
+        bm.brandName,
+        bp.singleFinalPrice,
+        bp.quantity,
+        bo.payType,
+        bd.depositAll,
+        case bo.isInsurance
+        when 0 then '否'
+        when 1 then '是' end as isInsurance,
+        if(length(bo.nodeState) > 0, nodeState, '待提交') as nodeState
         FROM bus_sales_order bo
-                 left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-                 left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+        left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
+        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -39,50 +39,50 @@
     </update>
     <!--app查询销售订单列表-->
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
-        SELECT bo.sid                                 as saleOrderSid,
-               bo.billNo                              as saleOrderId,
-               bo.customerClassKey                    as customerType,
-               bo.customerSid,
-               bo.customerName,
-               bo.customerPhoto                       as customerImage,
-               bo.mobile,
-               bo.payType                             as carPurchaseType,
-               bo.payTypeKey                          as carPurchaseKey,
-               bd.depositAll,
-               bo.nodeState                           as saleOrderState,
-               DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
-               case bo.isInsurance
-                   when 0 then '否'
-                   when 1 then '是' end                as insuranceInfo,
-<!--               if(bo.nodeState = '已办结', true, false)  as showContractBtn,-->
-               if(bo.nodeState = '已办结', true, false)  as showStopBtn,
-               bo.nodeState is null                   as showUpdateBtn,
-               bo.nodeState is null                   as showDeleteBtn,
-           --    bo.nodeState is not null               as showRePublishBtn,
-               0                                      as showFinancialBtn,
-               bo.type,
-               bo.contractNo                          as contractId,
-               bo.staffName as saler,
-              bo.procDefId,
-              bo.procInstId
+        SELECT bo.sid as saleOrderSid,
+        bo.billNo as saleOrderId,
+        bo.customerClassKey as customerType,
+        bo.customerSid,
+        bo.customerName,
+        bo.customerPhoto as customerImage,
+        bo.mobile,
+        bo.payType as carPurchaseType,
+        bo.payTypeKey as carPurchaseKey,
+        bd.depositAll,
+        bo.nodeState as saleOrderState,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
+        case bo.isInsurance
+        when 0 then '否'
+        when 1 then '是' end as insuranceInfo,
+        <!--               if(bo.nodeState = '已办结', true, false)  as showContractBtn,-->
+        if(bo.nodeState = '已办结', true, false) as showStopBtn,
+        bo.nodeState is null as showUpdateBtn,
+        bo.nodeState is null as showDeleteBtn,
+        -- bo.nodeState is not null as showRePublishBtn,
+        0 as showFinancialBtn,
+        bo.type,
+        bo.contractNo as contractId,
+        bo.staffName as saler,
+        bo.procDefId,
+        bo.procInstId
         FROM bus_sales_order bo
-                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-                 left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bo.customerName
-                  , '')
-                  , IFNULL(bo.staffName
-                  , '')
-                  , ifnull(bo.billNo
-                  , '')) LIKE concat('%'
-                  , #{name}
-                  , '%')
+                , '')
+                , IFNULL(bo.staffName
+                , '')
+                , ifnull(bo.billNo
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
             </if>
             <if test="typeState != null and typeState != ''">
                 and LENGTH(bo.nodeState)
-                  >0
+                >0
             </if>
         </where>
         order by bo.id desc
@@ -96,7 +96,7 @@
                p.quantity         as number,
                bm.modelSid
         from bus_sales_order_model bm
-                 left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid
+                     left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid
         where bm.salesOrderSid = #{saleOrderSid}
     </select>
     <!--App初始化销售订单单据信息-->
@@ -189,8 +189,8 @@
                bs.distributorUnitTwo   as intermediaryUnit2,
                bs.distributorPriceTwo  as agencyFee2
         from bus_sales_order bo
-                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-                 left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
+                     left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                     left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
         where bo.sid = #{sid}
     </select>
 
@@ -207,9 +207,9 @@
                bo.staffName                           as sellerName,
                bo.notes                               as addRemarks,
                case bo.type
-                   when 1 then '现车'
-                   when 2 then '采购订单'
-                   when 3 then '排产' end               as orderType,
+                       when 1 then '现车'
+                       when 2 then '采购订单'
+                       when 3 then '排产' end           as orderType,
                bo.orgSid,
                bo.billNo,
                bo.financePlanValue,
@@ -222,9 +222,9 @@
                bo.purchaseSystemName,
                bo.imagesFile,
                bo.contractNo                             contractId,
-        bo.financePlan,
-        procDefId,
-        nodeId as taskDefKey
+               bo.financePlan,
+               procDefId,
+               nodeId                                 as taskDefKey
         from bus_sales_order bo
         where sid = #{sid}
     </select>
@@ -232,7 +232,7 @@
     <update id="updateFlowFiled">
         UPDATE bus_sales_order
         SET nodeState=#{nodeState}
-          , nodeId=#{taskDefKey}
+        , nodeId=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -259,24 +259,24 @@
 
     <select id="getApprovalContractList"
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo">
-        SELECT bo.sid          as busSid,
-               bo.customerName as customerName,
-               bo.mobile       as modelName,
-               bsov.linkNo     AS vin
+        SELECT bo.sid as busSid,
+        bo.customerName as customerName,
+        bo.mobile as modelName,
+        bsov.linkNo AS vin
         FROM bus_sales_order bo
-                 LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bo.contractNo
-                  , '')
-                  , ifnull(bo.customerName
-                  , '')) LIKE concat('%'
-                  , #{name}
-                  , '%')
+                , '')
+                , ifnull(bo.customerName
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
             </if>
             and length(bo.contractNo)
-              > 1
+            > 1
         </where>
     </select>
     <select id="selectByContractNo"
@@ -286,7 +286,7 @@
                bo.mobile       as modelName,
                bsov.linkNo     AS vin
         FROM bus_sales_order bo
-                 LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
+                     LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         WHERE bo.contractNo = #{contractNo}
     </select>
     <select id="getByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo">
@@ -298,7 +298,7 @@
     <select id="getVinsidByConSid" resultType="java.lang.String">
         select linkSid
         from bus_sales_order_vehicle bv
-                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractNo}
           and bv.linkNo = #{vinNo}
     </select>
@@ -306,7 +306,8 @@
     <select id="selectOrderByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
         select *
         from bus_sales_order
-        where contractNo = #{contractNo} order by id desc limit 1
+        where contractNo = #{contractNo}
+        order by id desc limit 1
     </select>
 
     <update id="updateMakeUp">
@@ -343,11 +344,11 @@
     <select id="selectTemporaryNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdeVo">
         select bv.temporaryNo, bo.contractNo
         from bus_sales_order bo
-                 left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+                     left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         where bo.nodeState = '已办结'
-          and bv.linkSid = #{vehSid} and bo.contractNo = #{contractNo}
-        order by bo.createTime desc
-        limit 1
+          and bv.linkSid = #{vehSid}
+          and bo.contractNo = #{contractNo}
+        order by bo.createTime desc limit 1
     </select>
 
     <select id="selectOrderOne" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSaleOrderVehicleOutVo">
@@ -372,13 +373,12 @@
                bs.userSid,
                bo.sid                                                     as salesOrderSid
         from bus_sales_order bo
-                 left join bus_sales_order_price bp on bo.sid = bp.salesOrderSid
-                 left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
-                 left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+                     left join bus_sales_order_price bp on bo.sid = bp.salesOrderSid
+                     left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
+                     left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         where bo.nodeState = '已办结'
           and bv.linkSid = #{vinSid}
-        order by bo.createTime desc
-        limit 1
+        order by bo.createTime desc limit 1
     </select>
 
     <select id="selectByStaffSid"
@@ -404,22 +404,41 @@
         from bus_sales_order bo
         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
         <where>
-            ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' and bo.financePlan = '2'
+            ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
+            and bo.financePlan = '2'
             and length(bv.linkSid)>0
         </where>
     </select>
 
     <select id="selectQKBusinessSid" resultType="java.lang.String">
         select sid
-        from bus_sales_order where createBySid = #{userSid} and useOrgSid = #{useOrgSid} and nodeState = '已办结' and financePlan = '2'
+        from bus_sales_order
+        where createBySid = #{userSid}
+          and useOrgSid = #{useOrgSid}
+          and nodeState = '已办结'
+          and financePlan = '2'
     </select>
 
     <select id="selectByContractNoToVin" resultType="java.lang.String">
-        select bv.sid from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        select bv.sid
+        from bus_sales_order_vehicle bv
+                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractId}
     </select>
 
     <select id="selectDetailsByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
-        select * from bus_sales_order where contractNo = #{contractId}
+        select *
+        from bus_sales_order
+        where contractNo = #{contractId}
+    </select>
+
+    <select id="selNewComSaleByVehSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo">
+        SELECT *
+        FROM bus_sales_order bso
+                     LEFT JOIN bus_sales_order_vehicle bsov
+                ON bso.`sid` = bsov.`salesOrderSid`
+        WHERE bso.`nodeState` = "已办结"
+          AND bsov.`linkSid` = #{vehSid}
+        ORDER BY bso.`createTime` DESC LIMIT 1
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -376,4 +376,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean yuyanTestBean(BusSaleOrderNodeQuery query) {
         return busSalesOrderService.yuyanTestBean(query);
     }
+
+    @Override
+    public ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(String vehSid) {
+        return busSalesOrderService.selNewComSaleByVehSid(vehSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6580,4 +6580,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public BusSalesOrder selectDetailsByContractNo(String contractId) {
         return baseMapper.selectDetailsByContractNo(contractId);
     }
+
+    public ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderDetailsVo busSalesOrderDetailsVo = baseMapper.selNewComSaleByVehSid(vehSid);
+        return rb.success().setData(busSalesOrderDetailsVo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -49,6 +49,8 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFL;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
@@ -203,6 +205,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
     @Autowired
     private MessageListFeign messageListFeign;
+    @Autowired
+    private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -627,8 +631,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
                         finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                         finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                        if (busArrearsCarryVehicleApplyVo == null){
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        }else {
+                            finVehicleInvoiceDto.setBusinessStateKey("005");
+                            finVehicleInvoiceDto.setBusinessState("欠款提车");
+                        }
                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
                         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
                         if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
@@ -1950,8 +1960,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
                         finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                         finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                        if (busArrearsCarryVehicleApplyVo == null){
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        }else {
+                            finVehicleInvoiceDto.setBusinessStateKey("005");
+                            finVehicleInvoiceDto.setBusinessState("欠款提车");
+                        }
                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
                         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
                         if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
@@ -3146,8 +3162,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
                         finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                         finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                        if (busArrearsCarryVehicleApplyVo == null){
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        }else {
+                            finVehicleInvoiceDto.setBusinessStateKey("005");
+                            finVehicleInvoiceDto.setBusinessState("欠款提车");
+                        }
                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
                         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
                         if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -10,8 +10,10 @@
         SELECT
         *
         from fin_uncollected_receivables_detailed
+
         <where>
             ${ew.sqlSegment}
+            ORDER BY createTime DESC ,id
         </where>
     </select>
 
@@ -142,21 +144,23 @@
     <select id="selectByContractNoOne" resultType="java.lang.String">
         select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
-        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
+                 left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.contractNo = #{contractNo}
-        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
-        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
-        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
+          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+          and fun.receivablesName = '订金'
+          and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0)
+          and (fun1.receivablesName = '首付款及费用' or fun1.receivablesName = '车款')
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">
         select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
-        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
+                 left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.createBySid = #{userSid}
-        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
-        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
-        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
+          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+          and fun.receivablesName = '订金'
+          and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0)
+          and (fun1.receivablesName = '首付款及费用' or fun1.receivablesName = '车款')
     </select>
     <select id="selectSidBybusVinSidAndConNo" resultType="java.lang.String">
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -349,7 +349,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 );
         qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("isDelete", "0");
-        qw.orderByDesc("createTime");
         return qw;
     }
 
@@ -806,11 +805,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (finVehicleInvoice != null) {
             InvoiceVo invoiceVo = new InvoiceVo();
             BeanUtils.copyProperties(finVehicleInvoice, invoiceVo);
-            if(finVehicleInvoice.getInvoiceAmount() != null){
+            if (finVehicleInvoice.getInvoiceAmount() != null) {
                 invoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
             }
-            if(finVehicleInvoice.getInvoiceDate() != null){
-                invoiceVo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(),"yyyy-MM-dd"));
+            if (finVehicleInvoice.getInvoiceDate() != null) {
+                invoiceVo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(), "yyyy-MM-dd"));
             }
             receiveInvoiceVo.setInvoiceVo(invoiceVo);
         }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@@ -194,4 +194,9 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @GetMapping("/getFlowOperateTitleByQKLP")
     @ResponseBody
     ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(@SpringQueryMap AdvanceInvoiceQuery query);
+
+    @ApiOperation("移动端欠款开票详情pdf生成")
+    @GetMapping("/qkApplyPdf")
+    @ResponseBody
+    ResultBean<String> qkApplyPdf(@RequestParam("sid")String sid,@RequestParam("userName")String userName);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java

@@ -177,4 +177,9 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> qkApplyPdf(String sid, String userName) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java

@@ -184,4 +184,9 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
         return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleByQKLP(query);
     }
+
+    @Override
+    public ResultBean<String> qkApplyPdf(String sid, String userName) {
+        return appBusAdvanceGinvoiceapplyService.qkApplyPdf(sid,userName);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -63,6 +63,7 @@ import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.BusOrderSalesVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -100,6 +101,8 @@ public class AppBusAdvanceGinvoiceapplyService {
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoicePageQuery> pagerQuery) {
         ResultBean<PagerVo<AdvanceInvoicePageVo>> rb = ResultBean.fireFail();
@@ -143,7 +146,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                     advanceInvoicePageVo.setShowGetInvoiceBtn(false);
                 } else if ("是".equals(record.getIsLQOrigInvoice())) {
                     advanceInvoicePageVo.setShowGetInvoiceBtn(false);
-                }else {
+                } else {
                     advanceInvoicePageVo.setShowGetInvoiceBtn(true);
                 }
             } else {
@@ -207,7 +210,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             return rb.setMsg(resultBean.getMsg());
         }
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
-        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo, "arrearsCollectionAppendxs");
         vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
         vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
@@ -276,10 +279,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
         List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
         List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+        List<FinBillFileVo> arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs();
         List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
         List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
         List<String> registerContractImages = new ArrayList<>();//车辆登记合同
         List<String> idCardImages = new ArrayList<>();
+        List<String> qklpfjImages = new ArrayList<>();
         if (zjApplicationAppendxs != null) {
             for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
                 idCardImages.add(zjApplicationAppendx.getFileUrl());
@@ -300,10 +305,16 @@ public class AppBusAdvanceGinvoiceapplyService {
                 registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
             }
         }
+        if (arrearsCollectionAppendxs != null) {
+            for (FinBillFileVo arrearsCollectionAppendx : arrearsCollectionAppendxs) {
+                qklpfjImages.add(arrearsCollectionAppendx.getFileUrl());
+            }
+        }
         vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
         vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
         vo.setRegisterContractImages(registerContractImages);
         vo.setIdCardImages(idCardImages);
+        vo.setArrearsCollectionAppendxs(qklpfjImages);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
         if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
@@ -324,7 +335,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             return rb.setMsg(resultBean.getMsg());
         }
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
-        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo, "arrearsCollectionAppendxs");
         vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
         vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
@@ -347,7 +358,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
         vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
-        if ("否".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+        if ("否".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())) {
             vo.setProcInsId("");
         }
         String reasonValue = vo.getReasonValue();
@@ -420,7 +431,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             return new ResultBean().fail().setMsg("请选择车辆信息");
         }
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
-        BeanUtil.copyProperties(dto, finBillApplicationDto);
+        BeanUtil.copyProperties(dto, finBillApplicationDto, "arrearsCollectionAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
@@ -532,7 +543,7 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean saveAdvanceInvoiceLP(AdvanceInvoiceDto dto) {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
-        BeanUtil.copyProperties(dto, finBillApplicationDto);
+        BeanUtil.copyProperties(dto, finBillApplicationDto, "arrearsCollectionAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         if (StringUtils.isBlank(dto.getQkkpBillNo())) {
             finBillApplicationDto.setQkkpBillNo(dto.getBillNo());
@@ -620,7 +631,7 @@ public class AppBusAdvanceGinvoiceapplyService {
     public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
-        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto);
+        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto,"arrearsCollectionAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         submitAdvanceInvoiceDto.setUseOrgSid(useOrgSid);
         submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
@@ -682,10 +693,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = dto.getIdCardImages();//证件
+        List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件
         List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
         List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
         List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
+        List<FinBillFileDto> qklpfjImages = new ArrayList<>();//欠款领票附件
         if (customerInvoiceApplyImages != null) {
             for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
@@ -714,10 +727,18 @@ public class AppBusAdvanceGinvoiceapplyService {
                 idCardImagesPC.add(finBillFileDto);
             }
         }
+        if (arrearsCollectionAppendxs != null) {
+            for (String arrearsCollectionAppendx : arrearsCollectionAppendxs) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(arrearsCollectionAppendx);
+                qklpfjImages.add(finBillFileDto);
+            }
+        }
         submitAdvanceInvoiceDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         submitAdvanceInvoiceDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         submitAdvanceInvoiceDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         submitAdvanceInvoiceDto.setZjApplicationAppendxs(idCardImagesPC);
+        submitAdvanceInvoiceDto.setArrearsCollectionAppendxs(qklpfjImages);
         ResultBean resultBean = finBillApplicationFeign.submitFinBillApplicationQK(submitAdvanceInvoiceDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -841,7 +862,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             return rb.setMsg(resultBean.getMsg());
         }
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
-        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo, "arrearsCollectionAppendxs");
         vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
         vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
@@ -965,7 +986,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
-        BeanUtil.copyProperties(dto, finBillCompleteDto);
+        BeanUtil.copyProperties(dto, finBillCompleteDto, "arrearsCollectionAppendxs");
         //附件信息
         List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
@@ -1052,10 +1073,12 @@ public class AppBusAdvanceGinvoiceapplyService {
             List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
             List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
             List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+            List<FinBillFileVo> arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs();
             List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
             List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
             List<String> registerContractImages = new ArrayList<>();//车辆登记合同
             List<String> idCardImages = new ArrayList<>();
+            List<String> qklpfjImages = new ArrayList<>();
             List<ItemEditTextInfo> itemEditTextInfos = new ArrayList<>();
             if (zjApplicationAppendxs != null) {
                 for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
@@ -1105,6 +1128,18 @@ public class AppBusAdvanceGinvoiceapplyService {
                 itemEditTextInfo.setFilesPath(registerContractImages);
                 itemEditTextInfos.add(itemEditTextInfo);
             }
+            if (arrearsCollectionAppendxs != null) {
+                for (FinBillFileVo arrearsCollectionAppendx : arrearsCollectionAppendxs) {
+                    qklpfjImages.add(arrearsCollectionAppendx.getFileUrl());
+                }
+                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
+                itemEditTextInfo.setTitle("欠款领票相关附件");
+                itemEditTextInfo.setType(1);
+                itemEditTextInfo.setNullAble(true);
+                itemEditTextInfo.setKey("arrearsCollectionAppendxs");
+                itemEditTextInfo.setFilesPath(qklpfjImages);
+                itemEditTextInfos.add(itemEditTextInfo);
+            }
             qkkpFlowListVo.setList(itemEditTextInfos);
         }
         return rb.success().setData(qkkpFlowListVo);
@@ -1113,7 +1148,7 @@ public class AppBusAdvanceGinvoiceapplyService {
     public ResultBean submitAdvanceInvoiceInfoQKLP(SubmitAdvanceInvoiceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
-        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto);
+        BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         submitAdvanceInvoiceDto.setUseOrgSid(useOrgSid);
         submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
@@ -1381,4 +1416,15 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         return rb.success().setData(qkkpFlowListVo);
     }
+
+    public ResultBean<String> qkApplyPdf(String sid, String userName) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        ResultBean<String> resultBean = finBillApplicationFeign.createPdf(sid,userName);
+        if(resultBean.getData() != null){
+            String url = resultBean.getData();
+            url =fileUploadComponent.getUrlPrefix()+url;
+            return rb.success().setData(url);
+        }
+        return rb;
+    }
 }