Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java

@@ -30,6 +30,7 @@ public class CapitalCreditResult {
     public String bussDate;
     @ApiModelProperty("银行")
     public String bankName;
+    public String remarks;
     @ApiModelProperty("收款明细")
     public List<CapitalCreditResult.CapitalCreditResultDetailDto> resultDetails;
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java

@@ -61,6 +61,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
         map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept());
         //银行
         map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName());
+        map_fEntityModel_.put("FAR_OtherRemarks",creditResult.getRemarks());
         List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails();
         //准备 物料列表的数据
         ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java

@@ -87,4 +87,6 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String accCompxAddress;
     @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
     private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java

@@ -89,4 +89,6 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String isCompBuy;
     @ApiModelProperty("001一车一合同 002一贷款人一合同")
     private String conSetUpKey;
+    @ApiModelProperty("合同路径")
+    private String contractUrl;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java

@@ -79,4 +79,6 @@ public class LoanHomevisitPrepVo implements Vo {
     private String bankName;
     @ApiModelProperty("金融产品名称")
     private String policyName;
+    @ApiModelProperty("合同生成状态")
+    private String createState;
 }

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

@@ -35,6 +35,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loandiff.*;
 import com.yxt.anrui.riskcenter.api.loandiff.flowable.*;
 import com.yxt.anrui.riskcenter.api.loandiffdetails.*;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate;
@@ -43,6 +46,9 @@ import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.SubmitTemplateDto;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeVo;
 import com.yxt.anrui.riskcenter.biz.loandiffdetails.LoanDiffDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
+import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
+import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.anrui.riskcenter.biz.loantemplate.LoanTemplateMapper;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -95,6 +101,12 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private LoanSolutionsService loanSolutionsService;
+    @Autowired
+    private LoanFinPolicyService loanFinPolicyService;
+    @Autowired
+    private LoanFinBankService loanFinBankService;
 
     /**
      * 判断提交的流程是否被允许
@@ -257,6 +269,12 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                 String busVinSid = loanDiffDetails.getBusVinSid();
                 BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBusVinSid(busVinSid);
                 BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
+                LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(busSalesOrder.getSid());
+                LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+                if(loanFinPolicy != null){
+                    LoanFinBank loanFinBank = loanFinBankService.fetchBySid(loanFinPolicy.getBankSid());
+                    creditResult.setBankName(loanFinBank.getBankNo());
+                }
                 String customerNumber = "";
                 //判断财务系统是否有客户
                 Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
@@ -327,6 +345,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     collectionDetailDtoListOne.add(creditResultDetailDto);
                 }
                 creditResult.setResultDetails(collectionDetailDtoListOne);
+                creditResult.setRemarks("放款差额");
                 finKingDeeFeign.pushOtherReceivableBill(creditResult);
             }
         }

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

@@ -404,10 +404,16 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
             }
             //其他补充信息状态
-            if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())){
-                loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
-            }else {
+            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())){
+                    loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
+                }else {
+                    loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
+                }
+            }else {
+                loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
             }
             //合同路径
             if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl())){

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

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo">
-        SELECT
+        SELECT DISTINCT
         lp.`sid`,
         lp.saleOrderSid,
         bo.createDate,
@@ -16,13 +16,20 @@
         bb.`borrowerName`,
         bb.`mobile`,
         bb.`bankName`,
-        bb.policyName
+        bb.policyName,
+        IF(
+        bl.`borrowerSid` IS NULL,
+        '未生成',
+        '已生成'
+        ) AS createState
         FROM
         loan_homevisit_prep lp
         LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
         ON lp.`saleOrderBorrowerSid` = bb.`sid`
         LEFT JOIN anrui_buscenter.`bus_sales_order` bo
         ON lp.`saleOrderSid` = bo.`sid`
+        LEFT JOIN anrui_buscenter.bus_sales_order_loancontract bl
+        ON lp.`saleOrderBorrowerSid` = bl.`borrowerSid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java

@@ -66,4 +66,27 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
+
+    @ApiModelProperty("车辆登记在(1客户名下,2挂靠公司名下)")
+    private String vehRegis;
+    @ApiModelProperty("挂靠公司是否担保(1是0否)")
+    private String isSecurity;
+    @ApiModelProperty("挂靠公司名称")
+    private String accCompName;
+    @ApiModelProperty("挂靠公司统一社会信用代码")
+    private String accCompRegistNum;
+    @ApiModelProperty("挂靠公司负责人")
+    private String accCompContract;
+    @ApiModelProperty("挂靠公司电话")
+    private String accComphone;
+    @ApiModelProperty("注册地址")
+    private String accCompAddress;
+    @ApiModelProperty("实际经营地址")
+    private String accCompxAddress;
+    @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
+    private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
+    @ApiModelProperty("合同路径")
+    private String contractUrl;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java

@@ -67,4 +67,27 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
+
+    @ApiModelProperty("车辆登记在(1客户名下,2挂靠公司名下)")
+    private String vehRegis;
+    @ApiModelProperty("挂靠公司是否担保(1是0否)")
+    private String isSecurity;
+    @ApiModelProperty("挂靠公司名称")
+    private String accCompName;
+    @ApiModelProperty("挂靠公司统一社会信用代码")
+    private String accCompRegistNum;
+    @ApiModelProperty("挂靠公司负责人")
+    private String accCompContract;
+    @ApiModelProperty("挂靠公司电话")
+    private String accComphone;
+    @ApiModelProperty("注册地址")
+    private String accCompAddress;
+    @ApiModelProperty("实际经营地址")
+    private String accCompxAddress;
+    @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
+    private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
+    @ApiModelProperty("合同路径")
+    private String contractUrl;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -206,6 +206,18 @@ public class LoanHomeVisitInvestigateService {
         ResultBean rb = ResultBean.fireFail();
         LoanHomeVisitInvestigateSaveCustomerDto loanHomeVisitInvestigateSaveCustomerDto = new LoanHomeVisitInvestigateSaveCustomerDto();
         BeanUtil.copyProperties(dto, loanHomeVisitInvestigateSaveCustomerDto);
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(dto.getSid()).getData();
+        loanHomeVisitInvestigateSaveCustomerDto.setVehRegis(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis());
+        loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity());
+        loanHomeVisitInvestigateSaveCustomerDto.setAccCompName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+        loanHomeVisitInvestigateSaveCustomerDto.setAccCompRegistNum(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum());
+        loanHomeVisitInvestigateSaveCustomerDto.setAccCompContract(loanHomevisitInvestigateCustomerDetailsVo.getAccCompContract());
+        loanHomeVisitInvestigateSaveCustomerDto.setAccComphone(loanHomevisitInvestigateCustomerDetailsVo.getAccComphone());
+        loanHomeVisitInvestigateSaveCustomerDto.setAccCompAddress(loanHomevisitInvestigateCustomerDetailsVo.getAccCompAddress());
+        loanHomeVisitInvestigateSaveCustomerDto.setAccCompxAddress(loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress());
+        loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy());
+        loanHomeVisitInvestigateSaveCustomerDto.setConSetUpKey(loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey());
+        loanHomeVisitInvestigateSaveCustomerDto.setContractUrl(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl());
         loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
         return rb.success();
     }