Merge remote-tracking branch 'origin/master'

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

@@ -183,7 +183,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation("重新发起")
     @GetMapping("/rePublishSaleOrder")
     @ResponseBody
-    public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid")String saleOrderSid,@RequestParam(value = "customerSid",required = false)String customerSid,@RequestParam(value = "customerName",required = false)String customerName,@RequestParam(value = "customerMobile",required = false)String customerMobile) throws InvocationTargetException, IllegalAccessException;
+    public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "customerSid", required = false) String customerSid, @RequestParam(value = "customerName", required = false) String customerName, @RequestParam(value = "customerMobile", required = false) String customerMobile) throws InvocationTargetException, IllegalAccessException;
 
     /**
      * 新增保存销售订单信息
@@ -350,5 +350,25 @@ public interface BusSalesOrderFeign {
     @ApiOperation("根据销售订单查询销售订单相关表")
     @GetMapping("/getSalesOrderOne")
     @ResponseBody
-    ResultBean<BusSalesOrdersVo> getSalesOrderOne(@RequestParam("sid")String sid);
+    ResultBean<BusSalesOrdersVo> getSalesOrderOne(@RequestParam("sid") String sid);
+
+    @ApiOperation("初始化录入贷款人列表")
+    @GetMapping("/saleOrderInputLender/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<SalesLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("删除销售订单贷款人")
+    @DeleteMapping("/deleteSaleOrderInputLender/{sid}")
+    @ResponseBody
+    ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid);
+
+    @ApiOperation("删除销售订单贷款人")
+    @PostMapping("/saveBorrowNum/{sid}/{num}")
+    @ResponseBody
+    ResultBean saveBorrowNum(@PathVariable("sid") String sid, @PathVariable("num") String num);
+
+    @ApiOperation("保存销售订单贷款人自己")
+    @PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}")
+    @ResponseBody
+    ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid);
 }

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

@@ -326,4 +326,24 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrdersVo> getSalesOrderOne(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<SalesLenderVo> saleOrderInputLender(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteSaleOrderInputLender(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveBorrowNum(String sid, String num) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/11
+ **/
+@Data
+public class LenderVo implements Vo {
+    private static final long serialVersionUID = 7304958451535278499L;
+
+    @ApiModelProperty("数量")
+    private String vinNum;
+    @ApiModelProperty("记录sid")
+    private String sid;
+    @ApiModelProperty("贷款人")
+    private String lenderName;
+    @ApiModelProperty("是否显示删除：没确认可以删除")
+    private boolean showDelete;
+    @ApiModelProperty("是否显示确认，没确认可以确认")
+    private boolean showConfirm;
+}

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

