Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -195,6 +195,10 @@ public interface BaseDistributorFeign {
     @GetMapping("/selectAllDisList")
     ResultBean<List<BaseDistributorListVo>> selectAllDisList(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid);
 
+    @ApiOperation("开票申请中获取开票名称")
+    @GetMapping("/selectAllDisList2")
+    ResultBean<List<BaseDistributorListVo>> selectAllDisList2(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid,@RequestParam("state")String state);
+
     @ApiOperation("移动端查询经销商和客户信息")
     @GetMapping("/invoiceName")
     ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -214,11 +214,21 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList2(String orgSid, String staffSid,String state) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppDisAndCustm>> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) {
+        return null;
+    }
+
     @Override
     public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basedistributor;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -24,4 +25,9 @@ public class BaseDistributorListVo implements Vo {
     private String openTickRemarks;//拼接的开票信息
 
     private String nameAndPhone;//个人名字手机号拼接
+
+    @ApiModelProperty("开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String openTickTypeValue;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -96,6 +96,7 @@ public class BaseVehicleStateEnum {
         KPSQTG("26","开票申请通过"),
         KPSQBH("27","开票申请驳回"),
         KPSQCH("28","开票申请撤回"),
+        LPSQTG("29","领票申请通过"),
         ;
 
         private String typeKey;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -348,6 +348,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         return baseDistributorService.selectAllDisList(orgSid, staffSid);
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList2(String orgSid, String staffSid,String state) {
+        return baseDistributorService.selectAllDisList2(orgSid, staffSid,state);
+    }
+
     @Override
     public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
         return baseDistributorService.invoiceName(userSid, orgPath, search);
@@ -355,7 +360,7 @@ public class BaseDistributorRest implements BaseDistributorFeign {
 
     @Override
     public ResultBean<List<AppDisAndCustm>> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) {
-        return baseDistributorService.invoiceName2(userSid, orgPath, search,invoiceKey);
+        return baseDistributorService.invoiceName2(userSid, orgPath, search, invoiceKey);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1263,6 +1263,56 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         return rb.success().setData(baseDistributorListVos);
     }
 
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList2(String orgSid, String staffSid,String state) {
+        ResultBean rb = ResultBean.fireFail();
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = new ArrayList<>();
+        if("1".equals(state)){//开票申请
+            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSidTwo(orgSid);
+        }else{
+            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(orgSid);
+        }
+        List<BaseDistributorListVo> baseDistributorListVos = new ArrayList<>();
+        for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) {
+            BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
+            BeanUtil.copyProperties(finCompanyInvoicingBillListVo, baseDistributorListVo);
+            String openTickRemarks = "";
+            if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistDetailAddress() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoPhone() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBank() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；";
+            }
+            baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
+            baseDistributorListVos.add(baseDistributorListVo);
+        }
+        CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
+        crmCustomerTempListQuery.setStaffSid(staffSid);
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(orgSid).getData();
+        crmCustomerTempListQuery.setOrgPath(sysOrganizationVo.getOrgSidPath());
+        crmCustomerTempListQuery.setCertificateTypeKey("01");
+        List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
+        for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
+            BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
+            baseDistributorListVo.setName(crmCustomerTempListVo.getName());
+            baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
+            baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setRegistNum(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setInvoPhone(crmCustomerTempListVo.getMobile());
+            baseDistributorListVo.setNameAndPhone(crmCustomerTempListVo.getName() + crmCustomerTempListVo.getMobile());
+            baseDistributorListVos.add(baseDistributorListVo);
+        }
+        return rb.success().setData(baseDistributorListVos);
+    }
+
     public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDistributorListVo baseDistributorListVo = baseMapper.selectDisListBySid(sid);
