Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -133,6 +134,4 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean deleteByVehReturn(String vinSid, String mainSid) {
         return baseVehicleOutService.deleteByVehReturn(vinSid,mainSid);
     }
-
-
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -920,11 +920,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private SalOutStock createZSSalOutStock(BaseVehicle baseVehicle, BaseVehicleOut dto, BaseVehicleOutApply appDto, String temporaryNumZc) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
-        if ("00".equals(temporaryNumZc)) {
-            salOutStock.setFBillNo(appDto.getBillNo());
-        } else {
-            salOutStock.setFBillNo(appDto.getBillNo() + "-" + temporaryNumZc);
-        }
+        salOutStock.setFBillNo(appDto.getBillNo() + "-" + temporaryNumZc);
         //日期
         salOutStock.setFDate(appDto.getSaleDate());
         //分公司id
@@ -1487,7 +1483,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             finKingDeeFeign.draftBdCustomer(bdMiddle);
         }
         //主车
-        int j = 0;
+        int j = 1;
         for (BaseVehicleZSOutDto dto : zcDtos) {
             String vinSid = dto.getVinSid();
             BaseVehicle baseVehicle1 = baseVehicleService.fetchBySid(vinSid);
@@ -1623,9 +1619,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseVehicleService.updateById(baseVehicle1);
             if (!"001".equals(payTypeKey)) {//贷款
                 try {
-                    if (j != 0) {
-                        j = j + 1;
-                    }
                     String temporaryNumZc = String.format("%02d", j);
                     //推送主车销售出库单
                     SalOutStock salOutStock = createZSSalOutStock(baseVehicle1, baseVehicleOut, baseVehicleOutApply, temporaryNumZc);
@@ -1634,7 +1627,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     String temporaryNumGcOrSz = String.format("%02d", j);
                     //推送主车对应的上装或挂车销售出库单
                     if (gcOrSzDtos.size() > 0) {
-                        SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumGcOrSz);
+                        List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
+                        for (int i1 = gcOrSzDtos.size() - 1; i1 < gcOrSzDtos.size(); i1++) {
+                            gcOrSzDtosDK.add(gcOrSzDtos.get(i1));
+                        }
+                        SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz);
                         finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
                     }
                 } catch (Exception e) {
@@ -1754,9 +1751,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
-        if (StringUtils.isNotBlank(temporaryNumGcOrSz)){
+        if (StringUtils.isNotBlank(temporaryNumGcOrSz)) {
             salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz);
-        }else {
+        } else {
             salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
         }
         //日期
@@ -2199,13 +2196,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     return rb.success();
                 }
             }
-            int j = 0;
+            int j = 1;
             for (BaseVehicleOut vehicleOut : zcDtosDK) {
                 BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid());
                 //推送主车销售出库单