@@ -0,0 +1,29 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/11
+ **/
+@Data
+public class SalesLenderVo {
+
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("订单台数")
+    private Integer orderCarNum;
+    @ApiModelProperty("确认台数")
+    private Integer confirmCarNum;
+    @ApiModelProperty("是否显示自己：当贷款人没有本人时才显示，当确定的台数与总台数相同时，不允许显示")
+    private boolean showOwn;
+    @ApiModelProperty("是否显示选择按钮，当确定台数与总台数相同时，不允许显示")
+    private boolean showSelect;
+
+    private List<LenderVo> lenderList = new ArrayList<>();
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java

@@ -22,4 +22,6 @@ public class VinListVo2 {
     private int viewType;
     @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
     private String groupName;
+
+    private String pos;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java

@@ -37,6 +37,12 @@ public class BusNoGuaranteeCreditReviewQuery implements Query {
     @ApiModelProperty("资方")
     private String bankName;
     @ApiModelProperty("家访考察结果")
+    private String homeVisitKey;
+    @ApiModelProperty("信审终审结果")
+    private String creditReviewKey;
+    @ApiModelProperty("放款审核结果")
+    private String loanReviewKey;
+    @ApiModelProperty("家访考察结果")
     private String homeVisit;
     @ApiModelProperty("信审终审结果")
     private String creditReview;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewVo.java

@@ -12,7 +12,8 @@ import lombok.Data;
 @Data
 public class BusNoGuaranteeCreditReviewVo implements Vo {
 
-
+    @ApiModelProperty("订单sid")
+    private String salesOrderSid;
     @ApiModelProperty("订单日期")
     private String orderDate;
     @ApiModelProperty("分公司")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@@ -95,4 +95,8 @@ public interface BusSalesOrderLoancontractFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusLoancontractForRepayVo>> listPageForRepay(@RequestBody PagerQuery<BusLoancontractForRepayQuery> pq);
 
+    @ApiOperation("推送融资放款的应收")
+    @PostMapping("/pushLoanOrder")
+    @ResponseBody
+    ResultBean pushLoanOrder(@RequestBody LoanContractPush loanContractPush);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@@ -89,4 +89,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	public ResultBean<PagerVo<BusLoancontractForRepayVo>> listPageForRepay(PagerQuery<BusLoancontractForRepayQuery> pq) {
 		return null;
 	}
+
+	@Override
+	public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesorderloancontract;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/11
+ **/
+@Data
+public class LoanContractPush {
+
+    @ApiModelProperty("消贷合同sid")
+    private String loanContractSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+}

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

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordervehicle;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -66,8 +68,10 @@ public class BusSalesOrderVehicle extends BaseEntity {
     @ApiModelProperty("临时客户名称")
     private String temporaryName;
     @ApiModelProperty("贷款人sid")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String borrowerSid;
     @ApiModelProperty("贷款人")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String borrowName;
 
 }

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

@@ -409,4 +409,24 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrdersVo> getSalesOrderOne(String sid) {
         return busSalesOrderService.getSalesOrderOne(sid);
     }
+
+    @Override
+    public ResultBean<SalesLenderVo> saleOrderInputLender(String saleOrderSid) {
+        return busSalesOrderService.saleOrderInputLender(saleOrderSid);
+    }
+
+    @Override
+    public ResultBean deleteSaleOrderInputLender(String sid) {
+        return busSalesOrderService.deleteSaleOrderInputLender(sid);
+    }
+
+    @Override
+    public ResultBean saveBorrowNum(String sid, String num) {
+        return busSalesOrderService.saveBorrowNum(sid,num);
+    }
+
+    @Override
+    public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
+        return busSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
+    }
 }

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

@@ -79,6 +79,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
@@ -113,6 +114,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
 import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService;
+import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
 import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService;
@@ -331,6 +333,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private DocPdfComponent docPdfComponent;
     @Autowired
     private BaseVehicleStateFeign baseVehicleStateFeign;
+    @Autowired
+    private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
 
     /**
      * 构造查询条件
@@ -7286,12 +7290,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrderVehicleList.removeAll(Collections.singleton(null));
         List<String> borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList());
         List<VinListVo2> vinList = new ArrayList<>();
+        int pos = 0;
         for (int j = 0; j < borrowSidList.size(); j++) {
             VinListVo2 vinListVo2 = new VinListVo2();
             String borrowSid = borrowSidList.get(j);
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
             if (type == 1) {
                 vinListVo2.setViewType(0);
+                pos = pos + 1;
+                vinListVo2.setPos(String.valueOf(pos));
             } else if (type == 2) {
                 vinListVo2.setViewType(1);
                 String borrowName = busSalesOrderVehicle.getBorrowName();
@@ -7302,9 +7309,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             vinList.add(vinListVo2);
-            if(StringUtils.isNotBlank(borrowSid)){
+            if (StringUtils.isNotBlank(borrowSid)) {
                 busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
-            }else{
+            } else {
                 busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid3(saleOrderSid);
             }
 
@@ -7313,6 +7320,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
                     vinListVo2 = new VinListVo2();
                     vinListVo2.setViewType(0);
+                    pos = pos + 1;
+                    vinListVo2.setPos(String.valueOf(pos));
                     busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
                     if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
                         vinListVo2.setLinkNo(busSalesOrderVehicle.getLinkNo());
@@ -7342,4 +7351,104 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         vinVo.setVinList(vinList);
         return rb.success().setData(vinVo);
     }
+
+    public ResultBean<SalesLenderVo> saleOrderInputLender(String saleOrderSid) {
+        ResultBean<SalesLenderVo> rb = ResultBean.fireFail();
+        SalesLenderVo salesLenderVo = new SalesLenderVo();
+        salesLenderVo.setSaleOrderSid(saleOrderSid);
+        //订单总台数
+        BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(saleOrderSid);
+        //查询该销售订单已确定的数量
+        int counts = busSalesOrderBorrowerService.selectByNum(saleOrderSid);
+        if (busSalesOrderPrice != null) {
+            salesLenderVo.setOrderCarNum(busSalesOrderPrice.getQuantity());
+            int allNum = busSalesOrderPrice.getQuantity();
+            if (counts < allNum) {
+                salesLenderVo.setShowOwn(true);
+                salesLenderVo.setShowSelect(true);
+            }
+        }
+        int confirmNum = 0;
+        //根据销售订单sid查询所有选择的贷款人
+        List<LenderVo> lenderList = busSalesOrderBorrowerService.saleOrderInputLender(saleOrderSid);
+        lenderList.removeAll(Collections.singleton(null));
+        if (!lenderList.isEmpty()) {
+            for (int i = 0; i < lenderList.size(); i++) {
+                LenderVo lenderVo = lenderList.get(i);
+                String sid = lenderVo.getSid();
+                //根据销售订单贷款人表sid查询家纺准备是否存在
+                int count = busSalesOrderBorrowerService.selectBorrow(sid);
+                if (count > 0) {
+                    lenderVo.setShowConfirm(false);
+                    lenderVo.setShowDelete(false);
+                } else {
+                    lenderVo.setShowConfirm(true);
+                    lenderVo.setShowDelete(true);
+                }
+                if (StringUtils.isNotBlank(lenderVo.getVinNum())) {
+                    confirmNum = confirmNum + Integer.parseInt(lenderVo.getVinNum());
+                } else {
+                    confirmNum = confirmNum;
+                }
+            }
+        }
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
+        if (busSalesOrderBorrower == null) {
+            salesLenderVo.setShowOwn(true);
+        }
+        salesLenderVo.setConfirmCarNum(confirmNum);
+        salesLenderVo.setLenderList(lenderList);
+        return rb.success().setData(salesLenderVo);
+    }
+
+    public ResultBean deleteSaleOrderInputLender(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //删除销售订单车辆表中的贷款人的名称
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(sid);
+        if (busSalesOrderVehicle != null) {
+            busSalesOrderVehicle.setBorrowerSid("");
+            busSalesOrderVehicle.setBorrowName("");
+            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+        }
+        //删除销售订单贷款表的数据
+        busSalesOrderBorrowerService.deleteBySid(sid);
+        return rb.success();
+    }
+
+    public ResultBean saveBorrowNum(String sid, String num) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
+        if (busSalesOrderBorrower == null) {
+            return rb.setMsg("该贷款人不存在");
+        }
+        //查询该销售订单已确定的数量
+        int count = busSalesOrderBorrowerService.selectByNum(busSalesOrderBorrower.getSalesOrderSid());
+        BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrderBorrower.getSalesOrderSid());
+        if (busSalesOrderPrice != null) {
+            int allNum = busSalesOrderPrice.getQuantity();
+            if (count >= allNum) {
+                return rb.setMsg("销售订单的剩余台数已不足");
+            }
+        }
+        busSalesOrderBorrower.setVehCount(Integer.parseInt(num));
+        busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
+        return rb.success();
+    }
+
+    public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该销售订单的贷款人中是否已存在该客户的贷款人
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
+        if (busSalesOrderBorrower != null) {
+            return rb.setMsg("客户本人已存在贷款人中");
+        }
+        BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        busSalesOrderBorrower = new BusSalesOrderBorrower();
+        busSalesOrderBorrower.setSalesOrderSid(saleOrderSid);
+        busSalesOrderBorrower.setCustomSid(busSalesOrder.getCustomerSid());
+        busSalesOrderBorrower.setBorrowerName(busSalesOrder.getCustomerName());
+        busSalesOrderBorrower.setMobile(busSalesOrder.getMobile());
+        busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorder.LenderVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusNoGuaranteeCreditReviewVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
@@ -82,4 +83,12 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
 
     @Select("select * from bus_sales_order_borrower where salesOrderSid =#{orderSid}")
     BusSalesOrderBorrower fetchDetailsByOrderSid(String orderSid);
+
+    List<LenderVo> saleOrderInputLender(String saleOrderSid);
+
+    int selectBorrow(String sid);
+
+    int selectByNum(String salesOrderSid);
+
+    BusSalesOrderBorrower selectByOrderSids(String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@@ -54,5 +54,25 @@
         FROM bus_sales_order_borrower AS bor
                  LEFT JOIN bus_sales_order AS bo ON bor.salesOrderSid = bo.sid
                  LEFT JOIN anrui_riskcenter.loan_noguarantee_credit_review AS cr ON cr.salesOrderSid = bo.sid
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="saleOrderInputLender" resultType="com.yxt.anrui.buscenter.api.bussalesorder.LenderVo">
+        select vehCount as vinNum,sid,borrowerName as lenderName from bus_sales_order_borrower where salesOrderSid = #{saleOrderSid}
+
+    </select>
+
+    <select id="selectBorrow" resultType="int">
+        select count(*) from anrui_riskcenter.loan_homevisit_prep where saleOrderBorrowerSid = #{sid}
+    </select>
+
+    <select id="selectByNum" resultType="int">
+        select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{salesOrderSid}
+    </select>
+
+    <select id="selectByOrderSids" resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower">
+        select * from bus_sales_order_borrower bb left join
+            bus_sales_order bo on bo.sid = bb.salesOrderSid
+        where bo.customerSid = bb.customSid and bo.sid = #{saleOrderSid}
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderborrower;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.LenderVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
@@ -239,7 +240,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
                 );
         //分公司
         if (StringUtils.isNotBlank(pagerQuery.getCompany())) {
-            qw.like("bo.usdOrgName", pagerQuery.getCompany());
+            qw.like("bo.useOrgName", pagerQuery.getCompany());
         }
         //销售部门
         if (StringUtils.isNotBlank(pagerQuery.getDepartment())) {
@@ -263,15 +264,15 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         }
         //家访考察结果
         if (StringUtils.isNotBlank(pagerQuery.getHomeVisit())) {
-            qw.like("cr.homeVisit", pagerQuery.getHomeVisit());
+            qw.eq("cr.homeVisit", pagerQuery.getHomeVisit());
         }
         //信审终审结果
         if (StringUtils.isNotBlank(pagerQuery.getCreditReview())) {
-            qw.like("cr.creditReview", pagerQuery.getCreditReview());
+            qw.eq("cr.creditReview", pagerQuery.getCreditReview());
         }
         //放款审核结果
         if (StringUtils.isNotBlank(pagerQuery.getLoanReview())) {
-            qw.like("cr.loanReview", pagerQuery.getLoanReview());
+            qw.eq("cr.loanReview", pagerQuery.getLoanReview());
         }
         //是否放款
         if (StringUtils.isNotBlank(pagerQuery.getIsLoan())) {
@@ -293,4 +294,20 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         BeanUtil.copyProperties(entity, vo);
         return rb.success().setData(vo);
     }
+
+    public List<LenderVo> saleOrderInputLender(String saleOrderSid) {
+        return baseMapper.saleOrderInputLender(saleOrderSid);
+    }
+
+    public int selectBorrow(String sid) {
+        return baseMapper.selectBorrow(sid);
+    }
+
+    public int selectByNum(String salesOrderSid) {
+        return baseMapper.selectByNum(salesOrderSid);
+    }
+
+    public BusSalesOrderBorrower selectOrderSid(String saleOrderSid) {
+        return baseMapper.selectByOrderSids(saleOrderSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@@ -118,4 +118,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
 		PagerVo<BusLoancontractForRepayVo> pv = busSalesOrderLoancontractService.listPageForRepay(pq);
 		return rb.success().setData(pv);
 	}
+
+	@Override
+	public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
+		return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush);
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -28,15 +28,22 @@ package com.yxt.anrui.buscenter.biz.bussalesorderloancontract;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -47,6 +54,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -72,6 +80,12 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
     private SysUserFeign sysUserFeign;
     @Autowired
     private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
+    private LoanSolutionsFeign loanSolutionsFeign;
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedDetailedFeign;
 
     private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -238,4 +252,61 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         baseMapper.updateBankConAndBusNo(loanContractSid, bankContractNo);
         return rb.success();
     }
+
+    public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
+        ResultBean rb = ResultBean.fireFail();
+        String saleOrderSid = loanContractPush.getSaleOrderSid();
+        String loanContractSid = loanContractPush.getLoanContractSid();
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(saleOrderSid);
+        //根据消贷合同查询贷款人
+        BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
+        if(busSalesOrderLoancontract != null){
+            //根据销售订单的贷款人sid查询车辆表中的数据
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(busSalesOrderLoancontract.getBorrowerSid());
+            //这是生成业务系统融资放款应收的逻辑：
+            // 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
+            //计算融资放款的金额以及厂家贴息金额
+            ResultBean<PushVo> resultBean = loanSolutionsFeign.selectMoney(saleOrderSid);
+            if(resultBean.getData() != null){
+                PushVo pushVo = resultBean.getData();
+                UnCollectionDto unCollectionDto = new UnCollectionDto();
+                unCollectionDto.setContractNo(busSalesOrder.getContractNo());
+//                unCollectionDto.setContractSid(contractSid);
+                //客户名称
+                unCollectionDto.setCustomerName(busSalesOrder.getCustomerName());
+                //客户sid
+                unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid());
+                //客户类型
+                unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass());
+                //客户类型
+                unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey());
+                //客户头像
+                unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto());
+                unCollectionDto.setReceivablesName("融资放款");
+                unCollectionDto.setCustomerPhone(busSalesOrder.getMobile());
+                unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
+                unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo());
+                unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney());
+                unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
+                unCollectionDto.setReveivableMoney(pushVo.getMoney());
+                unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid());
+                unCollectionDto.setPayType(busSalesOrder.getPayType());
+                unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
+                unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
+                unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+                unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
+                unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
+                unCollectionDto.setStaffName(busSalesOrder.getStaffName());
+                unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
+                unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
+                unCollectionDto.setKxState("01");
+                if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) {
+                    unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney()));
+                }
+                finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+            }
+        }
+        return rb.success();
+    }
 }

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

@@ -153,4 +153,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 
     List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid);
+
+    BusSalesOrderVehicle selectByBorrowSid(String sid);
 }

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

@@ -252,4 +252,8 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select * from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
     </select>
+
+    <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where borrowerSid = #{sid}
+    </select>
 </mapper>

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

@@ -583,4 +583,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid) {
         return baseMapper.selectListByOrdersSid(saleOrderSid);
     }
+
+    public BusSalesOrderVehicle selectByBorrowSid(String sid) {
+        return baseMapper.selectByBorrowSid(sid);
+    }
 }

anrui-riskcenter-ui/src/api/unsecuredbusiness/unsecuredbusiness.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/buscenter/v1/bussalesorderborrower/noGuaranteeCreditReviewPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/riskcenter/v1/noguaranteereview/saveReviewInfo',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/riskcenter/v1/noguaranteereview/details',
+      method: 'get',
+      params: data
+    })
+  }
+}

anrui-riskcenter-ui/src/router/index.js

@@ -283,6 +283,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/unsecuredbusiness',
+    component: Layout,
+    redirect: '/unsecuredbusiness',
+    meta: {
+      title: '非担保信审'
+    },
+    children: [
+      {
+        path: '/unsecuredbusiness/unsecuredbusiness',
+        component: () => import('@/views/unsecuredbusiness/unsecuredbusiness.vue'),
+        name: 'UnsecuredBusiness',
+        meta: { title: '非担保信审', noCache: true }
+      }
+    ]
+  },
 
   // 流程审批
   // 金融产品政策报备--编辑

anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue

@@ -9,7 +9,15 @@
     </div>
     <div class="listconadd">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #e0e3eb">
+        <el-row style="border-left: 0px">
+          <el-col :span="24" style="border-right: 0px">
+            <div class="span-sty" style="border-right: 0px">其他融名称:</div>
+            <el-form-item><span class="addinputInfo">
+              {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.period + '期' : '' }} {{ formobj.maxLoanRatio !== '' ? formobj.maxLoanRatio + '%' : '' }}
+            </span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <div class="span-sty">资方简称</div>
             <el-form-item>
@@ -18,16 +26,10 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
-            <div class="span-sty">其他融名称</div>
-            <el-form-item><span class="addinputInfo">
-              {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.maxLoanRatio + '期' : '' }} {{ formobj.maxLoanRatio !== '' ? formobj.maxLoanRatio + '%' : '' }}
-            </span></el-form-item>
-          </el-col>
-          <el-col :span="8">
             <div class="span-sty">适用销售部门</div>
             <el-form-item>
-              <el-select class="addinputInfo" v-model="useDept_list" placeholder="请选择" clearable filterable multiple>
+              <el-select class="addinputInfo" v-model="useDept_list" placeholder="请选择" style="width: 60%" clearable filterable multiple>
                 <el-option v-for="item in orgList" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptSid"></el-option>
               </el-select>
             </el-form-item>
@@ -53,7 +55,7 @@
           <el-col :span="8">
             <div class="span-sty">车辆功能</div>
             <el-form-item>
-              <el-select class="addinputInfo" v-model="formobj.vehTypeKey" @change="vehTypeChange" placeholder="请选择" clearable filterable>
+              <el-select class="addinputInfo" v-model="formobj.vehTypeKeyList" placeholder="请选择" clearable filterable multiple>
                 <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
             </el-form-item>
@@ -71,13 +73,13 @@
           <el-col :span="8">
             <div class="span-sty">最高融资比例(%)</div>
             <el-form-item>
-              <el-input v-model="formobj.maxLoanRatio" @keyup.native="UpNumber" class="addinputw addinputInfo" clearable placeholder=""/>
+              <el-input v-model="formobj.maxLoanRatio" @keyup.native="UpNumber" class="addinputInfo" clearable placeholder=""/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">最高融资额(元)</div>
             <el-form-item>
-              <el-input v-model="formobj.maxLoanAmount" @keyup.native="UpNumber" class="addinputw addinputInfo" clearable placeholder=""/>
+              <el-input v-model="formobj.maxLoanAmount" @keyup.native="UpNumber" class="addinputInfo" clearable placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -93,7 +95,7 @@
           <el-col :span="8">
             <div class="span-sty">年利率(%)</div>
             <el-form-item>
-              <el-input v-model="formobj.yearRatio" @keyup.native="UpNumber" class="addinputw addinputInfo" clearable placeholder=""/>
+              <el-input v-model="formobj.yearRatio" @keyup.native="UpNumber" class="addinputInfo" clearable placeholder=""/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -143,8 +145,8 @@ export default {
         busTypeValue: '',
         vehCategoryKey: '',
         vehCategoryValue: '',
-        vehTypeKey: '',
+        vehTypeKeyList: [],
-        vehTypeValue: '',
+        vehTypeValueList: [],
         maxLoanRatio: '',
         maxLoanAmount: '',
         period: '',
@@ -271,14 +273,6 @@ export default {
         this.formobj.vehCategoryValue = ''
       }
     },
-    vehTypeChange(value) {
-      const choose = this.vehicleFunction_list.filter((item) => item.dictKey === value)
-      if (choose !== null && choose.length > 0) {
-        this.formobj.vehTypeValue = choose[0].dictValue
-      } else {
-        this.formobj.vehTypeValue = ''
-      }
-    },
     periodChange(value) {
       const choose = this.period_list.filter((item) => item.dictKey === value)
       if (choose !== null && choose.length > 0) {
@@ -319,6 +313,15 @@ export default {
               }
             }
           }
+          if (this.formobj.vehTypeKeyList.length > 0) {
+            for (var m = 0; m < this.vehicleFunction_list.length; m++) {
+              for (var n = 0; n < this.formobj.vehTypeKeyList.length; n++) {
+                if (this.vehicleFunction_list[m].dictKey === this.formobj.vehTypeKeyList[n]) {
+                  this.formobj.vehTypeValueList.push(this.vehicleFunction_list[m].dictValue)
+                }
+              }
+            }
+          }
           this.submitdisabled = true
           // 保存
           req.saveOrUpdate(this.formobj).then((res) => {
@@ -350,8 +353,8 @@ export default {
         busTypeValue: '',
         vehCategoryKey: '',
         vehCategoryValue: '',
-        vehTypeKey: '',
+        vehTypeKeyList: [],
-        vehTypeValue: '',
+        vehTypeValueList: [],
         maxLoanRatio: '',
         maxLoanAmount: '',
         period: '',
@@ -380,5 +383,6 @@ export default {
 }
 .addinputInfo {
   margin-left: 110px !important;
+  width: calc(100% - 120px);
 }
 </style>

anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue

@@ -8,20 +8,22 @@
     </div>
     <div class="listconadd">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #e0e3eb">
+        <el-row style="border-left: 0px">
-          <el-col :span="8">
+          <el-col :span="24" style="border-right: 0px">
-            <div class="span-sty">资方简称</div>
+            <div class="span-sty" style="border-right: 0px">其他融名称:</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.bankShortName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">其他融名称</div>
             <el-form-item>
               <span class="addinputInfo">
                 {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.period + '期' : '' }} {{ formobj.maxLoanRatio !== '' ? formobj.maxLoanRatio + '%' : '' }}
               </span>
             </el-form-item>
           </el-col>
-          <el-col :span="8" class="tlineheightb">
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">资方简称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.bankShortName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="16" class="tlineheightb">
             <div class="span-sty">适用销售部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.useDeptNames }}</span></el-form-item>
           </el-col>

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusiness.vue

@@ -0,0 +1,287 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="公司自营非担保进度维护" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.company" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="销售部门">
+                <el-input v-model="listQuery.params.department" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="销售专员">
+                <el-input v-model="listQuery.params.salesman" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="订单日期">
+                <el-date-picker v-model="listQuery.params.startTime" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.endTime" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="买卖合同编号">
+                <el-input v-model="listQuery.params.contractNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="贷款人">
+                <el-input v-model="listQuery.params.borrowerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="资方">
+                <el-input v-model="listQuery.params.bankName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="家访考察结果">
+                <el-input v-model="listQuery.params.homeVisit" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="信审终审结果">
+                <el-input v-model="listQuery.params.creditReview" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="放款审核结果">
+                <el-input v-model="listQuery.params.loanReview" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否放款">
+                <el-input v-model="listQuery.params.isLoan" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">贷款人列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="操作" width="100" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="orderDate" label="订单日期" align="center" width="120"/>
+            <el-table-column prop="company" label="分公司" align="center" width="120"/>
+            <el-table-column prop="department" label="销售部门" align="center" width="120"/>
+            <el-table-column prop="salesman" label="销售专员" align="center" width="100"/>
+            <el-table-column prop="contractNo" label="买卖合同编号" align="center" width="140"/>
+            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="mobile" label="手机号码" align="center" width="100"/>
+            <el-table-column prop="bankName" label="资方" align="center" width="100"/>
+            <el-table-column prop="homeVisit" label="家访考察结果" align="center" width="140"/>
+            <el-table-column prop="homeVisitDate" label="家访考察日期" align="center" width="140"/>
+            <el-table-column prop="creditReview" label="信审终审结果" align="center" width="140"/>
+            <el-table-column prop="creditReviewDate" label="信审终审日期" align="center" width="140"/>
+            <el-table-column prop="loanReview" label="放款审核结果" align="center" width="140"/>
+            <el-table-column prop="loanReviewDate" label="放款审核日期" align="center" width="140"/>
+            <el-table-column prop="isLoan" label="是否放款" align="center" width="100"/>
+            <el-table-column prop="isLoanDate" label="放款日期" align="center" width="120"/>
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <unsecuredbusinessAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情 -->
+    <unsecuredbusinessInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/unsecuredbusiness/unsecuredbusiness'
+import unsecuredbusinessAdd from './unsecuredbusinessAdd'
+import unsecuredbusinessInfo from './unsecuredbusinessInfo'
+
+export default {
+  name: 'UnsecuredBusiness',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    unsecuredbusinessAdd,
+    unsecuredbusinessInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '办理'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          userSid: '',
+          menuUrl: '',
+          company: '',
+          department: '',
+          salesman: '',
+          orgPath: '',
+          startTime: '',
+          endTime: '',
+          borrowerName: '',
+          contractNo: '',
+          bankName: '',
+          homeVisit: '',
+          creditReview: '',
+          loanReview: '',
+          isLoan: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.salesOrderSid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          userSid: '',
+          menuUrl: '',
+          company: '',
+          department: '',
+          salesman: '',
+          orgPath: '',
+          startTime: '',
+          endTime: '',
+          borrowerName: '',
+          contractNo: '',
+          bankName: '',
+          homeVisit: '',
+          creditReview: '',
+          loanReview: '',
+          isLoan: ''
+        }
+      }
+      this.getList()
+    },
+    toEdit(row) {
+      if (this.sids.length === 1) {
+        this.viewState = 2
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' })
+      }
+    },
+    toInfo(row) {
+      this.viewState = 3
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusinessAdd.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.salesman }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">贷款人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">家访考察结果</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="formobj.homeVisitKey" @change="homeVisitChange" placeholder="请选择" clearable filterable>
+                <el-option v-for="item in result_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">家访考察日期</div>
+            <el-form-item>
+              <el-date-picker class="addinputInfo" v-model="formobj.homeVisitDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">资方信审终审结果</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="formobj.creditReviewKey" @change="creditReviewChange" placeholder="请选择" clearable filterable>
+                <el-option v-for="item in result_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">信审终审日期</div>
+            <el-form-item>
+              <el-date-picker class="addinputInfo" v-model="formobj.creditReviewDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">资方放款审核结果</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="formobj.loanReviewKey" @change="loanReviewChange" placeholder="请选择" clearable filterable>
+                <el-option v-for="item in result_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">返款审核日期</div>
+            <el-form-item>
+              <el-date-picker class="addinputInfo" v-model="formobj.loanReviewDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">是否放款</div>
+            <el-form-item>
+              <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isLoan">
+                <el-radio label="是">是</el-radio>
+                <el-radio label="否">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">放款日期</div>
+            <el-form-item>
+              <el-date-picker class="addinputInfo" v-model="formobj.isLoanDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">上传附件</div>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">家访考察结果截图</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputInfo" v-model="image_list1" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">资方信审结果截图</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputInfo" v-model="image_list2" :limit="50" bucket="map" :upload-data="{ type: '0002' }"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">资方放款审核结果截图</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputInfo" v-model="image_list3" :limit="50" bucket="map" :upload-data="{ type: '0003' }"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/unsecuredbusiness/unsecuredbusiness'
+import { typeValues } from '@/api/Common/dictcommons'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'UnsecuredBusinessAdd',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      submitdisabled: false,
+      result_list: [],
+      image_list1: [],
+      image_list2: [],
+      image_list3: [],
+      formobj: {
+        salesOrderSid: '',
+        salesman: '',
+        borrowerName: '',
+        homeVisit: '',
+        homeVisitKey: '',
+        homeVisitDate: '',
+        creditReview: '',
+        creditReviewKey: '',
+        creditReviewDate: '',
+        loanReview: '',
+        loanReviewKey: '',
+        loanReviewDate: '',
+        isLoan: '',
+        isLoanDate: '',
+        homeVisitFiles: [],
+        creditReviewFiles: [],
+        loanReviewFiles: []
+      }
+    }
+  },
+  methods: {
+    showEdit(sid) {
+      this.viewTitle = '非担保业务进度设置'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ salesOrderSid: sid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          if (this.formobj.homeVisitFiles.length > 0) {
+            this.formobj.homeVisitFiles.forEach((e) => {
+              this.image_list1.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+          if (this.formobj.creditReviewFiles.length > 0) {
+            this.formobj.creditReviewFiles.forEach((e) => {
+              this.image_list2.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+          if (this.formobj.loanReviewFiles.length > 0) {
+            this.formobj.loanReviewFiles.forEach((e) => {
+              this.image_list3.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+        }
+      })
+      typeValues({ type: 'result' }).then((res) => {
+        if (res.success) {
+          this.result_list = res.data
+        }
+      })
+    },
+    homeVisitChange(val) {
+      const choose = this.result_list.filter((item) => item.dictKey === val)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.homeVisit = choose[0].dictValue
+      } else {
+        this.formobj.homeVisit = ''
+      }
+    },
+    creditReviewChange(val) {
+      const choose = this.result_list.filter((item) => item.dictKey === val)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.creditReview = choose[0].dictValue
+      } else {
+        this.formobj.creditReview = ''
+      }
+    },
+    loanReviewChange(val) {
+      const choose = this.result_list.filter((item) => item.dictKey === val)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.loanReview = choose[0].dictValue
+      } else {
+        this.formobj.loanReview = ''
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.getUrl()
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            }
+          })
+        } else {
+          this.submitdisabled = false
+        }
+      }).catch(() => {
+        this.submitdisabled = false
+      })
+    },
+    getUrl() {
+      if (this.image_list1.length > 0) {
+        const aa = []
+        for (var i = 0; i < this.image_list1.length; i++) {
+          aa.push(this.image_list1[i].url)
+        }
+        this.formobj.homeVisitFiles = aa
+      } else {
+        this.formobj.homeVisitFiles = []
+      }
+      if (this.image_list2.length > 0) {
+        const bb = []
+        for (var m = 0; m < this.image_list2.length; m++) {
+          bb.push(this.image_list2[m].url)
+        }
+        this.formobj.creditReviewFiles = bb
+      } else {
+        this.formobj.creditReviewFiles = []
+      }
+      if (this.image_list3.length > 0) {
+        const cc = []
+        for (var n = 0; n < this.image_list3.length; n++) {
+          cc.push(this.image_list3[n].url)
+        }
+        this.formobj.loanReviewFiles = cc
+      } else {
+        this.formobj.loanReviewFiles = []
+      }
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        salesOrderSid: '',
+        salesman: '',
+        borrowerName: '',
+        homeVisit: '',
+        homeVisitKey: '',
+        homeVisitDate: '',
+        creditReview: '',
+        creditReviewKey: '',
+        creditReviewDate: '',
+        loanReview: '',
+        loanReviewKey: '',
+        loanReviewDate: '',
+        isLoan: '',
+        isLoanDate: '',
+        homeVisitFiles: [],
+        creditReviewFiles: [],
+        loanReviewFiles: []
+      }
+      this.submitdisabled = false
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 160px !important;
+}
+.addinputInfo {
+  margin-left: 150px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusinessInfo.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.salesman }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">贷款人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">家访考察结果</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.homeVisit }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">家访考察日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.homeVisitDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">资方信审终审结果</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.creditReview }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">信审终审日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.creditReviewDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">资方放款审核结果</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.loanReview }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">返款审核日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.loanReviewDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">是否放款</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.isLoan }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">放款日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.isLoanDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">
+          上传附件
+        </div>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">家访考察结果截图</div>
+            <el-form-item>
+              <el-image class="addinputInfo" style="width: 100px; height: 100px" v-for="(item, index) in formobj.homeVisitFiles" :key="index" :src="item" :preview-src-list="formobj.homeVisitFiles" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">资方信审结果截图</div>
+            <el-form-item>
+              <el-image class="addinputInfo" style="width: 100px; height: 100px" v-for="(item, index) in formobj.creditReviewFiles" :key="index" :src="item" :preview-src-list="formobj.creditReviewFiles" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">资方放款审核结果截图</div>
+            <el-form-item>
+              <el-image class="addinputInfo" style="width: 100px; height: 100px" v-for="(item, index) in formobj.loanReviewFiles" :key="index" :src="item" :preview-src-list="formobj.loanReviewFiles" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/unsecuredbusiness/unsecuredbusiness'
+export default {
+  name: 'UnsecuredbBusinessInfo',
+  data() {
+    return {
+      viewTitle: '',
+      formobj: {
+        salesOrderSid: '',
+        salesman: '',
+        borrowerName: '',
+        homeVisit: '',
+        homeVisitKey: '',
+        homeVisitDate: '',
+        creditReview: '',
+        creditReviewKey: '',
+        creditReviewDate: '',
+        loanReview: '',
+        loanReviewKey: '',
+        loanReviewDate: '',
+        isLoan: '',
+        isLoanDate: '',
+        homeVisitFiles: [],
+        creditReviewFiles: [],
+        loanReviewFiles: []
+      }
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '非担保业务进度详情'
+      req.fetchBySid({ salesOrderSid: row.salesOrderSid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        salesOrderSid: '',
+        salesman: '',
+        borrowerName: '',
+        homeVisit: '',
+        homeVisitKey: '',
+        homeVisitDate: '',
+        creditReview: '',
+        creditReviewKey: '',
+        creditReviewDate: '',
+        loanReview: '',
+        loanReviewKey: '',
+        loanReviewDate: '',
+        isLoan: '',
+        isLoanDate: '',
+        homeVisitFiles: [],
+        creditReviewFiles: [],
+        loanReviewFiles: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 160px !important;
+}
+.addinputInfo {
+  margin-left: 150px !important;
+}
+</style>

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

@@ -14,6 +14,7 @@ public enum LoanFileEnum {
     HOME_VISIT_FILES("005", "非担保业务进度家访考察结果"),
     CREDIT_REVIEW_FILES("006", "非担保业务进度资方信审结果"),
     LOAN_REVIEW_FILES("007", "非担保业务进度资方放款审核结果"),
+    FIN_BANK("008", "资方"),
     ;
 
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -54,4 +56,5 @@ public class LoanFinBankDto implements Dto {
     private String useOrgName;
     @ApiModelProperty("使用组织全路径")
     private String orgSidPath;
+    private List<String> finBankFiles = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Administrator
@@ -37,6 +39,7 @@ public class LoanFinBankInitVo implements Vo {
     private String contractSetValue;
     @ApiModelProperty("银行卡要求说明")
     private String bankCardRemark;
+    private List<String> finBankFiles = new ArrayList<>();
 //    @ApiModelProperty("使用组织sid")
 //    private String useOrgSid;
 //    @ApiModelProperty("使用组织名称")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java

@@ -19,14 +19,20 @@ public class LoanNoGuaranteeCreditReview extends BaseEntity {
     private String salesOrderSid;
     @ApiModelProperty("家访考察结果")
     private String homeVisit;
+    @ApiModelProperty("家访考察结果")
+    private String homeVisitKey;
     @ApiModelProperty("家访考察日期")
     private String homeVisitDate;
     @ApiModelProperty("信审终审结果")
     private String creditReview;
+    @ApiModelProperty("信审终审结果")
+    private String creditReviewKey;
     @ApiModelProperty("信审终审日期")
     private String creditReviewDate;
     @ApiModelProperty("放款审核结果")
     private String loanReview;
+    @ApiModelProperty("放款审核结果")
+    private String loanReviewKey;
     @ApiModelProperty("放款审核日期")
     private String loanReviewDate;
     @ApiModelProperty("是否放款")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java

@@ -20,6 +20,12 @@ public class LoanNoGuaranteeCreditReviewDetailsVo implements Vo {
     @ApiModelProperty("贷款人")
     private String borrowerName;
     @ApiModelProperty("家访考察结果")
+    private String homeVisitKey;
+    @ApiModelProperty("信审终审结果")
+    private String creditReviewKey;
+    @ApiModelProperty("放款审核结果")
+    private String loanReviewKey;
+    @ApiModelProperty("家访考察结果")
     private String homeVisit;
     @ApiModelProperty("家访考察日期")
     private String homeVisitDate;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java

@@ -21,6 +21,12 @@ public class LoanNoGuaranteeCreditReviewDto implements Dto {
     @ApiModelProperty("贷款人")
     private String borrowerName;
     @ApiModelProperty("家访考察结果")
+    private String homeVisitKey;
+    @ApiModelProperty("信审终审结果")
+    private String creditReviewKey;
+    @ApiModelProperty("放款审核结果")
+    private String loanReviewKey;
+    @ApiModelProperty("家访考察结果")
     private String homeVisit;
     @ApiModelProperty("家访考察日期")
     private String homeVisitDate;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 public interface LoanNoGuaranteeCreditReviewFeign {
 
     @ApiOperation("编辑回显、详情")
-    @PostMapping("/details")
+    @GetMapping("/details")
     @ResponseBody
     public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> details(@RequestParam("salesOrderSid") String salesOrderSid);
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java

@@ -18,7 +18,8 @@ public class LoanOrderPreloanVo implements Vo {
     private String quantity;
     @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉")
     private String confirmBtn;
-
+    @ApiModelProperty("信用审核的sid")
+    private String sid;
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java

@@ -118,5 +118,7 @@ public interface LoanSolutionsFeign {
     @PostMapping("/details2")
     ResultBean<SolutionssVo> details2(@RequestBody SolutionssQuery query);
 
-
+    @ApiOperation("查询融资放款的金额")
+    @GetMapping("/selectMoney")
+    ResultBean<PushVo> selectMoney(@RequestParam("saleOrderSid") String saleOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java

@@ -88,6 +88,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PushVo> selectMoney(String saleOrderSid) {
+        return null;
+    }
+
   /*  @Override
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(PagerQuery<LoanSolutionsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.riskcenter.api.loansolutions;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/11
+ **/
+@Data
+public class PushVo implements Vo {
+    private static final long serialVersionUID = 7612306872701336004L;
+    @ApiModelProperty("融资放款金额")
+    private String money;
+    @ApiModelProperty("厂家贴息金额")
+    private String otherReceivableMoney;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanContractPush;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
@@ -174,6 +175,13 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         }
         baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult());
         busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo());
