Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -2238,7 +2238,13 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                                             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid);
                                             if (null != busSalesOrderVehicle) {
                                                 if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                                    mortagageDto.setVinNo(busSalesOrderVehicle.getLinkNo());
+                                                    String linkNo = busSalesOrderVehicle.getLinkNo();
+                                                    if (linkNo.length() > 8) {
+                                                        String substringLinkNo = linkNo.substring(linkNo.length() - 8);
+                                                        mortagageDto.setVinNo(substringLinkNo);
+                                                    } else {
+                                                        mortagageDto.setVinNo(linkNo);
+                                                    }
                                                 }
                                                 if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) {
                                                     mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid());

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

@@ -100,6 +100,12 @@ public interface FinCompanyInvoicingFeign {
     @ResponseBody
     ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(@RequestParam("taxpayerNo") String taxpayerNo);
 
+    @ApiOperation("根据纳税人识别号以及组织sid查询开票信息")
+    @GetMapping("/selByTaxpayerNoAndUseOrgSid")
+    @ResponseBody
+    ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(@RequestParam("taxpayerNo") String taxpayerNo, @RequestParam("useOrgSid") String useOrgSid);
+
+
     @ApiOperation("根据组织全路径查询开票信息")
     @GetMapping("/selectInvoingByOrgPath")
     @ResponseBody
@@ -134,7 +140,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qySelByUseOrgSid3")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid, @RequestParam("invoiceKey") String invoiceKey);
 
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid")
@@ -144,7 +150,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSidTwo")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam(value = "invoiceKey", required = false) String invoiceKey);
 
     @ApiOperation("企业开票信息管理移动端维护初始化")
     @GetMapping("/qyAppFetchDetailsBySid/{sid}")
@@ -159,10 +165,10 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qySelByUseOrgSid2")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("invoiceKey") String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("invoiceKey") String invoiceKey);
 
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid2")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search,@RequestParam("invoiceKey") String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam("invoiceKey") String invoiceKey);
 }

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

@@ -95,6 +95,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return null;
     }
 
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<FinCompanyInvoicingDetailsVo>> selectInvoingByOrgPath(String orgPath) {
         return null;

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

@@ -103,6 +103,8 @@ import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
 import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
 import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService;
 import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@@ -198,6 +200,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private LoanDiffFeign loanDiffFeign;
     @Autowired
     private OtherReceivableBillCreditResultService creditResultService;
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1831,6 +1835,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1841,6 +1846,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1851,6 +1857,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1861,6 +1868,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
                                 }
@@ -1938,6 +1946,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1948,6 +1957,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1958,6 +1968,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1970,6 +1981,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
                                 creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                                creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             creditResult.setResultDetails(collectionDetailDtoListOne);

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

@@ -83,4 +83,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 
     @Select("select * from fin_company_invoicing where useOrgSid = #{userOrgSid} and isDelete = 0")
     List<FinCompanyInvoicingDetailsVo> selectInvoingByOrgPath(String userOrgSid);
+
+    FinCompanyInvoicingDetailsVo selByTaxpayerNoAndUseOrgSid(@Param("taxpayerNo") String taxpayerNo, @Param("useOrgSid") String useOrgSid);
 }

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

@@ -97,6 +97,27 @@
         where taxpayerNo = #{taxpayerNo}
           and isDelete = 0
     </select>
+    <select id="selByTaxpayerNoAndUseOrgSid"
+            resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
+        select sid,
+               bankAccount,
+               bankName,
+               `name`,
+               taxpayerNo,
+               address,
+               phone,
+               useOrgSid,
+               useOrgName,
+               purchaseSystemSid,
+               orgSidPath,
+               createBySid,
+               invoiceType    as openTickTypeValue,
+               invoiceTypeKey as openTickTypeKey
+        from fin_company_invoicing
+        where taxpayerNo = #{taxpayerNo}
+          and useOrgSid = #{useOrgSid}
+          and isDelete = 0
+    </select>
 
 
 </mapper>

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

@@ -122,6 +122,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo);
     }
 
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
+        return finCompanyInvoicingService.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
+    }
+
     @Override
     public ResultBean<List<FinCompanyInvoicingDetailsVo>> selectInvoingByOrgPath(String orgPath) {
         return finCompanyInvoicingService.selectInvoingByOrgPath(orgPath);

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

@@ -557,4 +557,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
+
+    public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
+        ResultBean<FinCompanyInvoicingDetailsVo> rb = ResultBean.fireFail();
+        FinCompanyInvoicingDetailsVo vo = baseMapper.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
+        return rb.success().setData(vo);
+    }
 }

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

@@ -684,9 +684,11 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
                                 String createBySid = "";
                                 String openTicketType = "";
                                 String openTicketTypeKey = "";
