Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java

@@ -1,4 +1,43 @@
 package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
 public class VehicleBusinessFileManagementDetailVo {
+
+    @ApiModelProperty("销售订单附件")
+    private List<VehicleBusinessFileManagementFileVo> saleOrderFileList = new ArrayList<>();
+    @ApiModelProperty("收款认款附件")
+    private List<VehicleBusinessFileManagementFileVo> collectionPaymentsFileList = new ArrayList<>();
+    @ApiModelProperty("开票附件")
+    private List<VehicleBusinessFileManagementFileVo> invoiceFileList = new ArrayList<>();
+    @ApiModelProperty("出库附件")
+    private List<VehicleBusinessFileManagementFileVo> outBoundFileList = new ArrayList<>();
+    @ApiModelProperty("交车附件")
+    private List<VehicleBusinessFileManagementFileVo> deliveryCarFileList = new ArrayList<>();
+    @ApiModelProperty("价值客户备案")
+    private List<VehicleBusinessFileManagementFileVo> valueCustomersFileList = new ArrayList<>();
+    @ApiModelProperty("欠款客户备案")
+    private List<VehicleBusinessFileManagementFileVo> arrearsCustomersFileList = new ArrayList<>();
+    @ApiModelProperty("欠款开票附件")
+    private List<VehicleBusinessFileManagementFileVo> arrearsInvoiceFileList = new ArrayList<>();
+    @ApiModelProperty("欠款领票附件")
+    private List<VehicleBusinessFileManagementFileVo> arrearscollectionFileList = new ArrayList<>();
+    @ApiModelProperty("欠款出库附件")
+    private List<VehicleBusinessFileManagementFileVo> arrearsOutBoundFileList = new ArrayList<>();
+    @ApiModelProperty("欠款提车附件")
+    private List<VehicleBusinessFileManagementFileVo> arrearsPickupCarFileList = new ArrayList<>();
+    @ApiModelProperty("风控资料")
+    private List<VehicleBusinessFileManagementFileVo> riskManagementInfo = new ArrayList<>();
+    @ApiModelProperty("贷款前附件")
+    private List<VehicleBusinessFileManagementFileVo> loanBeforeFileList = new ArrayList<>();
+    @ApiModelProperty("贷款中附件")
+    private List<VehicleBusinessFileManagementFileVo> loanInFileList = new ArrayList<>();
+    @ApiModelProperty("贷款后附件")
+    private List<VehicleBusinessFileManagementFileVo> loanAfterFileList = new ArrayList<>();
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java

@@ -5,8 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
         contextId = "anrui-buscenter-VehicleBusinessFileManagement",
@@ -14,8 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody;
         path = "v1/vehicleBusinessFileManagement")
 public interface VehicleBusinessFileManagementFeign {
 
-
+    @ApiOperation("车辆业务档案管理列表")
-    /*@ApiOperation("车辆业务档案管理列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<VehicleBusinessFileManagementVo>> listPage(@RequestBody PagerQuery<VehicleBusinessFileManagementQuery> pq);*/
+    public ResultBean<PagerVo<VehicleBusinessFileManagementVo>> listPage(@RequestBody PagerQuery<VehicleBusinessFileManagementQuery> pq);
+
+    @ApiOperation("详情编辑回显")
+    @GetMapping("/getInitBySid/{sid}")
+    public ResultBean<VehicleBusinessFileManagementDetailVo> getInitBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFileVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehicleBusinessFileManagementFileVo {
+
+    @ApiModelProperty("附件名称")
+    private String fileNmae;
+    @ApiModelProperty("下载路径")
+    private String fileUrl;
+    @ApiModelProperty("上传日期 年-月-日")
+    private String uploadDate;
+    @ApiModelProperty("上传人")
+    private String uploadName;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java

@@ -1,4 +1,47 @@
 package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
 
-public class VehicleBusinessFileManagementQuery {
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehicleBusinessFileManagementQuery implements Query {
+
+    @ApiModelProperty("分公司")
+    private String orgName;
+    @ApiModelProperty("销售部门")
+    private String sellDept;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("销售订单编号")
+    private String saleOrderNo;
+    @ApiModelProperty("买卖合同编号")
+    private String contractNo;
+    @ApiModelProperty("付款方式")
+    private String payType;
+    @ApiModelProperty("业务类型")
+    private String businessType;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户电话")
+    private String customerPhone;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("开票单位")
+    private String invoiceTitle;
+    @ApiModelProperty("开票类型")
+    private String invoiceType;
+    @ApiModelProperty("出库日期")
+    private String deliveryStartData;
+    private String deliveryEndData;
+    @ApiModelProperty("业务状态")
+    private String businessStatus;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+
+    private String orgPath;
+    private String userSid;
+    private String menuUrl;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java

@@ -1,14 +1,16 @@
 package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
-public class VehicleBusinessFileManagementVo {
+public class VehicleBusinessFileManagementVo implements Vo {
 
+    private String sid;
     /**
      * 车架号
      */
@@ -41,6 +43,10 @@ public class VehicleBusinessFileManagementVo {
      * 客户电话
      */
     private String customerPhone;
+    /**
+     * 客户身份证号
+     */
+    private String customerIdCard;
     /**
      * 销售合同价
      */

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java

@@ -7,6 +7,7 @@ import com.yxt.anrui.buscenter.api.bushandoveritems.BusItemVo;
 import com.yxt.anrui.buscenter.api.bushandoveritems.BusItemsListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -39,6 +40,9 @@ public interface BusHandoverItemsMapper extends BaseMapper<BusHandoverItems> {
 
     List<BusHandoverItems> getTrailerByMainSid(String sid);
 
+    @Select("select * from bus_handover_items where vinSid = #{linkSid}")
+    List<BusHandoverItems> getOneByVinSid(String linkSid);
+
     /*IPage<BusHandoverItemsVo> selectPageVo(IPage<BusHandoverItems> page, @Param(Constants.WRAPPER) Wrapper<BusHandoverItems> qw);
 
     BusHandoverItemsVo fetchByHandoverSid(String handoverSid);*/

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java

@@ -94,6 +94,10 @@ public class BusHandoverItemsService extends MybatisBaseService<BusHandoverItems
         return baseMapper.getTrailerByMainSid(sid);
     }
 
+    public List<BusHandoverItems> getOneByVinSid(String linkSid) {
+        return baseMapper.getOneByVinSid(linkSid);
+    }
+
    /* private QueryWrapper<BusHandoverItems> createQueryWrapper(BusHandoverItemsQuery query) {
         QueryWrapper<BusHandoverItems> qw = new QueryWrapper<>();
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java

@@ -75,4 +75,7 @@ public interface BusValcustFilingMapper extends BaseMapper<BusValcustFiling> {
     void updateDkBySid(@Param("remarks") String remarks, @Param("dtoSid") String dtoSid);
 
     int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid);
+
+    @Select("select * from bus_valcust_filing where vinSid = #{linkSid}}")
+    BusValcustFiling selectByVinSid(String linkSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -1111,4 +1111,8 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         int count = baseMapper.getToDoNum(orgPath, userSid);
         return rb.success().setData(String.valueOf(count));
     }
+
+    public BusValcustFiling selectByVinSid(String linkSid) {
+        return baseMapper.selectByVinSid(linkSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.java

@@ -0,0 +1,41 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface VehicleBusinessFileManagementMapper extends BaseMapper<BusSalesOrder> {
+
+    IPage<VehicleBusinessFileManagementVo> archivesPageVo(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement.VehicleBusinessFileManagementMapper">
+    <select id="archivesPageVo"
+            resultType="com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo">
+        SELECT
+        bov.sid,
+        bov.linkNo AS vinNo,
+        bv.modelName,
+        bo.billNo AS saleOrderNo,
+        bo.contractNo,
+        bo.payType,
+        bo.customerName,
+        bo.mobile AS customerPhone,
+        bp.singleFinalPrice AS salePrice,
+        fa.openTickUnitName AS invoiceTitle,
+        fa.openTickTypeValue AS invoiceType,
+        bv.salesDate AS outBoundDate,
+        SUM(fs.subscriptionMoney) AS paymentAmount,
+        SUM(fu.reveivableMoney) - SUM(fs.subscriptionMoney) AS arrearsMoney,
+        bo.useOrgName AS orgName,
+        bo.orgName AS sellDept,
+        bo.staffName,
+        ct.IDNumber AS customerIdCard
+        FROM
+        bus_sales_order_vehicle bov
+        LEFT JOIN anrui_base.base_vehicle bv
+        ON bov.linkSid = bv.sid
+        LEFT JOIN bus_sales_order bo
+        ON bov.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_order_price bp
+        ON bp.salesOrderSid = bo.sid
+        LEFT JOIN anrui_fin.fin_bill_vehicle fv
+        ON bv.sid = fv.vehSid
+        LEFT JOIN anrui_fin.fin_bill_application fa
+        ON fv.billAppSid = fa.sid
+        LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed fu
+        ON fu.busVinSid = bov.sid
+        LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs
+        ON fs.receivablesSid = fu.sid
+        LEFT JOIN anrui_crm.crm_customer_temp ct
+        ON bo.customerSid = ct.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementRest.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement;
+
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementDetailVo;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementFeign;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementQuery;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("v1/vehicleBusinessFileManagement")
+public class VehicleBusinessFileManagementRest implements VehicleBusinessFileManagementFeign {
+
+    @Autowired
+    private VehicleBusinessFileManagementService vehicleBusinessFileManagementService;
+
+    @Override
+    public ResultBean<PagerVo<VehicleBusinessFileManagementVo>> listPage(PagerQuery<VehicleBusinessFileManagementQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<VehicleBusinessFileManagementVo> pv = vehicleBusinessFileManagementService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<VehicleBusinessFileManagementDetailVo> getInitBySid(String sid) {
+        return vehicleBusinessFileManagementService.getInitBySid(sid);
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementService.java

@@ -0,0 +1,753 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.vehicleBusinessFileManagement;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
+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;
+import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+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.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
+import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+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.DictCommonEnum;
+import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
+import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
+import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
+import com.yxt.anrui.buscenter.api.bushandover.BusHandover;
+import com.yxt.anrui.buscenter.api.bushandover.BusHandoverInitListVo;
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
+import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling;
+import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementDetailVo;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementFileVo;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementQuery;
+import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo;
+import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
+import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
+import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
+import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
+import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
+import com.yxt.anrui.buscenter.biz.busfile.BusFileService;
+import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService;
+import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService;
+import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
+import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
+import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
+import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService;
+import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
+import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
+import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService;
+import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
+import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService;
+import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService;
+import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
+import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo;
+import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
+import com.yxt.anrui.fin.api.finbillfile.FinAttachTypeEnum;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileFeign;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
+import com.yxt.anrui.flowable.api.flow.FlowSelectVo;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
+import com.yxt.anrui.flowable.api.flow2.FlowFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowableQuery;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord;
+import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecordFeign;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileFeign;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
+import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
+import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
+import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
+import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmfile.ScmFileFeign;
+import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign;
+import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelPush;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
+import com.yxt.common.base.config.component.DocPdfComponent;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.Base64;
+import com.yxt.common.base.utils.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.messagelist.MessageList;
+import com.yxt.messagecenter.api.messagelist.MessageListFeign;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import static java.util.Comparator.comparing;
+
+@Service
+public class VehicleBusinessFileManagementService extends MybatisBaseService<VehicleBusinessFileManagementMapper, BusSalesOrder> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private CommonContractFeign commonContractFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private CommonAppendixFeign commonAppendixFeign;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+    @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private FinBillVehicleFeign finBillVehicleFeign;
+    @Autowired
+    private FinBillFileFeign finBillFileFeign;
+    @Autowired
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
+    @Autowired
+    private ScmFileFeign scmFileFeign;
+    @Autowired
+    private LoanFileFeign loanFileFeign;
+    @Autowired
+    private BusHandoverItemsService busHandoverItemsService;
+    @Autowired
+    private BusHandoverService busHandoverService;
+    @Autowired
+    private BuscenterFileService buscenterFileService;
+    @Autowired
+    private BuscenterFileService buscenterFile;
+    @Autowired
+    private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService;
+    @Autowired
+    private BusFileService busFileService;
+    @Autowired
+    private BusValcustFilingService busValcustFilingService;
+    @Autowired
+    private LoanCustomerRecordFeign loanCustomerRecordFeign;
+
+    public PagerVo<VehicleBusinessFileManagementVo> listPageVo(PagerQuery<VehicleBusinessFileManagementQuery> pq) {
+        VehicleBusinessFileManagementQuery query = pq.getParams();
+        QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("bo.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<VehicleBusinessFileManagementVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<VehicleBusinessFileManagementVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOrgName())) {
+            qw.like("bo.useOrgName", query.getOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getSellDept())) {
+            qw.like("bo.orgName", query.getSellDept());
+        }
+        if (StringUtils.isNotBlank(query.getStaffName())) {
+            qw.like("bo.staffName", query.getStaffName());
+        }
+        if (StringUtils.isNotBlank(query.getSaleOrderNo())) {
+            qw.like("bo.billNo", query.getSaleOrderNo());
+        }
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("bo.contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getPayType())) {
+            qw.like("bo.payType", query.getPayType());
+        }
+        if (StringUtils.isNotBlank(query.getBusinessType())) {
+            //qw.like("ppb.payTypeValue", query.getBusinessType());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("bo.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerPhone())) {
+            qw.like("bo.mobile", query.getCustomerPhone());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bov.linkNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getModelName())) {
+            qw.like("bv.modelName", query.getModelName());
+        }
+        if (StringUtils.isNotBlank(query.getInvoiceTitle())) {
+            qw.like("fa.openTickUnitName", query.getInvoiceTitle());
+        }
+        if (StringUtils.isNotBlank(query.getInvoiceType())) {
+            qw.like("fa.openTickTypeValue", query.getInvoiceType());
+        }
+        if (StringUtils.isNotBlank(query.getBusinessStatus())) {
+            //qw.eq("ppbi.isInvoicing", query.getBusinessStatus());
+        }
+        if (StringUtils.isNotBlank(query.getArrearsMoney())) {
+            qw.gt("SUM(fu.reveivableMoney) - SUM(fs.subscriptionMoney)", query.getArrearsMoney());
+        }
+        String outBoundDateStart = query.getDeliveryStartData();
+        String outBoundDateEnd = query.getDeliveryEndData();
+        qw.apply(StringUtils.isNotEmpty(outBoundDateStart), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + outBoundDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(outBoundDateEnd), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + outBoundDateEnd + "','%Y-%m-%d')"
+                );
+        qw.groupBy("bov.sid");
+        IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
+        IPage<VehicleBusinessFileManagementVo> pagging = baseMapper.archivesPageVo(page, qw);
+        PagerVo<VehicleBusinessFileManagementVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<VehicleBusinessFileManagementDetailVo> getInitBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(sid);
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
+        VehicleBusinessFileManagementDetailVo vo = new VehicleBusinessFileManagementDetailVo();
+        List<VehicleBusinessFileManagementFileVo> saleOrderFileList = new ArrayList<>();//销售订单附件
+        List<VehicleBusinessFileManagementFileVo> collectionPaymentsFileList = new ArrayList<>();//收款认款附件
+        List<VehicleBusinessFileManagementFileVo> invoiceFileList = new ArrayList<>();//开票附件
+        List<VehicleBusinessFileManagementFileVo> outBoundFileList = new ArrayList<>();//出库附件
+        List<VehicleBusinessFileManagementFileVo> deliveryCarFileList = new ArrayList<>();//交车附件
+        List<VehicleBusinessFileManagementFileVo> valueCustomersFileList = new ArrayList<>();//价值客户备案
+        List<VehicleBusinessFileManagementFileVo> arrearsCustomersFileList = new ArrayList<>();//欠款客户备案
+        List<VehicleBusinessFileManagementFileVo> arrearsInvoiceFileList = new ArrayList<>();//欠款开票附件
+        List<VehicleBusinessFileManagementFileVo> arrearscollectionFileList = new ArrayList<>();//欠款领票附件
+        List<VehicleBusinessFileManagementFileVo> arrearsOutBoundFileList = new ArrayList<>();//欠款出库附件
+        List<VehicleBusinessFileManagementFileVo> arrearsPickupCarFileList = new ArrayList<>();//欠款提车附件
+        List<VehicleBusinessFileManagementFileVo> riskManagementInfo = new ArrayList<>();//风控资料
+        List<VehicleBusinessFileManagementFileVo> loanBeforeFileList = new ArrayList<>();//贷款前附件
+        List<VehicleBusinessFileManagementFileVo> loanInFileList = new ArrayList<>();//贷款中附件
+        List<VehicleBusinessFileManagementFileVo> loanAfterFileList = new ArrayList<>();//贷款后附件
+        CommonContractBuscenterVo data = commonContractFeign.selectByBusSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+        CommonContract commonContract = commonContractFeign.getContractByBusSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+        if (data.getContractType().contains("新车买卖合同")) {
+            List<CommonAppendixVo> pcCommonAppendixDtoList = data.getPcCommonAppendixDtoList();
+            for (CommonAppendixVo commonAppendixVo : pcCommonAppendixDtoList) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+                vehicleBusinessFileManagementFileVo.setFileNmae("新车买卖合同");
+                vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime());
+                vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName());
+                saleOrderFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        if (data.getContractType().contains("车辆登记合同")) {
+            List<CommonAppendixVo> pcCommonAppendixDtoList = data.getPcCommonAppendixDtoList();
+            for (CommonAppendixVo commonAppendixVo : pcCommonAppendixDtoList) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+                vehicleBusinessFileManagementFileVo.setFileNmae("车辆登记合同");
+                vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime());
+                vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName());
+                saleOrderFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        if (StringUtils.isNotBlank(commonContract.getSceneSignUrl())) {
+            String[] sceneSignUrls = commonContract.getSceneSignUrl().split(",");
+            for (String signUrl : sceneSignUrls) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + signUrl);
+                vehicleBusinessFileManagementFileVo.setFileNmae("合同现场签署照片");
+                vehicleBusinessFileManagementFileVo.setUploadDate(DateUtil.formatDate(commonContract.getCreateTime()));
+                vehicleBusinessFileManagementFileVo.setUploadName(commonContract.getStaffName());
+                saleOrderFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        List<String> collSids = finCollectionConfirmationFeign.selectSids(sid).getData();
+        for (String collSid : collSids) {
+            CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+            commonAppendixSelectQuery.setLinkSid(collSid);
+            commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+            ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
+            if (listResultBean.getSuccess()) {
+                for (CommonAppendixVo commonApp : listResultBean.getData()) {
+                    VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                    vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath());
+                    vehicleBusinessFileManagementFileVo.setFileNmae("打款凭证");
+                    vehicleBusinessFileManagementFileVo.setUploadDate(commonApp.getCreateTime());
+                    vehicleBusinessFileManagementFileVo.setUploadName(commonApp.getName());
+                    collectionPaymentsFileList.add(vehicleBusinessFileManagementFileVo);
+                }
+            }
+        }
+        FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(busSalesOrderVehicle.getLinkSid()).getData();
+        List<FinBillFileAppendxVo> kxqqs = finBillFileFeign.fetchFileBySid(finBillVehicleDetailsVo.getBillAppSid(), FinAttachTypeEnum.KPXXQRS.getAttachType()).getData();
+        for (FinBillFileAppendxVo kxqq : kxqqs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(kxqq.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("款项确认书");
+            vehicleBusinessFileManagementFileVo.setUploadDate(kxqq.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(kxqq.getName());
+            collectionPaymentsFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> zjApplicationAppendxs = finBillFileFeign.fetchzjBySid(sid).getData();
+        for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + zjApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("营业执照或身份证");
+            vehicleBusinessFileManagementFileVo.setUploadDate(zjApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(zjApplicationAppendx.getCreateByName());
+            invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> clmmhtApplicationAppendxs = finBillFileFeign.fetchclmmhtBySid(sid).getData();
+        for (FinBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + clmmhtApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("新车买卖合同-部分空白");
+            vehicleBusinessFileManagementFileVo.setUploadDate(clmmhtApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(clmmhtApplicationAppendx.getCreateByName());
+            invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillFileFeign.fetchcldjhtBySid(sid).getData();
+        for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + cldjhtApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("车辆登记合同");
+            vehicleBusinessFileManagementFileVo.setUploadDate(cldjhtApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(cldjhtApplicationAppendx.getCreateByName());
+            invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileFeign.fetchkhkpsqsBySid(sid).getData();
+        for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + khkpsqsApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("开票申请书");
+            vehicleBusinessFileManagementFileVo.setUploadDate(khkpsqsApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(khkpsqsApplicationAppendx.getCreateByName());
+            invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        VehicleInvoiceVo vehicleInvoiceVo = finVehicleInvoiceFeign.selectByVinSid(busSalesOrderVehicle.getLinkSid()).getData();
+        for (String string : vehicleInvoiceVo.getInvoiceImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + string);
+            vehicleBusinessFileManagementFileVo.setFileNmae("发票照片");
+            vehicleBusinessFileManagementFileVo.setUploadDate(vehicleInvoiceVo.getInvoiceDate());
+            vehicleBusinessFileManagementFileVo.setUploadName(vehicleInvoiceVo.getDrawer());
+            invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        BaseVehicleCertificateVo certificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busSalesOrderVehicle.getLinkSid()).getData();
+        if (null != certificateVo) {
+            String certificateVoSid = certificateVo.getSid();
+            List<String> vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(certificateVoSid).getData();
+            for (String s : vehicleAppendixList) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(s);
+                vehicleBusinessFileManagementFileVo.setFileNmae("合格证照片");
+                vehicleBusinessFileManagementFileVo.setUploadDate(certificateVo.getReceiveDate());
+                vehicleBusinessFileManagementFileVo.setUploadName(certificateVo.getReceiver());
+                invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        List<ScmFile> scmFiles = scmFileFeign.selectByLinkSid(sid, DictCommonEnum.ScmFileType.BD_IMAGE.getCode()).getData();
+        for (ScmFile scmFile : scmFiles) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("保单照片");
+            vehicleBusinessFileManagementFileVo.setUploadDate(scmFile.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(scmFile.getName());
+            invoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<BusHandoverItems> oneByVinSid = busHandoverItemsService.getOneByVinSid(busSalesOrderVehicle.getLinkSid());
+        BusHandover busHandover = busHandoverService.fetchBySid(oneByVinSid.get(0).getHandoverSid());
+        for (BusHandoverItems v : oneByVinSid) {
+            String handoverPhoto = v.getHandoverPhoto();
+            if (StringUtils.isNotBlank(handoverPhoto)) {
+                List<String> stringList = Arrays.asList(handoverPhoto.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                for (String s : stringList) {
+                    VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                    vehicleBusinessFileManagementFileVo.setFileUrl(s);
+                    vehicleBusinessFileManagementFileVo.setFileNmae("车辆交车照片（含挂车）");
+                    vehicleBusinessFileManagementFileVo.setUploadDate(v.getCreateTime().toString());
+                    SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+                    vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+                    deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+                }
+            }
+        }
+        BusHandoverItems busHandoverItems = oneByVinSid.get(0);
+        List<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.RECEIVE_CAR_IMAGES.getAttachType());
+        for (BuscenterFile buscenterFile : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("接收车辆确认书照片（含挂车）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.ENTRUST_IDCARD_IMAGES.getAttachType());
+        for (BuscenterFile buscenterFile : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("委托提车授权书、委托人身份证照片（含挂车）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (BusHandoverItems v : oneByVinSid) {
+            String handoverPhoto = v.getHandoverPhoto();
+            if (StringUtils.isNotBlank(handoverPhoto)) {
+                List<String> stringList = Arrays.asList(handoverPhoto.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                for (String s : stringList) {
+                    VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                    vehicleBusinessFileManagementFileVo.setFileUrl(s);
+                    vehicleBusinessFileManagementFileVo.setFileNmae("交车照片");
+                    vehicleBusinessFileManagementFileVo.setUploadDate(v.getCreateTime().toString());
+                    SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+                    vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+                    deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+                }
+            }
+        }
+        fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType());
+        for (BuscenterFile buscenterFile : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("交车资料确认单照片");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        fileList = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.EXIT_TICKET_IMAGES.getAttachType());
+        for (BuscenterFile buscenterFile : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("出门证照片");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<BuscenterFile> buscenterFiles = buscenterFileService.selectByLinkSid(busHandoverItems.getHandoverSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
+        for (BuscenterFile buscenterFile : buscenterFiles) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("优惠包交接资料照片");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchDetailsByVinSid(busSalesOrderVehicle.getLinkSid());
+        List<BuscenterFile> otherFiles = buscenterFile.selectByLinkSid(busHandoverPrepareVehicle.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        for (BuscenterFile otherFile : otherFiles) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + otherFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("其他资料照片");
+            vehicleBusinessFileManagementFileVo.setUploadDate(otherFile.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(busHandover.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            deliveryCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        BusValcustFiling busValcustFiling = busValcustFilingService.selectByVinSid(busSalesOrderVehicle.getLinkSid());
+        List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(busValcustFiling.getSid());
+        for (BusFileDto busFileDto : busFileDtos) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + busFileDto.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("相关附件");
+            vehicleBusinessFileManagementFileVo.setUploadDate(busFileDto.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(busFileDto.getName());
+            valueCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        LoanCustomerRecord loanCustomerRecord = loanCustomerRecordFeign.selectByCustSid(busSalesOrder.getCustomerSid()).getData();
+        fileList = loanFileFeign.selectByLinkSid(loanCustomerRecord.getSid(), LoanFileEnum.LICENSE.getAttachType()).getData();
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("营业执照（企业或个人挂靠运输公司时显示）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.ID_CARD.getAttachType()).getData();
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("法人和实际控制人身份证（企业时显示）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("本人身份证（个人时显示）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.INFO_LETTER.getAttachType()).getData();
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("法人和实际控制人签署的《信息查询授权书》（企业时显示）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("本人签署的《信息查询授权书》（个人时显示）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.AGREEMENT.getAttachType()).getData();
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("车队挂靠协议（个人挂靠运输公司时显示）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        fileList = loanFileFeign.selectByLinkSid(sid, LoanFileEnum.OTHER_INFO.getAttachType()).getData();
+        for (BuscenterFile file : fileList) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("其他资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(file.getCreateTime().toString());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(loanCustomerRecord.getCreateBySid()).getData();
+            vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
+            arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        /*List<FinBillFileVo> fjApplicationAppendxs = finBillFileFeign.fetchfjBySid(sid);
+        for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) {
+            String fileUrl = fjApplicationAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            fjApplicationAppendx.setFileUrl(fileUrl);
+        }*/
+        vo.setSaleOrderFileList(saleOrderFileList);
+        vo.setCollectionPaymentsFileList(collectionPaymentsFileList);
+        vo.setInvoiceFileList(invoiceFileList);
+        vo.setDeliveryCarFileList(deliveryCarFileList);
+        vo.setValueCustomersFileList(valueCustomersFileList);
+        vo.setArrearsCustomersFileList(valueCustomersFileList);
+        return rb.success().setData(vo);
+    }
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java

@@ -51,4 +51,6 @@ public class FinBillFileAppendxVo implements Vo {
     private String filePath;
     @ApiModelProperty("附件名称")
     private String appendixName;
+    @ApiModelProperty("上传时间")
+    private String createTime;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java

@@ -81,6 +81,28 @@ public interface FinBillFileFeign {
     @ResponseBody
     public ResultBean<List<FinBillFileAppendxVo>> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType);
 
+    @ApiOperation("查询证件附件")
+    @PostMapping("/fetchzjBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchzjBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("查询新车买卖合同附件")
+    @PostMapping("/fetchclmmhtBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchclmmhtBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("查询车辆登记合同附件")
+    @PostMapping("/fetchcldjhtBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchcldjhtBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("查询开票申请书附件")
+    @PostMapping("/fetchkhkpsqsBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchkhkpsqsBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("查询")
+    @PostMapping("/fetchfjBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchfjBySid(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java

@@ -74,4 +74,29 @@ public class FinBillFileFeignFallback implements FinBillFileFeign {
 	public ResultBean<List<FinBillFileAppendxVo>> fetchFileBySid(String billAppSid, String fileType) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchzjBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchclmmhtBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchcldjhtBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchkhkpsqsBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchfjBySid(String sid) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -110,6 +110,10 @@ public interface FinCollectionConfirmationFeign {
     @ResponseBody
     ResultBean ctskd(@RequestParam("skdSid") String skdSid);
 
+    @ApiOperation("根据销售订单车辆sid查询收款sid")
+    @PostMapping("/selectSids")
+    ResultBean<List<String>> selectSids(@RequestParam("busVehSid") String busVehSid);
+
     /*----------------------金融认款申请---------------------------*/
 
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -109,6 +109,11 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
         return null;
     }
 
+    @Override
+    public ResultBean<List<String>> selectSids(String busVehSid) {
+        return null;
+    }
+
     @Override
     public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {
         return null;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
+import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,7 +10,7 @@ import lombok.Data;
  * @date 2024/11/5 16:12
  */
 @Data
-public class CustomerBillSummaryQuery {
+public class CustomerBillSummaryQuery implements Query {
 
     @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java

@@ -47,7 +47,7 @@ public class CustomerBillSummaryVo implements Vo {
 	@ApiModelProperty("客户名称")
     private String customerName; // 客户名称
 	@ApiModelProperty("应收金额")
-    private String receivableMoney; // 当前应收金额
+    private String reveivableMoney; // 当前应收金额
     @ApiModelProperty("认款金额")
     private String subscriptionMoney; // 认款金额
     @ApiModelProperty("未认款金额")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerDetailsVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/6 10:16
+ */
+@Data
+public class CustomerDetailsVo implements Vo {
+
+    @ApiModelProperty("应收sid")
+    private String receivablesSid; // 应收sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    @ApiModelProperty("应收款项状态 01正常，02作废")
+    private String kxState; // 应收款项状态 01正常，02作废
+    @ApiModelProperty("应收金额")
+    private String reveivableMoney; // 当前应收金额
+    @ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+    @ApiModelProperty("未认款金额")
+    private String noSubscriptionMoney; // 未认款金额
+    @ApiModelProperty("生成时间")
+    private String createTime; // 生成时间
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeListVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/6 10:31
+ */
+@Data
+public class CustomerThreeListVo {
+
+    private String collectionDate;//收款日期
+    private String collectionMoney; //收款金额
+    private String payType; //付款方式
+    private String billNo;//单据编号
+    private String sid;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/6 10:31
+ */
+@Data
+public class CustomerThreeVo {
+
+private String customerName;
+private String contractNo;
+private String vinNo;
+private String receivablesName;
+private String reveivableMoney;
+private String subscriptionMoney;
+
+private List<CustomerThreeListVo> list = new ArrayList<>();
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -71,7 +71,16 @@ public interface FinUncollectedReceivablesDetailedFeign {
 
     @ApiOperation("客户账单汇总分页列表")
     @PostMapping("/customerBillListPage")
-    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(@RequestBody PagerQuery<FinUncollectedReceivablesDetailedQuery> pq);
+    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(@RequestBody PagerQuery<CustomerBillSummaryQuery> pq);
+
+    @ApiOperation("客户账单二级列表")
+    @PostMapping("/customerBillDetailsList")
+    public ResultBean<List<CustomerDetailsVo>> customerBillDetailsList(@RequestParam("contractNo") String contractNo);
+
+    @ApiOperation("客户账单三级列表")
+    @PostMapping("/customerBillThreeDetails")
+    public ResultBean<CustomerThreeVo> customerBillThreeDetails(@RequestParam("receivablesSid") String receivablesSid);
+
 
     @ApiOperation("客户账单明细分页列表")
     @PostMapping("/customerBillDetailedListPage")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -67,7 +67,17 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	}
 
 	@Override
-	public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+	public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<CustomerBillSummaryQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<CustomerDetailsVo>> customerBillDetailsList(String contractNo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<CustomerThreeVo> customerBillThreeDetails(String receivablesSid) {
 		return null;
 	}
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java

@@ -93,6 +93,39 @@ public class FinBillFileRest implements FinBillFileFeign {
 		return rb.success().setData(vo);
 	}
 
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchzjBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchzjBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchclmmhtBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchclmmhtBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchcldjhtBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchcldjhtBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchkhkpsqsBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchkhkpsqsBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchfjBySid(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<FinBillFileAppendxVo>> fetchFileBySid(String billAppSid, String fileType) {
 		ResultBean rb = ResultBean.fireFail();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -172,7 +172,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
 
     BigDecimal selectA1(String busVinSid);
 
-    BigDecimal selectA2(String busVinSid);
+    //BigDecimal selectA2(String busVinSid);
 
     List<String> selectBys(String busVinSid);
 
@@ -189,4 +189,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     LoanSettleBankCost selectMainSid(String sid);
 
     LoanFinBank selectByBanks(String saleOrderSid);
+
+    List<String> selectSids(String busVehSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -110,7 +110,6 @@
         <if test="useOrgSid != null and useOrgSid != ''">
             AND useOrgSid = #{useOrgSid}
         </if>
-
     </select>
     <select id="getCollectionConfirmDetail"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationDetailedVo">
@@ -310,7 +309,6 @@
                  left join anrui_riskcenter.loan_fin_policy lp on lp.sid = ls.policySid
                  left join anrui_riskcenter.loan_fin_bank lb on lb.sid = lp.bankSid
         where bo.contractNo = #{contractNo}
-
     </select>
 
     <select id="selectByBankSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
@@ -419,15 +417,21 @@
 
     <select id="selectByBss"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
-        select * from anrui_riskcenter.loan_repayment_plan_details where sid = #{busSid}
+        select *
+        from anrui_riskcenter.loan_repayment_plan_details
+        where sid = #{busSid}
     </select>
 
     <select id="selectA1" resultType="java.math.BigDecimal">
-        select ifnull(sum(dueMoney),0) from anrui_riskcenter.loan_repayment_plan_details where busVinSid = #{busVinSid}
+        select ifnull(sum(dueMoney), 0)
+        from anrui_riskcenter.loan_repayment_plan_details
+        where busVinSid = #{busVinSid}
     </select>
 
     <select id="selectBys" resultType="java.lang.String">
-        select sid from anrui_riskcenter.loan_repayment_plan_details where busVinSid = #{busVinSid}
+        select sid
+        from anrui_riskcenter.loan_repayment_plan_details
+        where busVinSid = #{busVinSid}
     </select>
 
     <select id="selectA3" resultType="java.math.BigDecimal">
@@ -438,35 +442,56 @@
     </select>
 
     <select id="selectUnA" resultType="java.lang.String">
-        select ld.sid from fin_uncollected_receivables_detailed_jr fr left join anrui_riskcenter.loan_repayment_plan_details ld on ld.sid = fr.busSid
+        select ld.sid
+        from fin_uncollected_receivables_detailed_jr fr
+                 left join anrui_riskcenter.loan_repayment_plan_details ld on ld.sid = fr.busSid
         where ld.busVinSid = #{busVinSid}
     </select>
 
     <select id="selectA4" resultType="java.math.BigDecimal">
-        select ifnull(sum(subscriptionMoney),0) from fin_selected_receivables_detailed where fin_selected_receivables_detailed.receivablesSid in
+        select ifnull(sum(subscriptionMoney),0) from fin_selected_receivables_detailed where
+        fin_selected_receivables_detailed.receivablesSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
 
     <select id="selectA5" resultType="java.math.BigDecimal">
-        select ifnull(sum(subscriptionMoney),0) from fin_selected_receivables_detailed where fin_selected_receivables_detailed.receivablesSid in
+        select ifnull(sum(subscriptionMoney),0) from fin_selected_receivables_detailed where
+        fin_selected_receivables_detailed.receivablesSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
 
     <select id="selectApply" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply">
-        select * from anrui_riskcenter.loan_settle_apply where busVinSid = #{busVinSid} order by id desc limit 1
+        select *
+        from anrui_riskcenter.loan_settle_apply
+        where busVinSid = #{busVinSid}
+        order by id desc limit 1
     </select>
 
     <select id="selectMainSid" resultType="com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost">
-        select * from anrui_riskcenter.loan_settle_bank_cost where mainSid = #{sid}
+        select *
+        from anrui_riskcenter.loan_settle_bank_cost
+        where mainSid = #{sid}
     </select>
 
     <select id="selectByBanks" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
-        select lb.* from anrui_riskcenter.loan_fin_bank lb left join anrui_riskcenter.loan_fin_policy lp on lp.bankSid = lb.sid
+        select lb.*
+        from anrui_riskcenter.loan_fin_bank lb
+                 left join anrui_riskcenter.loan_fin_policy lp on lp.bankSid = lb.sid
                  left join anrui_riskcenter.loan_solutions ls on ls.policySid = lp.sid
         where ls.salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectSids" resultType="java.lang.String">
+        SELECT fc.sid
+        FROM fin_collection_confirmation fc
+                 LEFT JOIN fin_selected_receivables_detailed fs
+                           ON fc.sid = fs.collSid
+                 LEFT JOIN fin_uncollected_receivables_detailed fu
+                           ON fs.receivablesSid = fu.sid
+        WHERE fu.busVinSid = #{busVehSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -131,6 +131,12 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean ctskd(String skdSid) {
         return finCollectionConfirmationService.ctskd(skdSid);
     }
+
+    @Override
+    public ResultBean<List<String>> selectSids(String busVehSid) {
+        return finCollectionConfirmationService.selectSids(busVehSid);
+    }
+
     //------------------------金融认款申请-----------------------------------
     @Override
     public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -5566,4 +5566,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     }
 
 
+    public ResultBean<List<String>> selectSids(String busVehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> sids = baseMapper.selectSids(busVehSid);
+        return rb.success().setData(sids);
+    }
 }

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

@@ -130,4 +130,12 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
 
     @Select("SELECT IFNULL(SUM(reveivableMoney),0) FROM fin_uncollected_receivables_detailed WHERE contractSid = #{billSid}")
     BigDecimal selYsByBillSid(String billSid);
+
+    IPage<CustomerBillSummaryVo> getCustomerSummaryList(IPage<FinUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER)QueryWrapper<FinUncollectedReceivablesDetailed> qw);
+
+    List<CustomerDetailsVo> customerBillDetailsList(@Param("contractNo") String contractNo);
+
+    CustomerThreeVo selCustomerThreeDetails(@Param("receivablesSid") String receivablesSid);
+
+    List<CustomerThreeListVo> selCustomerThreeListDetails(@Param("receivablesSid") String receivablesSid);
 }

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

@@ -646,4 +646,238 @@
           AND sd.receivablesName = '订金'
           AND sd.auditState = '3'
     </select>
+    <select id="getCustomerSummaryList"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerBillSummaryVo">
+        SELECT
+            b.*,
+            ( b.reveivableMoney - b.subscriptionMoney ) noSubscriptionMoney
+        FROM
+            (
+                SELECT
+                    a.*,
+                    (
+                        SELECT
+                            ifnull( sum( dbalance ), 0 ) AS subscriptionMoney
+                        FROM
+                            (
+                                SELECT
+                                    d.receivablesSid,
+                                    d.contractNo,
+                                    cast((
+                                        d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
+                                FROM
+                                    fin_selected_receivables_detailed d
+                                        LEFT JOIN (
+                                        SELECT
+                                            f.busSid,
+                                            f.thisUseMoney
+                                        FROM
+                                            fin_funds_carried_forward_veh f
+                                                LEFT JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                                        WHERE
+                                            fa.`nodeState` = '已办结'
+                                    ) f ON f.`busSid` = d.`sid`
+                                WHERE
+                                    d.auditState = 3
+                                GROUP BY
+                                    d.`sid`
+                            ) d
+                        WHERE
+                            d.contractNo = a.contractNo
+                    ) AS subscriptionMoney
+                FROM
+                    (
+                        SELECT
+                            orgSidPath,
+                            contractSid,
+                            customerName,
+                            contractNo,
+                            IFNULL( SUM( reveivableMoney ), 0 ) reveivableMoney
+                        FROM
+                            fin_uncollected_receivables_detailed AS f
+                        WHERE
+                            f.kxState = '01'
+                        GROUP BY
+                            f.contractSid
+                    ) AS a
+            ) b
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="customerBillDetailsList"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerDetailsVo">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    a.sid receivablesSid,
+                    a.customerName,
+                    a.contractNo,
+                    a.linkNo as vinNo,
+                    a.receivablesName,
+                    a.kxState,
+                    a.reveivableMoney,
+                    a.subscriptionMoney,
+                    ( a.reveivableMoney - a.subscriptionMoney ) AS noSubscriptionMoney,
+                    a.createTime
+                FROM
+                    (
+                        SELECT
+                            u.sid,
+                            u.useOrgSid,
+                            u.busVinSid,
+                            u.customerName,
+                            u.contractNo,
+                            RIGHT(v.linkNo,8) as linkNo,
+                            u.receivablesName,
+                            u.payType,
+                            u.orgSidPath,
+                            u.createBySid,
+                            u.kxState,
+                            u.reveivableMoney,
+                            u.createTime,
+                            u.remarks,
+                            (
+                            SELECT
+                            ifnull( sum( dbalance ), 0 ) AS subscriptionMoney
+                            FROM
+                            (
+                            SELECT
+                            d.receivablesSid,
+                            cast((
+                            d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
+                            FROM
+                            fin_selected_receivables_detailed d
+                            LEFT JOIN (
+                            SELECT
+                            f.busSid,
+                            f.thisUseMoney
+                            FROM
+                            fin_funds_carried_forward_veh f
+                            LEFT JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                            WHERE
+                            fa.`nodeState` = '已办结'
+                            ) f ON f.`busSid` = d.`sid`
+                            WHERE
+                            d.auditState = 3
+                            GROUP BY
+                            d.`sid`
+                            ) d
+                            WHERE
+                            d.receivablesSid = u.sid
+                            ) AS subscriptionMoney
+                        FROM
+                            fin_uncollected_receivables_detailed AS u
+                            LEFT JOIN anrui_buscenter.bus_sales_order_vehicle AS v ON u.busVinSid = v.sid
+                        WHERE u.contractNo = #{contractNo}
+                    ) a
+            ) AS b
+    </select>
+    <select id="selCustomerThreeDetails"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerThreeVo">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    a.customerName,
+                    a.contractNo,
+                    a.linkNo as vinNo,
+                    a.receivablesName,
+                    a.reveivableMoney,
+                    a.subscriptionMoney
+                FROM
+                    (
+                        SELECT
+                            u.customerName,
+                            u.contractNo,
+                            RIGHT(v.linkNo,8) as linkNo,
+                            u.receivablesName,
+                            u.reveivableMoney,
+                            (
+                            SELECT
+                            ifnull( sum( dbalance ), 0 ) AS subscriptionMoney
+                            FROM
+                            (
+                            SELECT
+                            d.receivablesSid,
+                            cast((
+                            d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
+                            FROM
+                            fin_selected_receivables_detailed d
+                            LEFT JOIN (
+                            SELECT
+                            f.busSid,
+                            f.thisUseMoney
+                            FROM
+                            fin_funds_carried_forward_veh f
+                            LEFT JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                            WHERE
+                            fa.`nodeState` = '已办结'
+                            ) f ON f.`busSid` = d.`sid`
+                            WHERE
+                            d.auditState = 3
+                            GROUP BY
+                            d.`sid`
+                            ) d
+                            WHERE
+                            d.receivablesSid = u.sid
+                            ) AS subscriptionMoney
+                        FROM
+                            fin_uncollected_receivables_detailed AS u
+                            LEFT JOIN anrui_buscenter.bus_sales_order_vehicle AS v ON u.busVinSid = v.sid
+                        WHERE u.sid = #{receivablesSid}
+                    ) a
+            ) AS b
+    </select>
+    <select id="selCustomerThreeListDetails"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerThreeListVo">
+        SELECT
+            c.sid,
+            c.collectionDate,
+            d.`subscriptionMoney` AS collectionMoney,
+            '认款' payType,
+            c.billNo
+        FROM
+            fin_selected_receivables_detailed AS d
+                LEFT JOIN fin_collection_confirmation AS c ON c.sid = d.collSid
+        WHERE
+            d.receivablesSid = #{receivablesSid}
+          AND d.auditState = 3
+        UNION ALL
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    f.sid,
+                    f.collectionDate,
+                    - abs(
+                            IFNULL( f.`thisUseMoney`, 0 )) collectionMoney,
+                    '结转' payType,
+                    f.billNo
+                FROM
+                    fin_selected_receivables_detailed d
+                        LEFT JOIN (
+                        SELECT
+                            fa.sid,
+                            f.busSid,
+                            f.thisUseMoney,
+                            date_format ( fa.createTime, '%Y-%m-%d' ) AS collectionDate,
+                            fa.billNo
+                        FROM
+                            fin_funds_carried_forward_veh f
+                                LEFT JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                        WHERE
+                            fa.`nodeState` = '已办结'
+                    ) f ON f.`busSid` = d.`sid`
+                WHERE
+                    d.auditState = 3
+                  AND d.receivablesSid = #{receivablesSid}
+            ) AS m
+        WHERE
+            m.collectionMoney != 0
+    </select>
 </mapper>

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

@@ -89,12 +89,22 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
     }
 
     @Override
-    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<CustomerBillSummaryQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<CustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<List<CustomerDetailsVo>> customerBillDetailsList(String contractNo) {
+        return finUncollectedReceivablesDetailedService.customerBillDetailsList(contractNo);
+    }
+
+    @Override
+    public ResultBean<CustomerThreeVo> customerBillThreeDetails(String receivablesSid) {
+        return finUncollectedReceivablesDetailedService.customerBillThreeDetails(receivablesSid);
+    }
+
     @Override
     public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillDetailedListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -278,83 +278,83 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         baseMapper.updateCurRecMoneyBySid(curRecMoney, sid);
     }
 
-    public PagerVo<CustomerBillSummaryVo> listPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+//    public PagerVo<CustomerBillSummaryVo> listPageVo(PagerQuery<CustomerBillSummaryQuery> pq) {
-        FinUncollectedReceivablesDetailedQuery params = pq.getParams();
+//        FinUncollectedReceivablesDetailedQuery params = pq.getParams();
-        String staffSid = params.getCreateBySid();
+//        String staffSid = params.getCreateBySid();
-        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
+//        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
-        List<SysStaffOrgVo> data2 = sysStaffOrgListByStaffSid.getData();
+//        List<SysStaffOrgVo> data2 = sysStaffOrgListByStaffSid.getData();
-        String orgSidPath = "";
+//        String orgSidPath = "";
-        for (SysStaffOrgVo datum : data2) {
+//        for (SysStaffOrgVo datum : data2) {
-            orgSidPath = datum.getOrgSidPath();
+//            orgSidPath = datum.getOrgSidPath();
-            String[] split = orgSidPath.split("/");
+//            String[] split = orgSidPath.split("/");
-            for (String s : split) {
+//            for (String s : split) {
-                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
+//                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
-                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
+//                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
-                Integer isDept = data1.getIsDept();
+//                Integer isDept = data1.getIsDept();
-                String psid = data1.getPsid();
+//                String psid = data1.getPsid();
-                if (isDept == 0 && !psid.equals(0)) {
+//                if (isDept == 0 && !psid.equals(0)) {
-                    orgSidPath = s;
+//                    orgSidPath = s;
-                    break;
+//                    break;
-                }
+//                }
-            }
+//            }
-        }
+//        }
-        params.setUseOrgSid(orgSidPath);
+//        params.setUseOrgSid(orgSidPath);
-        QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(params);
+//        QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(params);
-        IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+//        IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
-        IPage<FinUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
+//        IPage<FinUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
-        List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
+//        List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
-        for (FinUncollectedReceivablesDetailedVo record : records) {
+//        for (FinUncollectedReceivablesDetailedVo record : records) {
-            BigDecimal totalDeposit = new BigDecimal(0);
+//            BigDecimal totalDeposit = new BigDecimal(0);
-            BigDecimal totalPrice = new BigDecimal(0);
+//            BigDecimal totalPrice = new BigDecimal(0);
-            BigDecimal noSubscriptionMoney = new BigDecimal(0);
+//            BigDecimal noSubscriptionMoney = new BigDecimal(0);
-            String sid = record.getContractSid();
+//            String sid = record.getContractSid();
-            String contractNo = record.getContractNo();
+//            String contractNo = record.getContractNo();
-            String receivablesName = record.getReceivablesName();
+//            String receivablesName = record.getReceivablesName();
-            String paymentTypeValue = record.getPaymentTypeValue();
+//            String paymentTypeValue = record.getPaymentTypeValue();
-            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid);
+//            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid);
-            CommonContractVo data = commonContractVoResultBean.getData();
+//            CommonContractVo data = commonContractVoResultBean.getData();
-            if (receivablesName.equals("订金")) {
+//            if (receivablesName.equals("订金")) {
-                BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit());
+//                BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit());
-                BigDecimal num = new BigDecimal(data.getNum());
+//                BigDecimal num = new BigDecimal(data.getNum());
-                totalDeposit = oneDeposit.multiply(num);
+//                totalDeposit = oneDeposit.multiply(num);
-                record.setCurrentReceivableMoney(String.valueOf(totalDeposit));
+//                record.setCurrentReceivableMoney(String.valueOf(totalDeposit));
-            } else if (receivablesName.equals("车款")) {
+//            } else if (receivablesName.equals("车款")) {
-                BigDecimal price = new BigDecimal(data.getPrice());
+//                BigDecimal price = new BigDecimal(data.getPrice());
-                BigDecimal num = new BigDecimal(data.getNum());
+//                BigDecimal num = new BigDecimal(data.getNum());
-                totalPrice = price.multiply(num);
+//                totalPrice = price.multiply(num);
-                record.setCurrentReceivableMoney(String.valueOf(totalPrice));
+//                record.setCurrentReceivableMoney(String.valueOf(totalPrice));
-            }
+//            }
-            List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectGroupConAndRecAndPay();
+//            List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectGroupConAndRecAndPay();
-            for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
+//            for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
-                String receivablesName1 = finSelectedReceivablesDetailedVo.getReceivablesName();
+//                String receivablesName1 = finSelectedReceivablesDetailedVo.getReceivablesName();
-                String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney();
+//                String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney();
-                if (receivablesName1.equals("订金")) {
+//                if (receivablesName1.equals("订金")) {
-                    record.setSubscriptionMoney(subscriptionMoney);
+//                    record.setSubscriptionMoney(subscriptionMoney);
-                    noSubscriptionMoney = totalDeposit.subtract(new BigDecimal(subscriptionMoney));
+//                    noSubscriptionMoney = totalDeposit.subtract(new BigDecimal(subscriptionMoney));
-                    record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
+//                    record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
-                    if (subscriptionMoney.equals(0)) {
+//                    if (subscriptionMoney.equals(0)) {
-                        record.setSubscriptionState("未认款");
+//                        record.setSubscriptionState("未认款");
-                    } else if (subscriptionMoney.equals(totalDeposit)) {
+//                    } else if (subscriptionMoney.equals(totalDeposit)) {
-                        record.setSubscriptionState("已认款");
+//                        record.setSubscriptionState("已认款");
-                    } else {
+//                    } else {
-                        record.setSubscriptionState("部分认款");
+//                        record.setSubscriptionState("部分认款");
-                    }
+//                    }
-                } else if (receivablesName1.equals("车款")) {
+//                } else if (receivablesName1.equals("车款")) {
-                    noSubscriptionMoney = totalPrice.subtract(new BigDecimal(subscriptionMoney));
+//                    noSubscriptionMoney = totalPrice.subtract(new BigDecimal(subscriptionMoney));
-                    record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
+//                    record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
-                    if (subscriptionMoney.equals(0)) {
+//                    if (subscriptionMoney.equals(0)) {
-                        record.setSubscriptionState("未认款");
+//                        record.setSubscriptionState("未认款");
-                    } else if (subscriptionMoney.equals(totalPrice)) {
+//                    } else if (subscriptionMoney.equals(totalPrice)) {
-                        record.setSubscriptionState("已认款");
+//                        record.setSubscriptionState("已认款");
-                    } else {
+//                    } else {
-                        record.setSubscriptionState("部分认款");
+//                        record.setSubscriptionState("部分认款");
-                    }
+//                    }
-                }
+//                }
-            }
+//            }
-        }
+//        }
-        PagerVo<CustomerBillSummaryVo> p = PagerUtil.pageToVo(pagging, null);
+//        PagerVo<CustomerBillSummaryVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
+//        return p;
-    }
+//    }
 
     private QueryWrapper<FinUncollectedReceivablesDetailed> myCreateQueryWrapper(FinUncollectedReceivablesDetailedQuery query) {
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
@@ -1233,4 +1233,83 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         BigDecimal ysMoney = baseMapper.selYsByBillSid(billSid);
         return rb.success().setData(ysMoney);
     }
+
+    public PagerVo<CustomerBillSummaryVo> listPageVo(PagerQuery<CustomerBillSummaryQuery> pq) {
+        QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
+        CustomerBillSummaryQuery query = pq.getParams();
+        String orgPath = query.getOrgPath();
+        //授权
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                orgPath = orgPath + "/";
+                int i1 = orgPath.indexOf("/");
+                int i2 = orgPath.indexOf("/", i1 + 1);
+                int i3 = orgPath.indexOf("/", i2 + 1);
+                int i4 = orgPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i1);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i2);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i3);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i4);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i4);
+                    qw.like("b.orgSidPath", orgPath);
+                } else {
+                    PagerVo<CustomerBillSummaryVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<CustomerBillSummaryVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getNoSubscriptionMoneyStart())) {
+            qw.apply("( b.reveivableMoney - b.subscriptionMoney ) >=" + query.getNoSubscriptionMoneyStart());
+        }
+        if (StringUtils.isNotBlank(query.getNoSubscriptionMoneyEnd())) {
+            qw.apply("( b.reveivableMoney - b.subscriptionMoney ) <=" + query.getNoSubscriptionMoneyEnd());
+        }
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("b.contractNo",query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("b.customerName",query.getCustomerName());
+        }
+        IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+        IPage<CustomerBillSummaryVo> pagging = baseMapper.getCustomerSummaryList(page, qw);
+        PagerVo<CustomerBillSummaryVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<List<CustomerDetailsVo>> customerBillDetailsList(String contractNo) {
+        ResultBean rb = ResultBean.fireFail();
+        List<CustomerDetailsVo> vos = baseMapper.customerBillDetailsList(contractNo);
+        return rb.success().setData(vos);
+    }
+
+    public ResultBean<CustomerThreeVo> customerBillThreeDetails(String receivablesSid) {
+        ResultBean rb = ResultBean.fireFail();
+        CustomerThreeVo vo = baseMapper.selCustomerThreeDetails(receivablesSid);
+        if (vo != null) {
+            List<CustomerThreeListVo> list = baseMapper.selCustomerThreeListDetails(receivablesSid);
+            if (!list.isEmpty()) {
+                vo.setList(list);
+            }
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java

@@ -156,4 +156,8 @@ public interface LoanCustomerRecordFeign {
     @ResponseBody
     ResultBean<List<AppSearchSelect>> selectAffiliated(@RequestParam("orgPath") String orgPath, @RequestParam(value = "name", required = false) String name);
 
+    @ApiOperation("根据客户sid查询")
+    @GetMapping("/selectByCustSid")
+    @ResponseBody
+    ResultBean<LoanCustomerRecord> selectByCustSid(@RequestParam("customerSid") String customerSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java

@@ -115,4 +115,9 @@ public class LoanCustomerRecordFeignFallback implements LoanCustomerRecordFeign
     public ResultBean<List<AppSearchSelect>> selectAffiliated(String orgPath, String name) {
         return null;
     }
+
+    @Override
+    public ResultBean<LoanCustomerRecord> selectByCustSid(String customerSid) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileFeign.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfile;
+
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@FeignClient(
+        contextId = "riskcenter-LoanFile",
+        name = "riskcenter",
+        path = "v1/loanfile")
+public interface LoanFileFeign {
+
+    @ApiOperation("查询附件")
+    @PostMapping("/selectByLinkSid")
+    @ResponseBody
+    ResultBean<List<BuscenterFile>> selectByLinkSid(@RequestParam("sid") String sid, @RequestParam("attachType") String attachType);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordMapper.java

@@ -34,4 +34,7 @@ public interface LoanCustomerRecordMapper extends BaseMapper<LoanCustomerRecord>
     int updateFlowFiled(Map<String, Object> map);
 
     IPage<AppCustomerRecordVo> getCustomerRecordList(IPage<LoanCustomerRecord> page, @Param(Constants.WRAPPER) QueryWrapper<LoanCustomerRecord> qw);
+
+    @Select("select * from loan_customer_record where customerSid = #{customerSid}}")
+    LoanCustomerRecord selectByCustSid(String customerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java

@@ -154,4 +154,9 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign {
     public ResultBean<List<AppSearchSelect>> selectAffiliated(String orgPath, String name) {
         return loanCustomerRecordService.selectAffiliated(orgPath, name);
     }
+
+    @Override
+    public ResultBean<LoanCustomerRecord> selectByCustSid(String customerSid) {
+        return loanCustomerRecordService.selectByCustSid(customerSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java

@@ -1791,4 +1791,10 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
         }
         return rb.success().setData(list);
     }
+
+    public ResultBean<LoanCustomerRecord> selectByCustSid(String customerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCustomerRecord loanCustomerRecord = baseMapper.selectByCustSid(customerSid);
+        return rb.success().setData(loanCustomerRecord);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -84,6 +84,7 @@
         ON a.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
+            AND (a.nodeCode = 3 or a.nodeCode = 5)
         </where>
         AND (SELECT
         COUNT(*)
@@ -94,6 +95,30 @@
         OR ad.oldInventorySid = ''
         )
         AND ad.`billSid` = ai.sid) > 0
+        UNION ALL
+        SELECT
+        wor.sid,
+        a.sid AS billSid,
+        a.nodeName AS taskName,
+        a.billNo,
+        DATE_FORMAT(a.createTime, '%Y-%m-%d') AS billTime,
+        a.customerName,
+        av.vinNo,
+        av.vehMark ,
+        wor.shortss,
+        wor.photos AS photoss
+        FROM
+        as_busrepair_bill_vech av
+        LEFT JOIN as_busrepair_bill a
+        ON a.sid = av.billSid
+        LEFT JOIN yxt_wms.wms_old_register wor
+        ON a.billNo = wor.billNo
+        LEFT JOIN anrui_portal.sys_organization AS s
+        ON a.deptSid = s.sid
+        <where>
+            ${ew.sqlSegment}
+            AND a.nodeCode = 3
+        </where>
         GROUP BY a.sid
     </select>
 
@@ -211,14 +236,13 @@
     </select>
     <select id="selGoodsReceiveByBillSid"
             resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo">
-        SELECT
+        SELECT d.sid,
-            d.sid,
                d.count as                                   num,
                concat(d.goodsSpuName, '\n', d.goodsSkuCode) val
-        FROM
+        FROM as_busrepair_inventorybill_detail AS d
-            as_busrepair_inventorybill_detail AS d
                  LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
-        WHERE d.state = 1 and i.sourceBillSid = #{sid}
+        WHERE d.state = 1
+          and i.sourceBillSid = #{sid}
     </select>
     <select id="notConfirmList2" resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo">
         SELECT
@@ -275,15 +299,13 @@
     </select>
     <select id="goodsConfrimInfoList"
             resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo">
-        SELECT
+        SELECT d.goodsSpuName                    goodsName,
-            d.goodsSpuName goodsName,
                d.count,
                d.goodsSkuCode,
                d.operName                        `user`,
                IF
                    (d.state = 2, TRUE, FALSE) AS state
-        FROM
+        FROM as_busrepair_inventorybill_detail AS d
-            as_busrepair_inventorybill_detail AS d
                  LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
         where i.sourceBillSid = #{sid}
     </select>
@@ -313,6 +335,9 @@
         </where>
     </select>
     <select id="selLastTaxRateByUseOrgSid" resultType="java.lang.String">
-        SELECT parameterValue FROM anrui_portal.sys_parameter as s WHERE s.useOrgSid LIKE concat('%', #{createOrgSid}, '%') AND S.parameterNo = 'SHXSZDSL'
+        SELECT parameterValue
+        FROM anrui_portal.sys_parameter as s
+        WHERE s.useOrgSid LIKE concat('%', #{createOrgSid}, '%')
+          AND S.parameterNo = 'SHXSZDSL'
     </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1395,7 +1395,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
                 );
-        qw.and(wrapper -> wrapper.eq("a.nodeCode", 3).or().eq("a.nodeCode", 5));
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
         for (AsBusrepairPageVo record : pagging.getRecords()) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java

@@ -177,6 +177,7 @@ public class AsServiceAccommApplyService extends MybatisBaseService<AsServiceAcc
 		qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (aaa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (aaa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
 				);
+		qw.orderByDesc("aaa.createTime");
 		IPage<AsServiceAccommApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceAccommApplyVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceAccommApplyVo> p = PagerUtil.pageToVo(pagging, null);

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java

@@ -185,6 +185,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (tta.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (tta.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
+		qw.orderByDesc("tta.createTime");
 		IPage<AsTechTitleApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsTechTitleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsTechTitleApplyVo> p = PagerUtil.pageToVo(pagging, null);

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml

@@ -123,8 +123,8 @@
         i.manufacturerSid,
         i.manufacturerName
         FROM
-        sms_goods AS s
+        yxt_wms.wms_inventory as i
-        LEFT JOIN yxt_wms.wms_inventory as i ON s.goodsID = i.goodsID
+        LEFT JOIN sms_goods AS s ON s.goodsID = i.goodsID
         LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.warehouseSid = i.warehouseSid
         <where>${ew.sqlSegment}</where>
     </select>

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java

@@ -424,7 +424,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
             qw.and(wrapper -> wrapper.like("i.goodsSpuName", query.getGoodsName()).or().like("i.goodsSkuCode", query.getGoodsName()));
         }
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-            qw.eq("s.useOrgSid", query.getUseOrgSid());
+            qw.eq("i.useOrgSid", query.getUseOrgSid());
         }
         qw.apply("i.count > 0");
         IPage<SmsSalesBill> page = PagerUtil.queryToPage(pq);