+        if("通过".equals(dto.getCapCarefulResult())){//通过推送融资放款到应收未收
+            LoanCapitalCreditResult loanCapitalCreditResult = fetchBySid(dtoSid);
+            LoanContractPush loanContractPush = new LoanContractPush();
+            loanContractPush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
+            loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
+        }
         return rb.success();
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java

@@ -1,7 +1,9 @@
 package com.yxt.anrui.riskcenter.biz.loanfinbank;
 
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfinbank.*;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -45,6 +47,8 @@ public class LoanFinBankRest implements LoanFinBankFeign {
     private HttpServletResponse response;
     @Autowired
     private LoanFinPolicyService loanFinPolicyService;
+    @Autowired
+    private LoanFileService loanFileService;
 
     @Override
     public ResultBean<PagerVo<LoanFinBankVo>> listPage(PagerQuery<LoanFinBankQuery> pq) {
@@ -72,6 +76,12 @@ public class LoanFinBankRest implements LoanFinBankFeign {
             if (i == 0) {
                 return ResultBean.fireFail().setMessage("修改失败");
             }
+            //删除附件表中关于该linkSid的文件
+            loanFileService.deleteByLinkSid(sid);
+            List<String> finBankFiles = dto.getFinBankFiles();
+            if (!finBankFiles.isEmpty()) {
+                loanFileService.saveAll(sid, finBankFiles, LoanFileEnum.FIN_BANK.getAttachType());
+            }
             return rb.success().setMessage("修改成功");
         } else {
             //查询资方名称是否重复

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java

@@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfinbank.*;
+import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -20,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -43,6 +48,10 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private LoanFileService loanFileService;
 
     public PagerVo<LoanFinBank> listPage(PagerQuery<LoanFinBankQuery> pq) {
         LoanFinBankQuery query = pq.getParams();
@@ -104,6 +113,12 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
             entity.setCreateBySid(dto.getUserSid());
         }
         this.saveOrUpdate(entity);
+        //删除附件表中关于该linkSid的文件
+        loanFileService.deleteByLinkSid(entity.getSid());
+        List<String> finBankFiles = dto.getFinBankFiles();
+        if (!finBankFiles.isEmpty()) {
+            loanFileService.saveAll(entity.getSid(), finBankFiles, LoanFileEnum.FIN_BANK.getAttachType());
+        }
     }
 
     public LoanFinBankVo fetchByIdVo(String id) {
@@ -212,6 +227,14 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
         LoanFinBankInitVo vo = new LoanFinBankInitVo();
         LoanFinBank loanFinBank = fetchBySid(sid);
         BeanUtil.copyProperties(loanFinBank, vo);
+        //家访考察结果截图
+        List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.FIN_BANK.getAttachType());
+        fileList.removeAll(Collections.singleton(null));
+        if (!fileList.isEmpty()) {
+            List<String> finBankFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
+                    collect(Collectors.toList());
+            vo.setFinBankFiles(finBankFiles);
+        }
         return rb.success().setData(vo);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java

@@ -92,8 +92,8 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
             if (!dto.getAnnexPaths().isEmpty()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 for (String filePath : dto.getAnnexPaths()) {
-                    String path = filePath.substring(urlPrefix.length());
+                    String replace = filePath.replace(urlPrefix, "");
-                    sb.append(path).append(",");
+                    sb.append(replace).append(",");
                 }
                 sb.delete(sb.length() - 1, sb.length());
                 entity.setAnnexPath(sb.toString());
@@ -131,8 +131,8 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
             if (!dto.getAnnexPaths().isEmpty()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 for (String filePath : dto.getAnnexPaths()) {
-                    String path = filePath.substring(urlPrefix.length());
+                    String replace = filePath.replace(urlPrefix, "");
-                    sb.append(path).append(",");
+                    sb.append(replace).append(",");
                 }
                 sb.delete(sb.length() - 1, sb.length());
                 entity.setAnnexPath(sb.toString());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@@ -92,8 +92,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             if (!dto.getAnnexPaths().isEmpty()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 for (String filePath : dto.getAnnexPaths()) {
-                    String path = filePath.substring(urlPrefix.length());
+                    String replace = filePath.replace(urlPrefix, "");
-                    sb.append(path).append(",");
+                    sb.append(replace).append(",");
                 }
                 sb.delete(sb.length() - 1, sb.length());
                 entity.setAnnexPath(sb.toString());
@@ -131,8 +131,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             if (!dto.getAnnexPaths().isEmpty()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 for (String filePath : dto.getAnnexPaths()) {
-                    String path = filePath.substring(urlPrefix.length());
+                    String replace = filePath.replace(urlPrefix, "");
-                    sb.append(path).append(",");
+                    sb.append(replace).append(",");
                 }
                 sb.delete(sb.length() - 1, sb.length());
                 entity.setAnnexPath(sb.toString());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -1,31 +1,19 @@
 package com.yxt.anrui.riskcenter.biz.loannoguaranteecreditreview;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDto;
-import com.yxt.anrui.riskcenter.api.loanparameter.*;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,12 +31,6 @@ import java.util.stream.Collectors;
 @Service
 public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanNoGuaranteeCreditReviewMapper, LoanNoGuaranteeCreditReview> {
 
-    @Autowired
-    private SysUserFeign sysUserFeign;
-    @Autowired
-    private SysStaffOrgFeign sysStaffOrgFeign;
-    @Autowired
-    private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
@@ -61,12 +43,8 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
     public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> details(String salesOrderSid) {
         ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> rb = ResultBean.fireFail();
         LoanNoGuaranteeCreditReviewDetailsVo vo = new LoanNoGuaranteeCreditReviewDetailsVo();
+        vo.setSalesOrderSid(salesOrderSid);
         LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid);
-        BeanUtil.copyProperties(entity, vo);
-        String sid = "";
-        if (StringUtils.isNotBlank(entity.getSid())) {
-            sid = entity.getSid();
-        }
         BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
         if (null != busSalesOrder) {
             if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) {
@@ -79,27 +57,34 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
                 vo.setBorrowerName(borrowerDetailsVo.getBorrowerName());
             }
         }
-        //家访考察结果截图
+        if (null != entity) {
-        List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType());
+            BeanUtil.copyProperties(entity, vo);
-        fileList.removeAll(Collections.singleton(null));
+            String sid = "";
-        if (!fileList.isEmpty()) {
+            if (StringUtils.isNotBlank(entity.getSid())) {
-            List<String> homeVisitFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
+                sid = entity.getSid();
-                    collect(Collectors.toList());
+            }
-            vo.setHomeVisitFiles(homeVisitFiles);
+            //家访考察结果截图
-        }
+            List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType());
-        //信审终审结果截图
+            fileList.removeAll(Collections.singleton(null));
-        fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.CREDIT_REVIEW_FILES.getAttachType());
+            if (!fileList.isEmpty()) {
-        fileList.removeAll(Collections.singleton(null));
+                List<String> homeVisitFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
-        if (!fileList.isEmpty()) {
+                        collect(Collectors.toList());
-            List<String> creditReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+                vo.setHomeVisitFiles(homeVisitFiles);
-            vo.setCreditReviewFiles(creditReviewFiles);
+            }
-        }
+            //信审终审结果截图
-        //放款审核结果截图
+            fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.CREDIT_REVIEW_FILES.getAttachType());
-        fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType());
+            fileList.removeAll(Collections.singleton(null));
-        fileList.removeAll(Collections.singleton(null));
+            if (!fileList.isEmpty()) {
-        if (!fileList.isEmpty()) {
+                List<String> creditReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
-            List<String> loanReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+                vo.setCreditReviewFiles(creditReviewFiles);
-            vo.setLoanReviewFiles(loanReviewFiles);
+            }
+            //放款审核结果截图
+            fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType());
+            fileList.removeAll(Collections.singleton(null));
+            if (!fileList.isEmpty()) {
+                List<String> loanReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+                vo.setLoanReviewFiles(loanReviewFiles);
+            }
         }
         return rb.success().setData(vo);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -585,10 +585,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             loanOrderPreloanVo.setConfirmBtn("信用审核");
             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
         } else {
-            if ("1".equals(loanPreloanCreditApply.getState())) {
+            if (loanPreloanCreditApply.getState() == 1) {
                 loanOrderPreloanVo.setConfirmBtn("信用审核");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
-            } else if ("0".equals(loanPreloanCreditApply.getState())) {
+            } else if (loanPreloanCreditApply.getState() == 0) {
                 loanOrderPreloanVo.setConfirmBtn("我知道了");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
             } else {
@@ -599,10 +599,11 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                         if ("已办结".equals(loanCreditAppealApply.getNodeState())) {
                             return rb.success();
                         } else {
-                            loanOrderPreloanVo.setConfirmBtn("信用申诉");
+                            loanOrderPreloanVo.setConfirmBtn("我知道了");
-                            return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
+                            return rb.setData(loanOrderPreloanVo).setMsg("实际购车人信用申诉进行中，请等待！");
                         }
                     } else {
+                        loanOrderPreloanVo.setSid(loanPreloanCreditApply.getSid());
                         loanOrderPreloanVo.setConfirmBtn("信用申诉");
                         return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loansolutions;
 
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
@@ -100,6 +101,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
         return loanSolutionsService.details2(query);
     }
 
+    @Override
+    public ResultBean<PushVo> selectMoney(String saleOrderSid) {
+        return loanSolutionsService.selectMoney(saleOrderSid);
+    }
+
   /*  @Override
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(@RequestBody PagerQuery<LoanSolutionsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 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.SolutionDetailsDto;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
@@ -1782,9 +1783,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //融资票据
             StringBuilder accessoriesAmountValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getAccessoriesAmount())) {
-                if(!solutionssVo.isAccessoriesAmountCb()){
+                if (!solutionssVo.isAccessoriesAmountCb()) {
                     accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append("0");
-                }else{
+                } else {
                     accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append(solutionssVo.getAccessoriesAmount());
                 }
             } else {
@@ -1794,9 +1795,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //挂车
             StringBuilder trailerAmountValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getTrailerAmount())) {
-                if(!solutionssVo.isTrailerAmountCb()){
+                if (!solutionssVo.isTrailerAmountCb()) {
                     trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append("0");
-                }else{
+                } else {
                     trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append(solutionssVo.getTrailerAmount());
                 }
             } else {
@@ -1808,7 +1809,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (StringUtils.isNotBlank(solutionssVo.getPremium())) {
                 if (!solutionssVo.isPremiumCb()) {
                     premiumValue = premiumValue.append("\t").append("保险：").append("0");
-                }else{
+                } else {
                     premiumValue = premiumValue.append("\t").append("保险：").append(solutionssVo.getPremium());
                 }
             } else {
@@ -1818,9 +1819,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //购置税
             StringBuilder purchaseTaxValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getPurchaseTax())) {
-                if(!solutionssVo.isPurchaseTaxCb()){
+                if (!solutionssVo.isPurchaseTaxCb()) {
                     purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append("0");
-                }else{
+                } else {
                     purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append(solutionssVo.getPurchaseTax());
                 }
             } else {
@@ -2500,6 +2501,45 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         return rb.success().setData(solutionssVo);
     }
 
+    public ResultBean<PushVo> selectMoney(String saleOrderSid) {
+        ResultBean<PushVo> rb = ResultBean.fireFail();
+        PushVo pushVo = new PushVo();
+        //融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]
+        //根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；
+        // 差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
+        BigDecimal bg = BigDecimal.ZERO;
+        LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid);
+        if (loanSolutions != null) {
+            //根据产品政策sid查询
+            bg = bg.add(loanSolutions.getLoanTotal());
+            //查询融资首付
+            LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
+            if (loanSolutionsOtherpolicy != null) {
+                bg = bg.subtract(loanSolutionsOtherpolicy.getLoanDownPay());
+            }
+            //查询产品政策
+            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+            if (loanFinPolicy != null) {
+                if ("01".equals(loanFinPolicy.getBondTypeKey())) {//01固定
+                    LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+                    if (loanSolutionsDetail != null) {
+                        if (loanSolutionsDetail.getBondAmounts() != null) {
+                            bg = bg.subtract(loanSolutionsDetail.getBondAmounts());
+                        }
+                    }
+                }
+                if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {//01差额放款
+                    if (loanSolutions.getFactoryDiscount() != null) {
+                        bg = bg.subtract(loanSolutions.getFactoryDiscount());
+                        pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscountUse());
+                    }
+                }
+            }
+        }
+        pushVo.setMoney(bg.toString());
+        return rb.success().setData(pushVo);
+    }
+
 
 
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -290,7 +290,7 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<VinNoVo> getVinList(@PathVariable("saleOrderSid") String saleOrderSid);
 
-    @ApiOperation("初始化|录入车架号列表")
+    @ApiOperation("初始化|录入车架号列表2")
     @GetMapping("/init/saleOrderInputVin2/{saleOrderSid}")
     @ResponseBody
     ResultBean<VinNoVo2> getVinList2(@PathVariable("saleOrderSid") String saleOrderSid);
@@ -325,5 +325,24 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<OrderLoanVo> judgeIsLoan(@RequestParam("sid") String sid);
 
+    @ApiOperation("初始化录入贷款人列表")
+    @GetMapping("/init/saleOrderInputLender/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<InputLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("删除销售订单贷款人")
+    @DeleteMapping("/delete/saleOrderInputLender/{sid}")
+    @ResponseBody
+    ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid);
+
+    @ApiOperation("保存销售订单贷款人数量")
+    @PostMapping("/save/saleOrderInputLenderNum/{sid}/{num}")
+    @ResponseBody
+    ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid,@PathVariable("num")String num);
+
+    @ApiOperation("保存销售订单贷款人自己")
+    @PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}")
+    @ResponseBody
+    ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid);
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -290,4 +290,24 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteSaleOrderInputLender(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saleOrderInputLenderNum(String sid, String num) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/11
+ **/
+@Data
+public class InputLenderVo implements Vo {
+    private static final long serialVersionUID = -398449823642125912L;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("订单台数")
+    private Integer orderCarNum;
+    @ApiModelProperty("确认台数")
+    private Integer confirmCarNum;
+    @ApiModelProperty("是否显示自己：当贷款人没有本人时才显示，当确定的台数与总台数相同时，不允许显示")
+    private boolean showOwn;
+    @ApiModelProperty("是否显示选择按钮，当确定台数与总台数相同时，不允许显示")
+    private boolean showSelect;
+
+    private List<LenderListVo> lenderList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/11
+ **/
+@Data
+public class LenderListVo implements Vo {
+    private static final long serialVersionUID = 2316054778495509308L;
+    @ApiModelProperty("数量")
+    private String vinNum;
+    @ApiModelProperty("记录sid")
+    private String sid;
+    @ApiModelProperty("贷款人")
+    private String lenderName;
+    @ApiModelProperty("是否显示删除：没确认可以删除")
+    private boolean showDelete;
+    @ApiModelProperty("是否显示确认，没确认可以确认")
+    private boolean showConfirm;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo2.java

@@ -23,4 +23,6 @@ public class BusVinNoVo2 {
     private int viewType;
     @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
     private String groupName;
+    @ApiModelProperty("车架号的序号")
+    private String pos;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -63,4 +63,9 @@ public interface CommonFeign {
     @GetMapping("/getLoanPreloan")
     ResultBean<CarModelVo> getLoanPreloan(@RequestParam("orderSid") String orderSid);
 
+    @ApiOperation(value = "信用申诉页面")
+    @ResponseBody
+    @GetMapping("/getLoanSs")
+    ResultBean<CarModelVo> getLoanSs(@RequestParam("orderSid") String orderSid);
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
@@ -116,12 +117,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     @Override
     @ApiOperation("重新提交")
     public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
-        return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,"","","");
+        return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid, "", "", "");
     }
 
     @Override
     public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
-        return  appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile);
+        return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid, customerSid, customerName, customerMobile);
     }
 
     @Override