@@ -1332,9 +1382,17 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = new ArrayList<>();
         if (StringUtils.isBlank(search)) {
-            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey);
+            if ("02".equals(invoiceKey)){
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey);
+            }else {
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(useOrgSid);
+            }
         } else {
-            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
+            if ("02".equals(search)){
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
+            }else {
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search);
+            }
         }
         List<AppDisAndCustm> appDisAndCustms = new ArrayList<>();
         for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -117,6 +117,9 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setInvoiceApplyState("0");
                 }else if (BaseVehicleStateEnum.OperateTypeEnum.KPSQCH.getTypeKey().equals(operateType)){
                     baseVehicleState.setInvoiceApplyState("0");
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey().equals(operateType)){
+                    //领票申请通过后，修改发票状态为1
+                    baseVehicleState.setInvoiceState("1");
                 }
                 baseMapper.updateById(baseVehicleState);
             } else {

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

@@ -90,6 +90,11 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(@PathVariable("contractNo") String contractNo);
 
+    @ApiOperation("根据合同编号查询金融方案开票价")
+    @GetMapping("/fetchByContractNo2/{contractNo}")
+    @ResponseBody
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(@PathVariable("contractNo") String contractNo);
+
     @ApiOperation("根据sid获取一条数据")
     @GetMapping("/fetchBySid/{sid}")
     @ResponseBody

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

@@ -81,6 +81,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(String contractNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusSalesOrder> fetchBySid(String sid) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -109,13 +109,11 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectByNoAndVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vehSid") String vehSid);
 
-
     @ApiOperation("根据销售订单sid查车辆信息")
     @PostMapping("/selectListByOrderSid")
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSid(@RequestParam("sid") String sid);
 
-
     @ApiOperation("根据车架号模糊查车辆信息")
     @PostMapping("/selectListByvinNo")
     @ResponseBody
@@ -140,4 +138,9 @@ public interface BusSalesOrderVehicleFeign {
     @GetMapping("/selectOneByBorrowerSid")
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
+
+    @ApiOperation("根据销售订单sid和贷款人sid查车辆信息")
+    @PostMapping("/selectListByOrderSidAndDkrSid")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -133,4 +133,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml

@@ -94,8 +94,8 @@
 
     <select id="selectByContractNoAndSid"
             resultType="com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication">
-        select ba.* from bus_bill_application ba
+        select ba.* from anrui_fin.fin_bill_application ba
-        left join bus_bill_vehicle bvv on ba.sid = bvv.billAppSid
+        left join anrui_fin.fin_bill_vehicle bvv on ba.sid = bvv.billAppSid
         where ba.contractNo = #{contractNo} and bvv.vehSid = #{vinSid} order by id desc limit 1
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -302,7 +302,8 @@
             anrui_base.base_vehicle_state
             WHERE
             busState = '401'
-            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))  AND bbv.vehicleState != '0002'
+            AND  (finState = '1' OR carryVehicleState = '1' )) AND bbv.vehicleState != '0002'
+            <!--AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))  AND bbv.vehicleState != '0002'-->
         </where>
         order by bo.contractNo desc,bv.id desc) a
 
@@ -337,7 +338,8 @@
             anrui_base.base_vehicle_state
             WHERE
             busState = '401'
-            AND ((saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))
+            and (finState = '1' OR carryVehicleState = '1' ))
+           <!-- AND ((saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))-->
             AND bbv.vehicleState != '0002'
         </where>
         GROUP BY
@@ -446,7 +448,8 @@
         anrui_base.base_vehicle_state
         WHERE
         busState = '401'
-        AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )) or (saleTypeKey = '2' and invoiceApplyState = '1')))
+        and (finState = '1' OR carryVehicleState = 1 ))
+       <!-- AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )) or (saleTypeKey = '2' and invoiceApplyState = '1')))-->
     </select>
 
     <select id="vinLists2" resultType="com.yxt.anrui.buscenter.api.busdelivered.VinListVo2">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1022,7 +1022,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                         finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
                                         finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
                                         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData();
-                                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                        if (finCompanyInvoicingDetailsVo != null) {
                                             finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                             finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                             finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
@@ -1030,8 +1030,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                             finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
                                         } else {
                                             CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
-                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                            if (crmCustomerTempVo != null){
-                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                            }
                                         }
                                         finVehicleInvoiceDto.setIsTakeTicket("是");
                                         finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@@ -1045,11 +1047,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         }
                     } else {
                         //推送开票申请数据
-                        if("1".equals(busDeliveredApply.getPaymentMethodKey())){//贷款的不再推送开票申请
+                       /* if("1".equals(busDeliveredApply.getPaymentMethodKey())){//贷款的不再推送开票申请
                             Future future1 = pool.submit(() -> {
                                 pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
                             });
-                        }
+                        }*/
+                        Future future1 = pool.submit(() -> {
+                            pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
+                        });
 
                     }
                     //推送优惠包交接数据

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

@@ -222,4 +222,5 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     String selectBySid(String sid);
 
+    String selKpj(String contractNo);
 }

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

