From afcbb9434cf32adb889ff2e04f8ee3d1c03694e8 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 22 Sep 2023 14:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/busbillfile/BusAttachTypeEnum.java    |   3 +-
 .../BusValcustFilingDetailsVo.java            |   7 +-
 .../busvalcustfiling/BusValcustFilingDto.java |  38 ++--
 .../BusValcustFilingService.java              |  27 +++
 .../FinBillApplicationService.java            | 213 +++++++++---------
 .../anrui/flowable/api/utils/ProcDefEnum.java |   2 +-
 .../LoanHomevisitInvestigateService.java      |  16 +-
 .../AppBusDeliveredApplyFeignFallback.java    |  12 +
 8 files changed, 183 insertions(+), 135 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
index 67373e378e..a3a016e5a0 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
@@ -13,7 +13,8 @@ public enum BusAttachTypeEnum {
     ZJ("004", "证件"),
     FJ("005", "附件"),
     QKLPFJ("006", "欠款领票附件"),
-    CLMMHT("007", "车辆买卖合同");
+    CLMMHT("007", "车辆买卖合同"),
+    JZKHBA("008", "价值客户备案");
 
     /**
      * 附件类型
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java
index c137a214e5..2f4b8afc47 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(价值客户备案申请) <br/>
  * File: BusValcustFilingVo.java <br/>
@@ -51,6 +53,8 @@ public class BusValcustFilingDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("申请编号")
@@ -89,5 +93,6 @@ public class BusValcustFilingDetailsVo implements Vo {
     private String procInstId; // 流程实例id
 	@ApiModelProperty("组织机构全路径sid")
     private String orgSidPath; // 组织机构全路径sid
-
+    @ApiModelProperty("附件")
+    private List<String> fjImages;
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
index 00b373362d..c2fdc3784a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
@@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(价值客户备案申请) <br/>
  * File: BusValcustFilingDto.java <br/>
@@ -51,38 +54,40 @@ public class BusValcustFilingDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("创建人sid")
     private String createBySid;
 	@ApiModelProperty("创建人姓名")
-    private String createByName; // 创建人姓名
+    private String createByName;
 	@ApiModelProperty("申请编号")
-    private String billNo; // 申请编号
+    private String billNo;
 	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
 	@ApiModelProperty("分公司名称")
-    private String useOrgName; // 分公司名称
+    private String useOrgName;
 	@ApiModelProperty("申请部门sid")
-    private String applyDeptSid; // 申请部门sid
+    private String applyDeptSid;
 	@ApiModelProperty("申请部门名称")
-    private String applyDeptName; // 申请部门名称
+    private String applyDeptName;
 	@ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
+    private String contractNo;
 	@ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
+    private String modelSid;
 	@ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
+    private String modelName;
 	@ApiModelProperty("车辆sid")
-    private String vinSid; // 车辆sid
+    private String vinSid;
 	@ApiModelProperty("车架号")
-    private String vinNo; // 车架号
+    private String vinNo;
     @ApiModelProperty("0高开，1低开")
     private String isGdk;
 	@ApiModelProperty("加装配置/销售让利金额")
-    private String money; // 加装配置/销售让利金额
+    private String money;
 	@ApiModelProperty("应收手续费")
-    private String ysMoney; // 应收手续费
+    private String ysMoney;
 	@ApiModelProperty("实收手续费")
-    private String ssMoney; // 实收手续费
+    private String ssMoney;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
     @ApiModelProperty("业务sid")
@@ -90,6 +95,7 @@ public class BusValcustFilingDto implements Dto {
     @ApiModelProperty("业务来源")
     private String busSource;
 	@ApiModelProperty("组织机构全路径sid")
-    private String orgSidPath; // 组织机构全路径sid
-
+    private String orgSidPath;
+    @ApiModelProperty("附件")
+    private List<String> fjImages = new ArrayList<>();
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
index 2d24fb9eec..f68bc9ee4a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
@@ -37,6 +37,9 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
+import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
+import com.yxt.anrui.buscenter.api.busfile.BusFile;
+import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@@ -45,6 +48,7 @@ import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNod
 import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery;
 import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.SubmitBusValcustFilingDto;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
+import com.yxt.anrui.buscenter.biz.busfile.BusFileService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
@@ -79,6 +83,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.SubmitLoanCreditApplyDto;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
@@ -152,6 +157,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
     private BusSalesOrderVehicleService busSalesOrderVehicleService;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private BusFileService busFileService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public PagerVo<BusValcustFilingVo> listPageVo(PagerQuery<BusValcustFilingQuery> pq) {
         BusValcustFilingQuery query = pq.getParams();
@@ -219,6 +228,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
     public ResultBean<String> saveOrUpdateDto(BusValcustFilingDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        List<String> fjImages = dto.getFjImages();
         if (StringUtils.isBlank(dtoSid)) {
             //生成单据编号
             String billNo = "";
@@ -233,6 +243,16 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
             }
             dto.setBillNo(billNo);
             String sid = this.insertByDto(dto);
+            for (String fjImage : fjImages) {
+                BusFile busFile = new BusFile();
+                if (fjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    fjImage = fjImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                busFile.setFilePath(fjImage);
+                busFile.setLinkSid(sid);
+                busFile.setAttachType(BusAttachTypeEnum.JZKHBA.getAttachType());
+                busFileService.save(busFile);
+            }
             return rb.success().setData(sid);
         }
         this.updateByDto(dto);
@@ -261,6 +281,13 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         BusValcustFiling entity = fetchBySid(sid);
         BusValcustFilingDetailsVo vo = new BusValcustFilingDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
+        List<String> fjImages = new ArrayList<>();
+        for (BusFileDto busFileDto : busFileDtos) {
+            String filePath = fileUploadComponent.getUrlPrefix() + busFileDto.getFilePath();
+            fjImages.add(filePath);
+        }
+        vo.setFjImages(fjImages);
         return vo;
     }
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 68e4afe5eb..ef6b8ee359 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -276,7 +276,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             query.setUseOrgSid(useOrgSid);
         }
         //========================================数据授权开始
-        if(StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())){
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
@@ -284,7 +284,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             privilegeQuery.setMenuSid(query.getMenuSid());
             privilegeQuery.setUserSid(query.getCreateBySid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
                 //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
                 String orgSidPath = query.getOrgPath();
                 orgSidPath = orgSidPath + "/";
@@ -305,17 +305,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 } else if ("4".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i4);
                     qw.like("fba.orgSidPath", orgSidPath);
-                } else if("5".equals(orgLevelKey)){
-                    qw.eq("fba.createBySid",query.getCreateBySid());
-                }else{
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("fba.createBySid", query.getCreateBySid());
+                } else {
                     PagerVo<FinBillApplicationVo> p = new PagerVo<>();
                     return p;
                 }
-            }else{
+            } else {
                 PagerVo<FinBillApplicationVo> p = new PagerVo<>();
                 return p;
             }
-        }else {
+        } else {
             qw.eq("fba.useOrgSid", query.getUseOrgSid());
             qw.eq("fba.createBySid", query.getCreateBySid());
         }
@@ -374,12 +374,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
             String contractNo = record.getContractNo();
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-            if (busSalesOrder != null){
+            if (busSalesOrder != null) {
                 record.setOrderSid(busSalesOrder.getSid());
             }
-            if (record.getCreateBySid().equals(query.getCreateBySid())){
+            if (record.getCreateBySid().equals(query.getCreateBySid())) {
                 record.setIsCZ(true);
-            }else {
+            } else {
                 record.setIsCZ(false);
             }
         }
@@ -730,7 +730,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         String contractNo = finBillApplication.getContractNo();
         //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
         //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
@@ -739,9 +739,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
-        if (StringUtils.isBlank(finBillApplication.getProcDefId())){
+        if (StringUtils.isBlank(finBillApplication.getProcDefId())) {
             flowProcessMapQuery.setProDefKey(bv.getModelId());
-        }else {
+        } else {
             flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
         }
         flowProcessMapQuery.setVariables(variables);
@@ -797,36 +797,78 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     busValcustFilingDto.setBusSid("0");
                     busValcustFilingFeign.save(busValcustFilingDto);
                 }else {*///不是高低开
-                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
-                        int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
+                    if (count == 0) {
+                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                        finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                        finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                        finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                        finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
+                        finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
+                        finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
+                        finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
+                        finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                        finVehicleInvoiceDto.setBillingStateKey("001");
+                        finVehicleInvoiceDto.setBillingState("未开票");
+                        finVehicleInvoiceDto.setTransferStateKey("001");
+                        finVehicleInvoiceDto.setTransferState("未移交");
+                        finVehicleInvoiceDto.setVehicleType("主车");
+                        finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                        finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                        finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                        if (busArrearsCarryVehicleApplyVo == null) {
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        } else {
+                            finVehicleInvoiceDto.setBusinessStateKey("005");
+                            finVehicleInvoiceDto.setBusinessState("欠款提车");
+                        }
+                        finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                        } else {
+                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                        }
+                        finVehicleInvoiceDto.setIsTakeTicket("是");
+                        finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                    }
+                }
+                if (finBillTrailerVos != null) {
+                    for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                        String gcVinNo = finBillTrailerVo.getGcVinNo();
+                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                        int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
                         if (count == 0) {
                             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                             finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                             finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
                             finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-                            finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
-                            finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
-                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
-                            finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
-                            finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                            finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
+                            finVehicleInvoiceDto.setVIN(gcVinNo);
+                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
+                            finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
+                            finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
                             finVehicleInvoiceDto.setBillingStateKey("001");
                             finVehicleInvoiceDto.setBillingState("未开票");
                             finVehicleInvoiceDto.setTransferStateKey("001");
                             finVehicleInvoiceDto.setTransferState("未移交");
-                            finVehicleInvoiceDto.setVehicleType("主车");
+                            finVehicleInvoiceDto.setVehicleType("挂车");
                             finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
-                            finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                            finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
                             finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                            BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
-                            if (busArrearsCarryVehicleApplyVo == null){
-                                finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                                finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                            }else {
-                                finVehicleInvoiceDto.setBusinessStateKey("005");
-                                finVehicleInvoiceDto.setBusinessState("欠款提车");
-                            }
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                             finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
                             if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
                                 finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                 finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
@@ -834,7 +876,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                 finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
                             } else {
-                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
                                 finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
                                 finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
                             }
@@ -842,53 +884,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                         }
                     }