-                if (j != 0) {
-                    j = j + 1;
-                }
                 String temporaryNumZc = String.format("%02d", j);
                 SalOutStock salOutStock = createZSSalOutStock(baseVehicle, vehicleOut, baseVehicleOutApply, temporaryNumZc);
                 finKingDeeFeign.draftSalOutStock(salOutStock);

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

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 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.*;
@@ -250,6 +251,11 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean<VinVo> saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid);
 
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/saleOrderInputVin2/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<VinVo2> saleOrderInputVin2(@PathVariable("saleOrderSid") String saleOrderSid);
+
     @ApiOperation("采购订单编号list")
     @GetMapping("/getList/{saleOrderSid}")
     @ResponseBody

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

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 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.*;
@@ -226,6 +227,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<String>> getList(String saleOrderSid) {
         return null;

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class VinListVo2 {
+
+    @ApiModelProperty("贷款人")
+    private String borrowName;
+    private String borrowSid;
+    private List<VinListVo> vinList;
+}

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class VinVo2 {
+
+    private String saleOrderSid;
+
+    private List<VinListVo2> vinList;
+}

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

@@ -60,7 +60,7 @@ public class BusSalesOrderLoancontractDetailsVo implements Vo {
 	@ApiModelProperty("台数")
     private Integer vehCount; // 台数
 	@ApiModelProperty("消贷合同编号")
-    private String loanCotractNo; // 消贷合同编号
+    private String loanContractNo; // 消贷合同编号
 	@ApiModelProperty("资方合同号")
     private String bankContractNo; // 资方合同号
     @ApiModelProperty("资方名称")

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

@@ -67,5 +67,7 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String temporaryName;
     @ApiModelProperty("贷款人sid")
     private String borrowerSid;
+    @ApiModelProperty("贷款人")
+    private String borrowName;
 
 }

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 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.*;
@@ -301,6 +302,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.saleOrderInputVin(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
+        return busSalesOrderService.saleOrderInputVin2(saleOrderSid);
+    }
+
     @Override
     public ResultBean<List<String>> getList(String saleOrderSid) {
         return busSalesOrderService.getList(saleOrderSid);

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

@@ -2100,12 +2100,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setShowContractBtn(false);
             }
             //ToDo:需考虑家访准备是否存在该贷款人，若存在，则不允许修改贷款人，即确定贷款人按钮不显示。
-            if(record.isShowBorrowBtn()){
+            if (record.isShowBorrowBtn()) {
                 //为现车类型且不确定车架号的，
-                if("1".equals(record.getType())){
-                    if(StringUtils.isNotBlank(record.getNowCarUnknownVinNum()) && "0".equals(record.getNowCarUnknownVinNum())){
+                if ("1".equals(record.getType())) {
+                    if (StringUtils.isNotBlank(record.getNowCarUnknownVinNum()) && !"0".equals(record.getNowCarUnknownVinNum())) {
                         record.setShowBorrowBtn(true);
-                    }else{
+                    } else {
                         record.setShowBorrowBtn(false);
                     }
                 }
@@ -7269,4 +7269,56 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success().setData(busSalesOrdersVo);
     }
+
+    public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
+        ResultBean<VinVo2> rb = ResultBean.fireFail();
+        VinVo2 vinVo = new VinVo2();
+        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid);
+        busSalesOrderVehicleList.removeAll(Collections.singleton(null));
+        List<String> borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList());
+        List<VinListVo2> vinList = new ArrayList<>();
+        for (int j = 0; j < borrowSidList.size(); j++) {
+            VinListVo2 vinListVo2 = new VinListVo2();
+            String borrowSid = borrowSidList.get(j);
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
+            String borrowName = busSalesOrderVehicle.getBorrowName();
+            vinListVo2.setBorrowName(borrowName);
+            vinListVo2.setBorrowSid(borrowSid);
+            busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
+            busSalesOrderVehicleList.removeAll(Collections.singleton(null));
+            if (!busSalesOrderVehicleList.isEmpty()) {
+                List<VinListVo> vinList2 = new ArrayList<>();
+                for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
+                    busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
+                    VinListVo vinListVo = new VinListVo();
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                        vinListVo.setLinkNo(busSalesOrderVehicle.getLinkNo());
+                    }
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                        vinListVo.setLinkSid(busSalesOrderVehicle.getLinkSid());
+                    }
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                        //根据车架号查询是否已出库
+                        ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid());
+                        if (baseVehicleResultBean.getSuccess()) {
+                            BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
+                            if (vo != null) {
+                                if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
+                                    vinListVo.setState(true);
+                                } else {
+                                    vinListVo.setState(false);
+                                }
+                            }
+                        }
+                    }
+                    vinList2.add(vinListVo);
+                }
+                vinListVo2.setVinList(vinList2);
+            }
+            vinList.add(vinListVo2);
+        }
+        vinVo.setSaleOrderSid(saleOrderSid);
+        vinVo.setVinList(vinList);
+        return rb.success().setData(vinVo);
+    }
 }

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

@@ -108,6 +108,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo, @Param("temporaryName") String temporaryName);
 
     List<BusSalesOrderVehicle> selectByOrderSid(@Param("salesOrderSid") String salesOrderSid);
+    List<BusSalesOrderVehicle> selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid);
 
     @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}")
     BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid);
@@ -149,4 +150,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
 
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
+
+    List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid);
 }

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

@@ -80,6 +80,12 @@
         where salesOrderSid = #{salesOrderSid}
     </select>
 
+    <select id="selectByOrderSid2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select *
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{salesOrderSid} and borrowerSid = #{borrowSid}
+    </select>
+
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_sales_order_vehicle bv
@@ -235,4 +241,9 @@
                  LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid
         WHERE bv.sid = #{sid}
     </select>
+
+    <select id="selectListByOrdersSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
+    </select>
 </mapper>

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

@@ -294,6 +294,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByOrderSid(saleOrderSid);
     }
 
+    public List<BusSalesOrderVehicle> selectListByOrderSid2(String saleOrderSid,String borrowSid) {
+        return baseMapper.selectByOrderSid2(saleOrderSid,borrowSid);
+    }
+
     public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
@@ -571,4 +575,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid) {
         return baseMapper.selectVinNoBySid(sid);
     }