@@ -507,15 +507,15 @@
     </select>
 
     <select id="selectBusinessSid" resultType="java.lang.String">
-       <!-- select distinct bo.sid
+        <!-- select distinct bo.sid
-        from bus_sales_order bo
+         from bus_sales_order bo
-        left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
-        left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
+         left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
-        <where>
+         <where>
-            ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
+             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-            and ls.typeKey = '02'
+             and ls.typeKey = '02'
-            and length(bv.linkSid)>0
+             and length(bv.linkSid)>0
-        </where>-->
+         </where>-->
         SELECT DISTINCT
         bo.sid
         FROM
@@ -581,4 +581,12 @@
                      left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
         where bo.sid = #{sid}
     </select>
+
+    <select id="selKpj" resultType="java.lang.String">
+        SELECT ls.mainVehicleAmount
+        FROM bus_sales_order bo
+                     JOIN anrui_riskcenter.`loan_solutions` ls
+                ON bo.sid = ls.`salesOrderSid`
+        WHERE bo.`contractNo` = #{contractNo}
+    </select>
 </mapper>

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

@@ -119,6 +119,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.fetchByContractNo(contractNo);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(String contractNo) {
+        return busSalesOrderService.fetchByContractNo2(contractNo);
+    }
+
     @Override
     public ResultBean<BusSalesOrder> fetchBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -2278,7 +2278,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (busSalesOrder == null) {
                     return rb.setMsg("该销售订单不存在");
                 }
-                if(!busSalesOrder.getPayTypeKey().equals(dto.getPayTypeKey())){
+                if (!busSalesOrder.getPayTypeKey().equals(dto.getPayTypeKey())) {
                     isTrue = true;
                 }
                 BeanUtil.copyProperties(dto, busSalesOrder, "sid");
@@ -5623,7 +5623,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setKxState("01");
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                 //==========================================================
-                if(new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0){//首付款及费用若为0
+                if (new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0) {//首付款及费用若为0
                     //判断认款是否已认完，若已认完，则更新车辆状态为交清。
 
                 }
@@ -5921,7 +5921,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
             baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             for (int i = 0; i < busSalesOrderVehicleDetailsVos.size(); i++) {
-                if(StringUtils.isBlank(list.get(i).getPos())){
+                if (StringUtils.isBlank(list.get(i).getPos())) {
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderVehicleDetailsVos.get(i).getSid());
                     busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                     busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
@@ -5934,8 +5934,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
                     dtoList.add(baseVehicleStateDto);
-                }else{
+                } else {
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectBySidAndOrderBo(dto.getSaleOrderSid(),list.get(i).getPos());
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectBySidAndOrderBo(dto.getSaleOrderSid(), list.get(i).getPos());
                     busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                     busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
                     busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
@@ -6886,6 +6886,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(busSalesOrderIsDTKPJVo);
     }
 
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(String contractNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
+        String kpj = baseMapper.selKpj(contractNo);
+        busSalesOrderIsDTKPJVo.setIsEdit(true);
+        busSalesOrderIsDTKPJVo.setOneBillMoney(kpj);
+        return rb.success().setData(busSalesOrderIsDTKPJVo);
+    }
+
 
     public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
         ResultBean rb = ResultBean.fireFail();
@@ -7330,7 +7339,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<VinListVo2> vinList = new ArrayList<>();
 //        int pos = 0;
         String pos = "";
-        if(borrowSidList.size()>0){
+        if (borrowSidList.size() > 0) {
             for (int j = 0; j < borrowSidList.size(); j++) {
                 VinListVo2 vinListVo2 = new VinListVo2();
                 String borrowSid = borrowSidList.get(j);
@@ -7490,8 +7499,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (list.size() > 0) {
             for (int i = 0; i < vins.size(); i++) {
                 String busVinSid = vins.get(i);
-                BusSalesOrderVehicle busSalesOrderVehicle =busSalesOrderVehicleService.fetchBySid(busVinSid);
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
-                if(StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())){
+                if (StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())) {
                     busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
                     busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
                     busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
@@ -7524,8 +7533,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         String customerSid = busSalesOrder.getCustomerSid();
         LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
-        if(loanPreloanCreditApply != null){
+        if (loanPreloanCreditApply != null) {
-            if(!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())){
+            if (!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())) {
                 return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
             }
         }
@@ -7549,4 +7558,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<SalesLenderVo> lenderVoResultBean = saleOrderInputLender(saleOrderSid);
         return lenderVoResultBean;
     }
+
+
 }

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

@@ -160,4 +160,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusVehicleBorrowVo> saleOrderInputLenderVins(String sale0rderSid);
 
     BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
+
+    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
 }

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

@@ -289,4 +289,12 @@
         select bv.* from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where if(bo.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) = #{pos} and bv.salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectListByOrderSidAndDkrSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        SELECT *
+        FROM bus_sales_order_vehicle
+        WHERE salesOrderSid = #{saleOrderSid}
+          AND borrowerSid = #{borrowerSid}
+    </select>
 </mapper>

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

@@ -148,5 +148,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid);
     }
 
-
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
+        return rb.success().setData(busSalesOrderVehicles);
+    }
 }

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

@@ -615,4 +615,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid(borrowerSid);
         return rb.success().setData(busSalesOrderVehicle);
     }