@@ -383,4 +384,24 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.judgeIsLoan(sid);
     }
 
+    @Override
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+        return appBusSalesOrderService.saleOrderInputLender(saleOrderSid);
+    }
+
+    @Override
+    public ResultBean deleteSaleOrderInputLender(String sid) {
+        return appBusSalesOrderService.deleteSaleOrderInputLender(sid);
+    }
+
+    @Override
+    public ResultBean saleOrderInputLenderNum(String sid, String num) {
+        return appBusSalesOrderService.saleOrderInputLenderNum(sid,num);
+    }
+
+    @Override
+    public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
+        return appBusSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuer
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.SalesLenderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
@@ -76,6 +77,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo;
@@ -733,6 +735,9 @@ public class AppBusSalesOrderService {
             if ("信用审核".equals(loanOrderPreloanVo.getConfirmBtn())) {
                 CarModelVo finPage1 = commonService.getLoanPreloan(sid).getData();
                 orderLoanVo.setPluginPage(finPage1);
+            } else if ("信用申诉".equals(loanOrderPreloanVo.getConfirmBtn())) {
+                CarModelVo finPage1 = commonService.getLoanSs(loanOrderPreloanVo.getSid()).getData();
+                orderLoanVo.setPluginPage(finPage1);
             }
             return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo);
         }