+
+    public List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid) {
+        return baseMapper.selectListByOrdersSid(saleOrderSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamine.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine <br/>
+ * Description: 放款资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "放款资料审核", description = "放款资料审核")
+@TableName("loan_fileexamine")
+public class LoanFileexamine extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
+	@ApiModelProperty("销售订单消贷合同sid")
+    private String loanContractSid; // 销售订单消贷合同sid
+	@ApiModelProperty("资方状态")
+    private String bankState; // 资方状态
+	@ApiModelProperty("资料状态")
+    private String fileState; // 资料状态
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo <br/>
+ * Description: 放款资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "放款资料审核 视图数据详情", description = "放款资料审核 视图数据详情")
+public class LoanFileexamineDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("贷款人名称")
+    private String borrowerName;
+    @ApiModelProperty("台数")
+    private Integer num;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("车架号拼接")
+    private String vinNo;
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages;
+    @ApiModelProperty("购置税发票")
+    private List<String> gzsfpImages;
+    @ApiModelProperty("保险发票")
+    private List<String> bxfpImages;
+    @ApiModelProperty("保单")
+    private List<String> bdImages;
+    @ApiModelProperty("融资合同")
+    private List<String> rzhtImages;
+    @ApiModelProperty("资方状态")
+    private String bankState;
+    @ApiModelProperty("证明附件")
+    private List<String> zmfjImages;
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineDto.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto <br/>
+ * Description: 放款资料审核 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "放款资料审核 数据传输对象", description = "放款资料审核 数据传输对象")
+public class LoanFileexamineDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
+	@ApiModelProperty("销售订单消贷合同sid")
+    private String loanContractSid; // 销售订单消贷合同sid
+	@ApiModelProperty("资方状态")
+    private String bankState; // 资方状态
+	@ApiModelProperty("资料状态")
+    private String fileState; // 资料状态
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineFeign.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign <br/>
+ * Description: 放款资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "放款资料审核")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanFileexamine",
+        name = "anrui-riskcenter",
+        path = "v1/loanfileexamine",
+        fallback = LoanFileexamineFeignFallback.class)
+public interface LoanFileexamineFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<LoanFileexamineVo>> listPage(@RequestBody PagerQuery<LoanFileexamineQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody LoanFileexamineDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeignFallback <br/>
+ * Description: 放款资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LoanFileexamineFeignFallback implements LoanFileexamineFeign {
+
+	@Override
+	public ResultBean<PagerVo<LoanFileexamineVo>> listPage(PagerQuery<LoanFileexamineQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-riskcenter/loanfileexamine/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(LoanFileexamineDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-riskcenter/loanfileexamine/fetchDetailsBySid无法访问");
+	}
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineQuery.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery <br/>
+ * Description: 放款资料审核 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "放款资料审核 查询条件", description = "放款资料审核 查询条件")
+public class LoanFileexamineQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String saleDeptName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("贷款人名称")
+    private String loanPeoName;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("资方状态")
+    private String bankState;
+    @ApiModelProperty("资料状态")
+    private String fileState;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    private String menuUrl;
+    private String type;
+    private String names;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfileexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo <br/>
+ * Description: 放款资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "放款资料审核 视图数据对象", description = "放款资料审核 视图数据对象")
+public class LoanFileexamineVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String orgName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("资方状态")
+    private String bankState;
+    @ApiModelProperty("资料状态")
+    private String fileState;
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("台数")
+    private String num;
+    @ApiModelProperty("贷款人名称")
+    private String borrowerName;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyStateQuery.java

@@ -17,4 +17,6 @@ public class LoanFinPolicyStateQuery {
     private List<String> sidsList = new ArrayList<>();
     @ApiModelProperty("useState为1时走停用，为0时走开启")
     private String useState;
+    @ApiModelProperty("操作人用户sid")
+    private String userSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomeVisitAppealPageVo.java

@@ -7,8 +7,16 @@ import lombok.Data;
 @Data
 public class LoanHomeVisitAppealPageVo implements Vo {
 
-    @ApiModelProperty("sid")
+    @ApiModelProperty("申诉sid")
     private String sid;
+    @ApiModelProperty("考察sid")
+    private String kcSid;
+    @ApiModelProperty("审批状态")
+    private String nodeState;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("联系电话")
+    private String mobile;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
     @ApiModelProperty("销售部门名称")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java

@@ -52,8 +52,11 @@ import java.util.List;
 public class LoanHomevisitFileexamineDetailsVo implements Vo {
 
     private String sid;
+    @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("家访考察sid")
     private String homeVisitSid;
+    @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
 
     @ApiModelProperty("定位信息")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -55,5 +56,5 @@ public class LoanXdConDetailsVo implements Vo {
     @ApiModelProperty("消贷合同编号页面展示")
     private String loanCotractNoShow;
     @ApiModelProperty("消贷合同附件")
-    private List<String> loanCotractImages;
+    private List<String> loanCotractImages = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -55,5 +56,5 @@ public class LoanZfConDetailsVo implements Vo {
     @ApiModelProperty("资方合同编号页面展示")
     private String bankContractNoShow;
     @ApiModelProperty("资方合同附件")
-    private List<String> bankContractImages;
+    private List<String> bankContractImages = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java

@@ -26,6 +26,11 @@ public enum LoanAttachTypeEnum {
     CL("017", "车辆"),
     SSFJ("018", "申诉附件"),
     XSFJ("019", "信审附件"),
+    GZSFP("020", "购置税发票"),
+    BXFP("021", "保险发票"),
+    BD("022", "保单"),
+    RZ("023", "融资合同"),
+    ZMFJ("024", "证明附件"),
     ;
 
     /**

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanfileexamine;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineMapper.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineMapper <br/>
+ * Description: 放款资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface LoanFileexamineMapper extends BaseMapper<LoanFileexamine> {
+
+	//@Update("update loan_fileexamine set name=#{msg} where id=#{id}")
+	//IPage<LoanFileexamineVo> voPage(IPage<LoanFileexamine> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFileexamine> qw);
+	
+	IPage<LoanFileexamineVo> selectPageVo(IPage<LoanFileexamine> page, @Param(Constants.WRAPPER) Wrapper<LoanFileexamine> qw);
+	
+	List<LoanFileexamineVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanFileexamine> qw);
+	
+	@Select("select * from loan_fileexamine")
+	List<LoanFileexamineVo> selectListVo();
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo">
+        SELECT
+        lf.`sid`,
+        bo.`useOrgName`,
+        bo.`orgName`,
+        bo.`staffName`,
+        lf.`bankState`,
+        lf.`fileState`,
+        bl.`loanContractNo`,
+        bl.`vehCount` AS num,
+        bl.`borrowerName`,
+        bl.`bankName`,
+        bl.`policyName`,
+        bl.`bankContractNo`
+        FROM
+        loan_fileexamine lf
+        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+        ON lf.`saleOrderSid` = bo.`sid`
+        LEFT JOIN anrui_buscenter.`bus_sales_order_loancontract` bl
+        ON lf.`loanContractSid` = bl.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo">
+        SELECT * FROM loan_fileexamine
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanfileexamine;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest <br/>
+ * Description: 放款资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "放款资料审核")
+@RestController("com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest")
+@RequestMapping("v1/loanfileexamine")
+public class LoanFileexamineRest implements LoanFileexamineFeign {
+
+	@Autowired
+	private LoanFileexamineService loanFileexamineService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<LoanFileexamineVo>> listPage(@RequestBody PagerQuery<LoanFileexamineQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<LoanFileexamineVo> pv = loanFileexamineService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody LoanFileexamineDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		loanFileexamineService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		loanFileexamineService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -0,0 +1,240 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanfileexamine;
+
+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.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileFeign;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+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.vo.PagerVo;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(放款资料审核) <br/>
+ * File: LoanFileexamineService.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineService <br/>
+ * Description: 放款资料审核 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-08 09:43:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMapper, LoanFileexamine> {
+
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
+	@Autowired
+	private BusSalesOrderFeign busSalesOrderFeign;
+	@Autowired
+	private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+	@Autowired
+	private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+
+	public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
+		LoanFileexamineQuery query = pq.getParams();
+		QueryWrapper<LoanFileexamine> qw = new QueryWrapper<>();
+		qw.eq("bl.busNo",305);
+		if (StringUtils.isNotBlank(query.getMenuUrl())) {
+			//=======================
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgSidPath());
+			privilegeQuery.setMenuUrl(query.getMenuUrl());
+			privilegeQuery.setUserSid(query.getUserSid());
+			ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+			if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+				//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+				String orgSidPath = query.getOrgSidPath();
+				orgSidPath = orgSidPath + "/";
+				int i1 = orgSidPath.indexOf("/");
+				int i2 = orgSidPath.indexOf("/", i1 + 1);
+				int i3 = orgSidPath.indexOf("/", i2 + 1);
+				int i4 = orgSidPath.indexOf("/", i3 + 1);
+				String orgLevelKey = defaultIdReltBean.getData();
+				if ("1".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i1);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("2".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i2);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("3".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i3);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("4".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i4);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("5".equals(orgLevelKey)) {
+					qw.eq("bo.createBySid", query.getUserSid());
+				} else {
+					PagerVo<LoanFileexamineVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<LoanFileexamineVo> p = new PagerVo<>();
+				return p;
+			}
+		}
+		if (StringUtils.isNotBlank(query.getUseOrgName())) {
+			qw.like("bo.useOrgName", query.getUseOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getSaleDeptName())) {
+			qw.like("bo.orgName", query.getSaleDeptName());
+		}
+		if (StringUtils.isNotBlank(query.getStaffName())) {
+			qw.like("bo.staffName", query.getStaffName());
+		}
+		if (StringUtils.isNotBlank(query.getLoanContractNo())) {
+			qw.like("bl.loanContractNo", query.getLoanContractNo());
+		}
+		if (StringUtils.isNotBlank(query.getLoanPeoName())) {
+			qw.like("bl.borrowerName", query.getLoanPeoName());
+		}
+		if (StringUtils.isNotBlank(query.getBankName())) {
+			qw.like("bl.bankName", query.getBankName());
+		}
+		if (StringUtils.isNotBlank(query.getPolicyName())) {
+			qw.like("bl.policyName", query.getPolicyName());
+		}
+		if (StringUtils.isNotBlank(query.getBankContractNo())) {
+			qw.like("bl.bankContractNo", query.getBankContractNo());
+		}
+		if (StringUtils.isNotBlank(query.getBankState())) {
+			qw.like("lf.bankState", query.getBankState());
+		}
+		if (StringUtils.isNotBlank(query.getFileState())) {
+			qw.like("lf.fileState", query.getFileState());
+		}
+		IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
+		IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<LoanFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(LoanFileexamineDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(LoanFileexamineDto dto){
+		LoanFileexamine entity = new LoanFileexamine();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(LoanFileexamineDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		LoanFileexamine entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid){
+		LoanFileexamine entity = fetchBySid(sid);
+		LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData();
+		vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+		vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName());
+		vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount());
+		BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData();
+		vo.setStaffName(busSalesOrder.getStaffName());
+		List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData();
+		String vinNos = "";
+		for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+			vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ",";
+		}
+		vo.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(",")));
+		//银行卡
+		List<LoanHomevisitInvestigateFileDetailsVo> yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+		List<String> yhkImages = new ArrayList<>();
+		if (yhkVos != null && yhkVos.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) {
+				yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+			}
+		}
+		vo.setYhkImages(yhkImages);
+		//购置税发票
+		List<LoanHomevisitInvestigateFileDetailsVo> gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType());
+		List<String> gzsfpImages = new ArrayList<>();
+		if (gzsfpVos != null && gzsfpVos.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) {
+				gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+			}
+		}
+		vo.setGzsfpImages(gzsfpImages);
+		//保险发票
+		List<LoanHomevisitInvestigateFileDetailsVo> bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType());
+		List<String> bxfpImages = new ArrayList<>();
+		if (bxfpVos != null && bxfpVos.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) {
+				bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+			}
+		}
+		vo.setBxfpImages(bxfpImages);
+		return vo;
+	}
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -187,7 +187,20 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
             useDeptSid = useDeptSid + useDept.getDeptSid() + ",";
             useDeptName = useDeptName + useDept.getDeptName() + ",";
         }
-        entity.setOtherPolicyName(entity.getBankShortName() + entity.getProductTypeValue() + entity.getPeriod() + "期" + entity.getYearRatio());
+        String otherPolicyName = "";
+        if (StringUtils.isNotBlank(entity.getBankShortName())){
+            otherPolicyName = otherPolicyName + entity.getBankShortName();
+        }
+        if (StringUtils.isNotBlank(entity.getProductTypeValue())){
+            otherPolicyName = otherPolicyName + entity.getProductTypeValue();
+        }
+        if (StringUtils.isNotBlank(entity.getPeriodKey())){
+            otherPolicyName = otherPolicyName + entity.getPeriod() + "期";
+        }
+        if (entity.getMaxLoanRatio() != null){
+            otherPolicyName = otherPolicyName + entity.getMaxLoanRatio();
+        }
+        entity.setOtherPolicyName(otherPolicyName);
         entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
         entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
         baseMapper.insert(entity);
@@ -207,7 +220,20 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
             useDeptSid = useDeptSid + useDept.getDeptSid() + ",";
             useDeptName = useDeptName + useDept.getDeptName() + ",";
         }
-        entity.setOtherPolicyName(entity.getBankShortName() + entity.getProductTypeValue() + entity.getYearRatio() + entity.getPeriod());
+        String otherPolicyName = "";
+        if (StringUtils.isNotBlank(entity.getBankShortName())){
+            otherPolicyName = otherPolicyName + entity.getBankShortName();
+        }
+        if (StringUtils.isNotBlank(entity.getProductTypeValue())){
+            otherPolicyName = otherPolicyName + entity.getProductTypeValue();
+        }
+        if (StringUtils.isNotBlank(entity.getPeriodKey())){
+            otherPolicyName = otherPolicyName + entity.getPeriod() + "期";
+        }
+        if (entity.getMaxLoanRatio() != null){
+            otherPolicyName = otherPolicyName + entity.getMaxLoanRatio();
+        }
+        entity.setOtherPolicyName(otherPolicyName);
         entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
         entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
         baseMapper.updateById(entity);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -119,7 +120,11 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 BeanUtil.copyProperties(loanFinOtherPolicyDto, loanFinOtherPolicy);
                 //其它融名称=资方+产品类别+最高融资比例+期数
                 //其它融产品名称=资方简称+产品类别+期数+最高融资比例，如:中车首付贷 24 期20
-                String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 " + loanFinOtherPolicy.getMaxLoanRatio();
+                String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 ";
+                if(StringUtils.isNotBlank(loanFinOtherPolicyDto.getMaxLoanRatio())){
+                    name = name+loanFinOtherPolicy.getMaxLoanRatio()+"%";
+                }
+
                 loanFinOtherPolicy.setOtherPolicyName(name);
                 loanFinOtherPolicy.setMainPolicySid(loanFinPolicy.getSid());
                 loanFinOtherPolicy.setUseDeptSids(deptSids);
@@ -165,8 +170,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                     BeanUtil.copyProperties(loanFinOtherPolicyDto, loanFinOtherPolicy);
                     loanFinOtherPolicy.setUseDeptSids(deptSids);
                     loanFinOtherPolicy.setUseDeptNames(deptNames);
-                    //其它融名称=资方+产品类别+最高融资比例+期数
-                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue() + " " + loanFinOtherPolicy.getPeriod()+ "期 " + loanFinOtherPolicy.getMaxLoanRatio() ;
+                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 ";
+                    if(StringUtils.isNotBlank(loanFinOtherPolicyDto.getMaxLoanRatio())){
+                        name = name+loanFinOtherPolicy.getMaxLoanRatio()+"%";
+                    }
                     loanFinOtherPolicy.setOtherPolicyName(name);
                     loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
                 } else {
@@ -181,8 +188,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                     loanFinOtherPolicy.setUseOrgName(useOrgName);
                     loanFinOtherPolicy.setCreateOrgName(useOrgName);
                     loanFinOtherPolicy.setCreateBySid(dto.getUserSid());
-                    //其它融名称=资方+产品类别+最高融资比例+期数
-                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue() + " " + loanFinOtherPolicy.getPeriod()+ "期 " + loanFinOtherPolicy.getMaxLoanRatio() ;
+                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 ";
+                    if(StringUtils.isNotBlank(loanFinOtherPolicyDto.getMaxLoanRatio())){
+                        name = name+loanFinOtherPolicy.getMaxLoanRatio()+"%";
+                    }
                     loanFinOtherPolicy.setOtherPolicyName(name);
                     loanFinOtherPolicyService.insert(loanFinOtherPolicy);
                 }
@@ -278,6 +287,8 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 return rb.setMsg("选择中包含金融产品政策不存在的数据，请刷新后操作");
             }
             loanFinPolicy.setUseSate(Integer.valueOf(useState).intValue());
+            loanFinPolicy.setModifyTime(new Date());
+            loanFinPolicy.setUpdateBySid(query.getUserSid());
             baseMapper.updateById(loanFinPolicy);
             LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(sid);
             if (loanFinOtherPolicy != null) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml

@@ -80,10 +80,14 @@
     <select id="getHomeAppealList2"
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitAppealPageVo">
         SELECT la.sid,
+               la.homeVisitSid AS kcSid,
+               la.nodeState,
+               bo.`contractNo` AS contractId,
                bo.`useOrgName`,
                bo.`orgName`,
                bo.`staffName`,
                bb.`borrowerName`   AS lenderName,
+               bb.`mobile`,
                li.homeVisStaffName AS jfMember,
                li.resHomeVisDate   AS times,
                li.`remarks`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
 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.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
@@ -82,6 +84,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
     @Autowired
     private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
+    @Autowired
+    private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
 
     public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
         LoanHomevisitFileexamineQuery query = pq.getParams();
@@ -415,6 +419,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid);
         BeanUtil.copyProperties(loanHomevisitFileexamine, vo);
         LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid());
+        BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData();
         //查询消贷合同
         List<BusSalesOrderLoancontractDetailsVo> busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData();
         List<LoanXdConDetailsVo> loanXdConDetailsVos = new ArrayList<>();
@@ -425,24 +430,25 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             LoanZfConDetailsVo loanZfConDetailsVo = new LoanZfConDetailsVo();
             List<String> bankContractImages = new ArrayList<>();
             //消贷合同编号
-            loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
-            loanXdConDetailsVo.setLoanCotractNoShow("消贷合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+            loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+            loanXdConDetailsVo.setLoanCotractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getLoanContractNo() + ")");
             //消贷合同附件
-            List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
+            List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanContractNo());
             if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
                 for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
                     loanCotractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
                 }
                 loanXdConDetailsVo.setLoanCotractImages(loanCotractImages);
             }
+            loanXdConDetailsVos.add(loanXdConDetailsVo);
             //资方合同编号
             if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())) {
-                loanZfConDetailsVo.setBankContractNoShow("资方合同号(暂无)");
+                loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(暂无)");
             } else {
-                loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
-                loanZfConDetailsVo.setBankContractNoShow("资方合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+                loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+                loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getBankContractNo() + ")");
                 //资方合同附件
-                List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
+                List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanContractNo());
                 if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0) {
                     for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) {
                         bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
@@ -450,11 +456,12 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
                     loanZfConDetailsVo.setBankContractImages(bankContractImages);
                 }
             }
+            loanZfConDetailsVos.add(loanZfConDetailsVo);
         }
         vo.setLoanXdCons(loanXdConDetailsVos);
         vo.setLoanZfCons(loanZfConDetailsVos);
         //定位信息
-        List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DWXX.getAttachType());
         List<String> location = new ArrayList<>();
         if (dwxxImages != null && dwxxImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
@@ -463,7 +470,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLocation(location);
         //房屋照片
-        List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FWZP.getAttachType());
         List<String> house = new ArrayList<>();
         if (fwzpImages != null && fwzpImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) {
@@ -472,7 +479,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setHouse(house);
         //门口照片
-        List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.MKZP.getAttachType());
         List<String> doorway = new ArrayList<>();
         if (mkzpImages != null && mkzpImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) {
@@ -481,7 +488,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setDoorway(doorway);
         //客厅卧室照片
-        List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.KTWSZP.getAttachType());
         List<String> indoor = new ArrayList<>();
         if (ktwszpImages != null && ktwszpImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) {
@@ -490,7 +497,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setIndoor(indoor);
         //合影照等
-        List<LoanHomevisitInvestigateFileDetailsVo> hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.HYZD.getAttachType());
         List<String> groupPhoto = new ArrayList<>();
         if (hyzdImages != null && hyzdImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) {
@@ -499,7 +506,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setGroupPhoto(groupPhoto);
         //贷款人身份证
-        List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRSFZ.getAttachType());
         List<String> lenderIdCard = new ArrayList<>();
         if (dkrsfzImages != null && dkrsfzImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) {
@@ -508,7 +515,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLenderIdCard(lenderIdCard);
         //贷款人户口本
-        List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRHKB.getAttachType());
         List<String> lenderAccount = new ArrayList<>();
         if (dkrhkbImages != null && dkrhkbImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) {
@@ -517,7 +524,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLenderAccount(lenderAccount);
         //贷款人婚姻证明
-        List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRHYZM.getAttachType());
         List<String> lenderMarriageCertificate = new ArrayList<>();
         if (dkrhyzmImages != null && dkrhyzmImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) {
@@ -526,7 +533,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLenderMarriageCertificate(lenderMarriageCertificate);
         //贷款人驾驶本
-        List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRJSB.getAttachType());
         List<String> lenderDriverBook = new ArrayList<>();
         if (dkrjsbImages != null && dkrjsbImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) {
@@ -535,7 +542,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLenderDriverBook(lenderDriverBook);
         //贷款人银行流水
-        List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRYHLS.getAttachType());
         List<String> lenderBankStatement = new ArrayList<>();
         if (dkryhlsImages != null && dkryhlsImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) {
@@ -544,7 +551,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLenderBankStatement(lenderBankStatement);
         //配偶身份证
-        List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.POSFZ.getAttachType());
         List<String> spouseIdCard = new ArrayList<>();
         if (posfzImages != null && posfzImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) {
@@ -553,7 +560,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setSpouseIdCard(spouseIdCard);
         //配偶户口本
-        List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.POHKB.getAttachType());
         List<String> spouseAccount = new ArrayList<>();
         if (pohkbImages != null && pohkbImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) {
@@ -562,7 +569,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setSpouseAccount(spouseAccount);
         //担保人身份证
-        List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DBRSFZ.getAttachType());
         List<String> pohkbImage = new ArrayList<>();
         if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
@@ -571,7 +578,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setGuarantorIdCard(pohkbImage);
         //担保人户口本
-        List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DBRHKB.getAttachType());
         List<String> guarantorAccount = new ArrayList<>();
         if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
@@ -580,7 +587,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setGuarantorAccount(guarantorAccount);
         //银行卡
-        List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.YHK.getAttachType());
         List<String> yhkImagess = new ArrayList<>();
         if (yhkImages != null && yhkImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) {
@@ -589,7 +596,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setYhkImages(yhkImagess);
         //房产
-        List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FC.getAttachType());
         List<String> houseProperty = new ArrayList<>();
         if (fcImages != null && fcImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) {
@@ -598,7 +605,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setHouseProperty(houseProperty);
         //车辆
-        List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType());
+        List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.CL.getAttachType());
         List<String> carProperty = new ArrayList<>();
         if (clImages != null && clImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) {

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

@@ -691,7 +691,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (dto.isShowMore()) {
             String mainVehicleAmount = dto.getMainVehicleAmount();
             if (StringUtils.isBlank(mainVehicleAmount)) {
-                return rb.setMsg("主车发票价不能为空");
+//                return rb.setMsg("主车发票价不能为空");
+                return rb.setMsg("请检查金融方案计算是否已点击确定");
             }
             //是否勾选融资票据
             if (dto.isAccessoriesAmountCb()) {
@@ -834,7 +835,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             String loanInterest = dto.getLoanInterest();
             loanSolutions.setLoanInterest(StringUtils.isNotBlank(loanInterest) ? new BigDecimal(loanInterest) : BigDecimal.ZERO);
             LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy();
-            if (dto.isOtherPolicyState()) {//包含其他融
+            if (dto.isOtherPolicyState()) {//包含其它融
                 BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
                 //贷款金额
                 String otherPolicyAmount = dto.getOtherPolicyAmount();
@@ -857,29 +858,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
                         if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
                             if (maxLoanAmount.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         } else {
                             if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
                                 if (maxLoanAmount.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             } else {//maxLoanAmountRat与贷款金额作对比
                                 if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             }
                         }
                     } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
                         if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
 
                     } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
                         //根据最高融资比例计算最高融资额
                         BigDecimal maxLoanAmountRat = new BigDecimal(dto.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
                         if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
                     }
                 }
@@ -976,7 +977,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetailService.insert(loanSolutionsDetail);
         } else {
             if (StringUtils.isBlank(dto.getFactoryDiscount())) {
-                return rb.setMsg("厂家贴息不能为空");
+                return rb.setMsg("请检查金融方案计算是否已点击确定");
+//                return rb.setMsg("厂家贴息不能为空");
             }
             if (StringUtils.isBlank(dto.getDiscountCar())) {
                 return rb.setMsg("贴息抵车款不能为空");
@@ -1211,7 +1213,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         BigDecimal loanDownPay = BigDecimal.ZERO;//方案汇总融资首付
         BigDecimal downPayAmountsRatio = BigDecimal.ZERO;//实际首付比例
         BigDecimal loanAmountTotal = BigDecimal.ZERO;//总贷款金额
-        //其他融期数
+        //其它融期数
         String otherPolicyPeriod = query.getOtherPolicyPeriod();
         BigDecimal loanPayMoneyAll = BigDecimal.ZERO;
         BigDecimal vehTotalPrice = BigDecimal.ZERO;
@@ -1291,7 +1293,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (StringUtils.isNotBlank(downPayAmount)) {
             //贷款金额 = 融资项目总额-首付金额。
             loanAmount = loanTotal.subtract(new BigDecimal(downPayAmount));
-            //方案汇总融资首付 = 融资首付+首付金额-其他融贷款金额
+            //方案汇总融资首付 = 融资首付+首付金额-其它融贷款金额
             loanDownPay = loanDownPay.add(new BigDecimal(downPayAmount));
             loanAmountTotal = loanAmountTotal.add(loanAmount);
         }
@@ -1341,12 +1343,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             calculateVo.setPolicyYearRatio(policyYearRatio.toString());
             calculateVo.setLoanPayMoney(loanPayMoney.toString());
         }
-        //是否包含其他融
+        //是否包含其它融
         boolean otherPolicyState = query.isOtherPolicyState();
         if (otherPolicyState) {//包含
             otherPolicyPeriod = query.getOtherPolicyPeriod();
             if (StringUtils.isBlank(otherPolicyPeriod)) {
-                return rb.setMsg("请选择其他融");
+                return rb.setMsg("请选择其它融");
             }
             String otherPolicyYearRatio = query.getOtherPolicyYearRatio();
             if (otherPolicyYearRatio.contains("%")) {
@@ -1354,7 +1356,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             String otherPolicyAmount = query.getOtherPolicyAmount();
             if (StringUtils.isBlank(otherPolicyAmount)) {
-                return rb.setMsg("其他融贷款金额不能为空");
+                return rb.setMsg("其它融贷款金额不能为空");
             }
 
             if (StringUtils.isBlank(otherPolicyPeriod)) {
@@ -1394,29 +1396,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
                     if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
                         if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
                     } else {
                         if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
                             if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         } else {//maxLoanAmountRat与贷款金额作对比
                             if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         }
                     }
                 } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
                     if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                     }
 
                 } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
                     //根据最高融资比例计算最高融资额
                     BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
                     if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                     }
                 }
             }
@@ -2355,29 +2357,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
                         if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
                             if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         } else {
                             if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
                                 if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             } else {//maxLoanAmountRat与贷款金额作对比
                                 if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             }
                         }
                     } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
                         if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
 
                     } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
                         //根据最高融资比例计算最高融资额
                         BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
                         if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
                     }
                 }

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

@@ -42,10 +42,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -293,6 +290,11 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<VinNoVo> getVinList(@PathVariable("saleOrderSid") String saleOrderSid);
 
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/init/saleOrderInputVin2/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<VinNoVo2> getVinList2(@PathVariable("saleOrderSid") String saleOrderSid);
+
     @ApiOperation("补录车架号，选择列表")
     @PostMapping("/init/saleOrderVin")
     @ResponseBody

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

@@ -42,10 +42,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -259,6 +256,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<VinNoVo2> getVinList2(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
         return null;

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class BusVinNoVo2 {
+    @ApiModelProperty("贷款人")
+    private String borrowName;
+    private String borrowSid;
+    private List<BusVinNoVo> vinList;
+}

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class VinNoVo2 {
+
+    private String saleOrderSid;
+
+    private List<BusVinNoVo2> vinList;
+
+}

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

@@ -7,8 +7,16 @@ import lombok.Data;
 @Data
 public class AppLoanHomeVisitAppealPageVo implements Vo {
 
-    @ApiModelProperty("sid")
+    @ApiModelProperty("申诉sid")
     private String sid;
+    @ApiModelProperty("考察sid")
+    private String kcSid;
+    @ApiModelProperty("审批状态")
+    private String nodeState;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("联系电话")
+    private String mobile;
     @ApiModelProperty("分公司-销售部门-销售专员")
     private String salesName;
     @ApiModelProperty("贷款人姓名")

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

@@ -44,10 +44,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -351,6 +348,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getVinList(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<VinNoVo2> getVinList2(String saleOrderSid) {
+        return appBusSalesOrderService.getVinList2(saleOrderSid);
+    }
+
     @Override
     public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
         return appBusSalesOrderService.saleOrderVin(query);

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

@@ -46,6 +46,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto;
@@ -95,10 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.base.common.SystemVo;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
@@ -740,4 +738,13 @@ public class AppBusSalesOrderService {
         }
         return rb.success();
     }
+
+    public ResultBean<VinNoVo2> getVinList2(String saleOrderSid) {
+        ResultBean<VinNoVo2> rb = ResultBean.fireFail();
+        VinNoVo2 vinNoVo = new VinNoVo2();
+        ResultBean<VinVo2> resultBean = busSalesOrderFeign.saleOrderInputVin2(saleOrderSid);
+        VinVo2 vinVo = resultBean.getData();
+        BeanUtil.copyProperties(vinVo, vinNoVo);
+        return rb.success().setData(vinNoVo);
+    }
 }

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

@@ -371,12 +371,16 @@ public class LoanHomeVisitInvestigateService {
         for (LoanHomeVisitAppealPageVo record : records) {
             AppLoanHomeVisitAppealPageVo appealPageVo = new AppLoanHomeVisitAppealPageVo();
             appealPageVo.setSid(record.getSid());
+            appealPageVo.setKcSid(record.getKcSid());
             appealPageVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName());
             appealPageVo.setLenderName(record.getLenderName());
             appealPageVo.setJfMember(record.getJfMember());
             appealPageVo.setTimes(record.getTimes());
             appealPageVo.setRemarks(record.getRemarks());
             appealPageVo.setAppealReason(record.getAppealReason());
+            appealPageVo.setMobile(record.getMobile());
+            appealPageVo.setNodeState(record.getNodeState());
+            appealPageVo.setContractId(record.getContractId());
             appLoanHomeVisitAppealPageVos.add(appealPageVo);
         }
         v.setRecords(appLoanHomeVisitAppealPageVos);