+
+    public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
+        return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
+    }
 }

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

@@ -73,7 +73,7 @@ public class AppFinCollectionConfirmationDto implements Dto {
 
     @ApiModelProperty("款项明细")
     @Valid
-    private List<AppFinSelectedReceivablesDetailedDto> contractList;
+    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
 
     @ApiModelProperty("申请部门")
     private String createDept;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingBillListVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.fin.api.fincompanyinvoicing;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -21,4 +22,9 @@ public class FinCompanyInvoicingBillListVo implements Vo {
     private String invoBankNum;//开票银行账号
 
     private String openTickRemarks;
+
+    @ApiModelProperty("开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String openTickTypeValue;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -126,6 +126,11 @@ public interface FinCompanyInvoicingFeign {
     @ResponseBody
     List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(@RequestParam("orgSid") String orgSid);
 
+    @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
+    @PostMapping("/qySelByUseOrgSidTwo")
+    @ResponseBody
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(@RequestParam("orgSid") String orgSid);
+
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -120,6 +120,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return null;
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(String orgSid) {
+        return null;
+    }
+
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return null;

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

@@ -85,4 +85,5 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}")
     void updateZZ(String businessSid);
 
+    List<String> getSelectBySid(String businessSid);
 }

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

@@ -128,4 +128,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getSelectBySid" resultType="java.lang.String">
+        select bv.sid from fin_bill_vehicle fv
+        left join fin_bill_application fa on fv.billAppSid = fa.sid
+        left join anrui_buscenter.bus_sales_order bo on bo.contractNo = fa.contractNo
+        left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = fv.vehSid
+        where fa.sid = #{businessSid}
+    </select>
 </mapper>

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

@@ -1933,7 +1933,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             FinBillVehicleDto finBillVehicleDto1 = finBillVehicles.get(0);
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicleDto1.getVehSid()).getData();
             //应收金额
-            BigDecimal unYs = new BigDecimal(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()));
+            BigDecimal unYs = new BigDecimal("0");
+            if (StringUtils.isNotBlank(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()))){
+                unYs = new BigDecimal(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()));
+            }
             List<String> ysSids = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid());
             //已收金额
             BigDecimal seYs = new BigDecimal("0");
@@ -2461,7 +2464,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         flowProcessMapQuery.setProDefKey(bv.getModelId());
         flowProcessMapQuery.setVariables(variables);
         flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