+                                String useOrgSid = "";
                                 if (StringUtils.isNotBlank(entity.getTaxpayerNo())) {
                                     taxpayerNo = entity.getTaxpayerNo();
-                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
+                                    useOrgSid = entity.getUseOrgSid();
+                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid).getData();
                                     if (null != data) {
                                         BeanUtil.copyProperties(data, invoicingDto);
                                         invoicingSid = data.getSid();
@@ -748,9 +750,11 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
                                 String createBySid = "";
                                 String openTicketType = "";
                                 String openTicketTypeKey = "";
+                                String useOrgSid = "";
                                 if (StringUtils.isNotBlank(entity.getIdNumber())) {
                                     taxpayerNo = entity.getIdNumber();
-                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
+                                    useOrgSid = entity.getUseOrgSid();
+                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid).getData();
                                     if (null != data) {
                                         BeanUtil.copyProperties(data, invoicingDto);
                                         invoicingSid = data.getSid();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@@ -342,6 +342,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -352,6 +353,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -362,6 +364,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -372,6 +375,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -382,6 +386,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -398,25 +398,25 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (loanHomevisitInvestigateCustomerDetailsVo == null) {
             loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
         } else {
-            if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())){
+            if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())) {
                 loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
-            }else {
+            } else {
                 loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
             }
             //其他补充信息状态
-            if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+            if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
                 loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
-            }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
-                if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())){
+            } else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
+                if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())) {
                     loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
-                }else {
+                } else {
                     loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
                 }
-            }else {
+            } else {
                 loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
             }
             //合同路径
-            if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl())){
+            if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl())) {
                 loanHomeVisitInvestigateInitReportStateVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + loanHomevisitInvestigateCustomerDetailsVo.getContractUrl());
             }
         }
@@ -536,6 +536,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //资产类
         if (yhkImages == null || yhkImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
+        } else if (fcImages == null || fcImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
         } else {
             loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(1);
         }
@@ -549,10 +551,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo();
             String saleOrderBorrowerSid = "";
             LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
-            if (loanHomevisitInvestigate == null){
+            if (loanHomevisitInvestigate == null) {
                 LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(sid);
                 saleOrderBorrowerSid = loanHomevisitPrep.getSaleOrderBorrowerSid();
-            }else {
+            } else {
                 saleOrderBorrowerSid = loanHomevisitInvestigate.getSaleOrderBorrowerSid();
             }
             BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(saleOrderBorrowerSid).getData();
@@ -583,6 +585,20 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
         ResultBean rb = ResultBean.fireFail();
         List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = dto.getOtherPersonnel();
+        if (!dto.getActualBuyer()) {
+            Boolean isExistSjgcr = false;
+            if (otherPersonnel != null && otherPersonnel.size() > 0) {
+                for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
+                    if ("3".equals(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelKey())) {
+                        isExistSjgcr = true;
+                        break;
+                    }
+                }
+            }
+            if (!isExistSjgcr) {
+                return rb.setMsg("贷款人和其他人员中必须存在实际购车人");
+            }
+        }
         List<String> bankCardImages = dto.getBankCardImages();
         LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto();
         LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid());
@@ -1014,9 +1030,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
-        if (loanHomeVisitInvestigateInitOtherPeoVos != null &&  loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){
+        if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
             for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
-                if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())){
+                if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())) {
                     //担保人身份证
                     List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
                     List<String> pohkbImage = new ArrayList<>();
@@ -1451,12 +1467,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 financeForm25.setValue("关系：" + loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue());
                 userInfo.add(financeForm25);
             }
-            if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+            if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
                 FinanceForm financeForm60 = new FinanceForm();
                 financeForm60.setValue("车辆登记在：客户下");
                 financeForm60.setSpanSize(2);
                 otherInfo.add(financeForm60);
-            }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+            } else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
                 FinanceForm financeForm61 = new FinanceForm();
                 financeForm61.setValue("车辆登记在：挂靠公司下");
                 financeForm61.setSpanSize(2);
@@ -1467,12 +1483,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 financeForm62.setType(1);
                 financeForm62.setBold(true);
                 otherInfo.add(financeForm62);