-                    if (finBillTrailerVos != null) {
-                        for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
-                            String gcVinNo = finBillTrailerVo.getGcVinNo();
-                            BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
-                            int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
-                            if (count == 0) {
-                                FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
-                                finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
-                                finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
-                                finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-                                finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
-                                finVehicleInvoiceDto.setVIN(gcVinNo);
-                                finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
-                                finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
-                                finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
-                                finVehicleInvoiceDto.setBillingStateKey("001");
-                                finVehicleInvoiceDto.setBillingState("未开票");
-                                finVehicleInvoiceDto.setTransferStateKey("001");
-                                finVehicleInvoiceDto.setTransferState("未移交");
-                                finVehicleInvoiceDto.setVehicleType("挂车");
-                                finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
-                                finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
-                                finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                                finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                                finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                                finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
-                                if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
-                                    finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                                    finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                                    finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                                    finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
-                                    finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                } else {
-                                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
-                                    finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                    finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
-                                }
-                                finVehicleInvoiceDto.setIsTakeTicket("是");
-                                finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
-                            }
-                        }
-                    }
-                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                    if (oneBillMoney == null) {
-                        busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                    }
+                }
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
+                }
                 //}
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -961,15 +961,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> variables = new HashMap<>();
         //查询业务信息
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
-        if ("003".equals(finBillApplication.getBillStateKey())) {
-            bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
-        } else {
-            bv.setModelId(finBillApplication.getProcDefId());
-        }
+        bv.setModelId(finBillApplication.getProcDefId());
         String contractNo = finBillApplication.getContractNo();
         //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
         //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