-        variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+        flowProcessMapQuery.setIsLP(finBillApplication.getIsLQOrigInvoice());
+        variables = flowableFeign.getMapQKKP(flowProcessMapQuery).getData();
         bv.setFormVariables(variables);
         //=======================================
         if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())) {
@@ -3452,7 +3456,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/"));
             SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
             String nextNodeUserSids_ = sysOrganization.getManagerSid();
-            bv.setNextNodeUserSids(nextNodeUserSids_);
+            if(StringUtils.isBlank(nextNodeUserSids_)){//若主管人员为空，则默认为管理员
+                bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+            }else{
+                bv.setNextNodeUserSids(nextNodeUserSids_);
+            }
+
         }
         //=======================================
         if (r == 1) {
@@ -3525,7 +3534,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
             SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
             String nextNodeUserSids_ = sysOrganization.getManagerSid();
-            bv.setNextNodeUserSids(nextNodeUserSids_);
+            if(StringUtils.isBlank(nextNodeUserSids_)){
+                bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+            }else{
+                bv.setNextNodeUserSids(nextNodeUserSids_);
+            }
+
         }
         //=======================================
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
@@ -3698,6 +3712,32 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //极光推送
             UpdateFlowFieldVo ufVo = resultBean1.getData();
             finBillApplication = fetchBySid(bv.getBusinessSid());