-                if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())){
+                if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())) {
                     FinanceForm financeForm63 = new FinanceForm();
                     financeForm63.setValue("挂靠公司是否担保：是");
                     financeForm63.setSpanSize(2);
                     otherInfo.add(financeForm63);
-                }else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())){
+                } else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())) {
                     FinanceForm financeForm64 = new FinanceForm();
                     financeForm64.setValue("挂靠公司是否担保：否");
                     financeForm64.setSpanSize(2);
@@ -1836,7 +1852,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     }
 
     public void updateState(String sid, String state) {
-        baseMapper.updateState(sid,state);
+        baseMapper.updateState(sid, state);
     }
 
     public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -186,9 +186,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     }
                     // 主产品首期月还
                     if (null != schedule.getMainFirstRepay()) {
-
                         vo.setMainFirstRepay(schedule.getMainFirstRepay().toString());
-
                     }
                     // 主产品期间月还
                     if (null != schedule.getMainMidRepay()) {
@@ -405,6 +403,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -428,7 +432,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("0");
@@ -467,7 +471,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     otherDto.setUseOrgName(useOrgName);
                                     otherDto.setOrgSidPath(orgSidPath);
                                     otherDto.setBusVinSid(busVinSid);
-                                    otherDto.setVinNo(linkNo);
+                                    otherDto.setVinNo(vinNo);
                                     otherDto.setSalesUserSid(staffSid);
                                     otherDto.setStaffName(staffName);
                                     otherDto.setPolicyOrOther("1");
@@ -559,6 +563,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -582,7 +592,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("1");
@@ -642,7 +652,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             if (!busSalesOrderVehicles.isEmpty()) {
                 List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
                 if (!stringVinNos.isEmpty()) {
-                    entity.setVinNo(String.join(",", stringVinNos));
+                    List<String> vinList = new ArrayList<>();
+                    for (String linkNo : stringVinNos) {
+                        String vinNo = "";
+                        if (linkNo.length() > 8) {
+                            vinNo = linkNo.substring(linkNo.length() - 8);
+
+                        } else {
+                            vinNo = linkNo;
+                        }
+                        vinList.add(vinNo);
+                    }
+                    entity.setVinNo(String.join(",", vinList));
                 }
             }
             BusSalesOrderLoancontractDetailsVo loancontractVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData();
@@ -751,6 +772,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -774,7 +801,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("0");
@@ -813,7 +840,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     otherDto.setUseOrgName(useOrgName);
                                     otherDto.setOrgSidPath(orgSidPath);
                                     otherDto.setBusVinSid(busVinSid);
-                                    otherDto.setVinNo(linkNo);
+                                    otherDto.setVinNo(vinNo);
                                     otherDto.setSalesUserSid(staffSid);
                                     otherDto.setStaffName(staffName);
                                     otherDto.setPolicyOrOther("1");
@@ -904,6 +931,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -927,7 +960,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("1");
@@ -1232,7 +1265,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             if (!busSalesOrderVehicles.isEmpty()) {
                 List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
                 if (!stringVinNos.isEmpty()) {
-                    vo.setVinNo(String.join(",", stringVinNos));
+                    List<String> vinList = new ArrayList<>();
+                    for (String linkNo : stringVinNos) {
+                        String vinNo = "";
+                        if (linkNo.length() > 8) {
+                            vinNo = linkNo.substring(linkNo.length() - 8);
+
+                        } else {
+                            vinNo = linkNo;
+                        }
+                        vinList.add(vinNo);
+                    }
+                    vo.setVinNo(String.join(",", vinList));
                 }
             }
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java

@@ -156,6 +156,16 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");
         IPage<LoanWarrantInformationVo> pagging = baseMapper.listPage(page, qw);
+        List<LoanWarrantInformationVo> records = pagging.getRecords();
+        if (!records.isEmpty()) {
+            for (LoanWarrantInformationVo record : records) {
+                if (StringUtils.isNotBlank(record.getVinNo())) {
+                    if (record.getVinNo().length() > 8) {
+                        record.setVinNo(record.getVinNo().substring(record.getVinNo().length() - 8));
+                    }
+                }
+            }
+        }
         PagerVo<LoanWarrantInformationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -172,6 +182,11 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         LoanWarrantInformation loanWarrantInformation = fetchBySid(sid);
         if (null != loanWarrantInformation) {
             BeanUtil.copyProperties(loanWarrantInformation, vo);
+            if (StringUtils.isNotBlank(loanWarrantInformation.getVinNo())) {
+                if (loanWarrantInformation.getVinNo().length() > 8) {
+                    vo.setVinNo(loanWarrantInformation.getVinNo().substring(loanWarrantInformation.getVinNo().length() - 8));
+                }
+            }
             String busVinSid = loanWarrantInformation.getBusVinSid();
             //登记证 1-2页
             List<LoanFile> fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType());
@@ -276,7 +291,13 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         for (String sid : sids) {
             LoanWarrantInformation entity = fetchBySid(sid);
             if (StringUtils.isNotBlank(entity.getVinNo())) {
-                sbVinNo.append(entity.getVinNo()).append("，");
+                String vinNo = "";
+                if (entity.getVinNo().length() > 8) {
+                    vinNo = entity.getVinNo().substring(entity.getVinNo().length() - 8);
+                } else {
+                    vinNo = entity.getVinNo();
+                }
+                sbVinNo.append(vinNo).append("，");
             }
             if (StringUtils.isNotBlank(entity.getVehicleMark())) {
                 sbVinMark.append(entity.getVehicleMark()).append("，");
@@ -345,7 +366,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         String[] sids = dto.getSids();
         for (String sid : sids) {
             LoanWarrantInformation entity = fetchBySid(sid);
-            BeanUtil.copyProperties(dto, entity, "id", "sid","vehicleMark");
+            BeanUtil.copyProperties(dto, entity, "id", "sid", "vehicleMark");
             entity.setTransferDate(new DateTime());
             entity.setAuditStateKey("003");
             entity.setAuditStateValue("已移交");