@@ -998,15 +994,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> variables = new HashMap<>();
         //查询业务信息
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
-        if ("003".equals(finBillApplication.getBillStateKey())) {
-            bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
-        } else {
-            bv.setModelId(finBillApplication.getProcDefId());
-        }
+        bv.setModelId(finBillApplication.getProcDefId());
         String contractNo = finBillApplication.getContractNo();
         //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
         //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
@@ -1052,7 +1044,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 String contractNo = finBillApplication.getContractNo();
                 //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-                variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+                variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
                 //判断是否是高低开，若是，则isAdj网关参数为true=============添加
                 BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
                 if (data != null) {
@@ -1151,7 +1143,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
         String businessTaskId = finBillApplication.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if(query.getUserSid().equals(finBillApplication.getCreateBySid())){
+            if (query.getUserSid().equals(finBillApplication.getCreateBySid())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -1162,7 +1154,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 updateFlowFiled(map);
                 finBillVehicleService.updateByMainSid(finBillApplication.getSid());
                 return rb.success().setData(resultBean.getData());
-            }else{
+            } else {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -2097,7 +2089,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicle.getVehSid()).getData();
             BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData();
-            if (baseVehicleState == null){
+            if (baseVehicleState == null) {
                 return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择");
             }
         }
@@ -2232,14 +2224,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        bv.setModelId(finBillApplication.getProcDefId());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
-        if (StringUtils.isBlank(finBillApplication.getProcDefId())){
+        if (StringUtils.isBlank(finBillApplication.getProcDefId())) {
             flowProcessMapQuery.setProDefKey(bv.getModelId());
-        }else {
+        } else {
             flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
         }
         flowProcessMapQuery.setVariables(variables);
@@ -2278,10 +2271,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                         finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
                         BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
-                        if (busArrearsCarryVehicleApplyVo == null){
+                        if (busArrearsCarryVehicleApplyVo == null) {
                             finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                             finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                        }else {
+                        } else {
                             finVehicleInvoiceDto.setBusinessStateKey("005");
                             finVehicleInvoiceDto.setBusinessState("欠款提车");
                         }
@@ -2401,6 +2394,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        bv.setModelId(finBillApplication.getProcDefId());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         //========================================
@@ -2529,7 +2523,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> variables = new HashMap<>();
         //查询业务信息
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
-        bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
+        bv.setModelId(finBillApplication.getProcDefId());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         //========================================
@@ -2555,7 +2549,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> variables = new HashMap<>();
         //查询业务信息
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
-        bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
+        bv.setModelId(finBillApplication.getProcDefId());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         //========================================
@@ -2689,7 +2683,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
         String businessTaskId = finBillApplication.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if(query.getUserSid().equals(finBillApplication.getCreateBySid())){
+            if (query.getUserSid().equals(finBillApplication.getCreateBySid())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -2713,7 +2707,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 return rb.success().setData(resultBean.getData());
-            }else{
+            } else {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -2888,6 +2882,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return resultBean;
         }
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        bv.setModelId(finBillApplication.getProcDefId());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         //========================================
@@ -2990,7 +2985,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
             finBillApplicationDetailsVo.setSaleDeptName(deptName);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(query.getContractNo()).getData();
-            if (busSalesOrder != null){
+            if (busSalesOrder != null) {
                 finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
                 finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());
             }
@@ -3536,7 +3531,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         String contractNo = finBillApplication.getContractNo();
         //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
         //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
@@ -3646,10 +3641,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                         finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
                         BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
-                        if (busArrearsCarryVehicleApplyVo == null){
+                        if (busArrearsCarryVehicleApplyVo == null) {
                             finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                             finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                        }else {
+                        } else {
                             finVehicleInvoiceDto.setBusinessStateKey("005");
                             finVehicleInvoiceDto.setBusinessState("欠款提车");
                         }
@@ -3756,7 +3751,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<String> photoList = new ArrayList<>();
         List<String> imgList = new ArrayList<>();
         FinBillApplication finBillApplication = fetchBySid(sid);
-        if (!"已办结".equals(finBillApplication.getNodeState())){
+        if (!"已办结".equals(finBillApplication.getNodeState())) {
             return rb.setMsg("该申请尚未办结，无法下载");
         }
         Map<String, Object> dataMap = new HashMap();
@@ -3861,7 +3856,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
         List<FinBillApplicationGcListVo> finBillApplicationGcListVos = new ArrayList<>();
         int gcId = 1;
-        if (!finBillTrailerVos.isEmpty()){
+        if (!finBillTrailerVos.isEmpty()) {
             for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
                 FinBillApplicationGcListVo finBillApplicationGcListVo = new FinBillApplicationGcListVo();
                 finBillApplicationGcListVo.setIdgc(gcId);
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 22ff496366..0109c2534f 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -15,7 +15,7 @@ public enum ProcDefEnum {
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
     FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:4:4505004"),
-    QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"),
+    QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:2:5100004"),
     QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
index 4541e0e576..fef89d2e0e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
@@ -459,13 +459,15 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
         }
         //证明文件-配偶
-        if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) {
-            if (posfzImages == null || posfzImages.size() == 0) {
-                loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
-            } else if (pohkbImages == null || pohkbImages.size() == 0) {
-                loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
-            } else {
-                loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
+        if (loanHomevisitInvestigateCustomerDetailsVo != null){
+            if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) {
+                if (posfzImages == null || posfzImages.size() == 0) {
+                    loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+                } else if (pohkbImages == null || pohkbImages.size() == 0) {
+                    loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+                } else {
+                    loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
+                }
             }
         }
         //资产类
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
index a2355f5481..76e0e25f35 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery;
@@ -78,11 +80,21 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
         return null;
     }
 
+    @Override
+    public ResultBean<BillApplicationIInfoVo> getInvoicedApply(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
         return null;
     }
 
+    @Override
+    public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto billApplicationIInfoDto) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
         return null;