+            //============================================================================修改车辆的持久状态组装数据
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                Future future1 = pool.submit(() -> {
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    List<String> vehicleList = baseMapper.getSelectBySid(bv.getBusinessSid());
+//                    List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
+                    vehicleList.removeAll(Collections.singleton(null));
+                    if (!vehicleList.isEmpty()) {
+                        vehicleList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey());
+                            baseVehicleStateDto.setBusSid(v);
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //============================================================================
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                         .setNameFormat("demo-pool-%d").build();

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

@@ -1020,6 +1020,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             return rb.setMsg("该申请不存在");
         }
         List<AppFinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getContractList();
+        if(finSelectedReceivablesDetailedDtos.isEmpty()){
+            return rb.setMsg("请添加认款信息");
+        }
         //认款金额相加
         BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AppFinSelectedReceivablesDetailedDto::getConfirmMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
         //判断收款金额与所选的总认款金额是否相等

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -65,13 +65,16 @@
         address AS registDetailAddress,
         phone AS invoPhone,
         bankName AS invoBank,
-        bankAccount AS invoBankNum
+        bankAccount AS invoBankNum,
+        invoiceType AS openTickTypeValue,
+        invoiceTypeKey AS openTickTypeKey
         FROM
         fin_company_invoicing
         <where>
             ${ew.sqlSegment}
+            AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
         </where>
-        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
+
     </select>
 
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -151,6 +151,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         return finCompanyInvoicingService.qySelByUseOrgSid(orgSid);
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(String orgSid) {
+        return finCompanyInvoicingService.qySelByUseOrgSidTwo(orgSid);
+    }
+
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
@@ -58,6 +59,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -210,11 +212,13 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         FinCompanyInvoicing entity = fetchBySid(sid);
         FinCompanyInvoicingDetailsVo vo = new FinCompanyInvoicingDetailsVo();
         BeanUtil.copyProperties(entity, vo);
-        if (StringUtils.isNotBlank(entity.getInvoiceType())) {
+        if (entity != null){
-            vo.setOpenTickTypeValue(entity.getInvoiceType());
+            if (StringUtils.isNotBlank(entity.getInvoiceType())) {
-        }
+                vo.setOpenTickTypeValue(entity.getInvoiceType());
-        if (StringUtils.isNotBlank(entity.getInvoiceTypeKey())) {
+            }
-            vo.setOpenTickTypeKey(entity.getInvoiceTypeKey());
+            if (StringUtils.isNotBlank(entity.getInvoiceTypeKey())) {
+                vo.setOpenTickTypeKey(entity.getInvoiceTypeKey());
+            }
         }
         List<String> fileList = new ArrayList<>();
         List<FinBillFileVo> clmmhtApplicationAppendxs = finBillFileService.fetchcyyzzBySid(sid);
@@ -441,6 +445,16 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
     }
 
     public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(String orgSid) {
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", orgSid);
+        qw.eq("isDelete", 0);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
+        return finCompanyInvoicingBillListVos;
+    }
+
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(String orgSid) {
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", orgSid);
         qw.eq("isDelete", 0);
@@ -452,7 +466,9 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.eq("openTickTypeKey",invoiceKey);
+        qw.eq("invoiceTypeKey",invoiceKey);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -461,8 +477,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.eq("openTickTypeKey",invoiceKey);
+        qw.eq("invoiceTypeKey",invoiceKey);
         qw.like("name", search);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -472,6 +490,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
         qw.like("name", search);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcessMapQuery.java

@@ -19,4 +19,7 @@ public class FlowProcessMapQuery {
     private Map<String, Object> variables;
     @ApiModelProperty("流程id")
     private String proDefKey;
+
+    @ApiModelProperty("是否领票（欠款开票使用）")
+    private String isLP;
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java

@@ -106,5 +106,10 @@ public class FlowableFallback implements FlowableFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Map<String, Object>> getMapQKKP(FlowProcessMapQuery query) {
+        return null;
+    }
+
 
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@@ -151,4 +151,9 @@ public interface FlowableFeign {
     @PostMapping(value = "/getMap")
     @ResponseBody
     ResultBean<Map<String,Object>> getMap(@RequestBody FlowProcessMapQuery query);
+
+    @ApiOperation(value = "获取map")
+    @PostMapping(value = "/getMapQKKP")
+    @ResponseBody
+    ResultBean<Map<String,Object>> getMapQKKP(@RequestBody FlowProcessMapQuery query);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -963,4 +963,19 @@ public class FlowableRest implements FlowableFeign {
         variables.put("orderNames", orderNames);
         return rb.success().setData(variables);
     }
+
+    @Override
+    public ResultBean<Map<String, Object>> getMapQKKP(FlowProcessMapQuery query) {
+        ResultBean<Map<String, Object>> rb = ResultBean.fireFail();
+        Map<String, Object> variables = query.getVariables();
+        String contractNo = query.getContractNo();
+        String orderNames = "";
+        if ("是".equals(query.getIsLP())){
+            orderNames = contractNo + "欠款开票及领手续申请";
+        }else {
+            orderNames = contractNo + "欠款开票申请";
+        }
+        variables.put("orderNames", orderNames);
+        return rb.success().setData(variables);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -232,7 +232,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
     public ResultBean saveLoanCon(String sid, String conSetUpKey) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitPrepVo loanHomevisitPrepVo = baseMapper.selectDetails(sid);
-        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(),loanHomevisitPrepVo.getBorrowerSid()).getData();
         if (conSetUpKey.equals("001")) {//一车一合同
             int i = 1;
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {

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

@@ -33,6 +33,10 @@ public class AdvanceInvoiceDto implements Dto {
     private String invoicingUnit;
     @ApiModelProperty("是否领取原件")
     private String getOriginalValue;
+    @ApiModelProperty("开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String openTickTypeValue;
     @ApiModelProperty("默认开票sid")
     private String openTickSid;
     @ApiModelProperty("默认开票名称")

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

@@ -32,6 +32,8 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String name;
     @ApiModelProperty("开票单位")
     private String invoicingUnit;
+    @ApiModelProperty("是否领取原件key")
+    private String getOriginalKey;
     @ApiModelProperty("是否领取原件")
     private String getOriginalValue;
     @ApiModelProperty("默认开票类型key")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordInitVo.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.terminal.api.risk.loancustomerrecord;
+
+import com.yxt.anrui.terminal.api.autoservice.distributor.apply.Salesman;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/10/13 9:27
+ */
+@Data
+public class CustomerRecordInitVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("申请人")
+    private String applyName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String dept;
+    @ApiModelProperty("销售部门sid")
+    private String salesDeptSid;
+    @ApiModelProperty("销售部门")
+    private String salesDept;
+    @ApiModelProperty("主管人员sid")
+    private String mangeSid;
+    @ApiModelProperty("主管人员")
+    private String mange;
+    @ApiModelProperty("销售专员sid")
+    private String salesmanSid;
+    @ApiModelProperty("销售专员")
+    private String salesman;
+    @ApiModelProperty("备注")
+    private String remarks;
+    private String tempMangeSid;
+    private String tempMange;
+    private String taskId;
+    private String procInsId;
+    private List<Salesman> users = new ArrayList<>();
+
+
+}

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

@@ -214,6 +214,11 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
         vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
+        if ("是".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+            vo.setGetOriginalKey("1");
+        }else if ("否".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+            vo.setGetOriginalKey("0");
+        }
         vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
@@ -509,6 +514,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setBillNo(dto.getBillNo());
         finBillApplicationDto.setModelSid(dto.getModelSid());
         finBillApplicationDto.setModelName(dto.getModelName());
+        finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
+        finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue());
         String publishInfo = dto.getPublishInfo();
         String[] split = publishInfo.split("-");
         finBillApplicationDto.setDeptName(split[0]);