@@ -747,4 +752,25 @@ public class AppBusSalesOrderService {
         BeanUtil.copyProperties(vinVo, vinNoVo);
         return rb.success().setData(vinNoVo);
     }
+
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+        ResultBean<InputLenderVo> rb = ResultBean.fireFail();
+        InputLenderVo inputLenderVo = new InputLenderVo();
+        ResultBean<SalesLenderVo> resultBean = busSalesOrderFeign.saleOrderInputLender(saleOrderSid);
+        SalesLenderVo vinVo = resultBean.getData();
+        BeanUtil.copyProperties(vinVo, inputLenderVo);
+        return rb.success().setData(inputLenderVo);
+    }
+
+    public ResultBean deleteSaleOrderInputLender(String sid) {
+        return busSalesOrderFeign.deleteSaleOrderInputLender(sid);
+    }
+
+    public ResultBean saleOrderInputLenderNum(String sid, String num) {
+        return busSalesOrderFeign.saveBorrowNum(sid,num);
+    }
+
+    public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
+        return busSalesOrderFeign.saleOrderInputLenderOwn(saleOrderSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -63,4 +63,9 @@ public class CommonRest implements CommonFeign {
     public ResultBean<CarModelVo> getLoanPreloan(String orderSid) {
         return commonService.getLoanPreloan(orderSid);
     }
+
+    @Override
+    public ResultBean<CarModelVo> getLoanSs(String orderSid) {
+        return commonService.getLoanSs(orderSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -150,7 +150,7 @@ public class CommonService {
         AppSubVersionVo appSubVersionVo = voResultBean.getData();
         CarModelVo carModelVo = new CarModelVo();
         Map<String, Object> map = new HashMap<>();
-        map.put("creditType",0);
+        map.put("creditType", 0);
         map.put("createSource", 2);
         map.put("sourceSid", orderSid);
         appSubVersionVo.setJson(JSONObject.toJSONString(map));
@@ -171,4 +171,32 @@ public class CommonService {
         carModelVo.setARouterParamValue(aRouterParamValue);
         return rb.success().setData(carModelVo);
     }
+
+    public ResultBean<CarModelVo> getLoanSs(String orderSid) {
+        ResultBean<CarModelVo> rb = ResultBean.fireFail();
+        String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
+        String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity3";
+        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
+        AppSubVersionVo appSubVersionVo = voResultBean.getData();
+        CarModelVo carModelVo = new CarModelVo();
+        Map<String, Object> map = new HashMap<>();
+        map.put("creditType", 2);
+        map.put("sid", orderSid);
+        map.put("addNew", true);
+        appSubVersionVo.setJson(JSONObject.toJSONString(map));
+        BeanUtil.copyProperties(appSubVersionVo, carModelVo);
+        carModelVo.setRequestCode("1005");
+        carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager");
+        carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY3");
+        List<String> aRouterParamType = new ArrayList<>();
+        aRouterParamType.add("INT");
+        aRouterParamType.add("BOOLEAN");
+        List<String> aRouterParamValue = new ArrayList<>();
+        aRouterParamValue.add("2");
+        aRouterParamValue.add(orderSid);
+        aRouterParamValue.add("true");
+        carModelVo.setARouterParamType(aRouterParamType);
+        carModelVo.setARouterParamValue(aRouterParamValue);
+        return rb.success().setData(carModelVo);
+    }
 }