Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@@ -65,7 +65,7 @@
           and length(bo.orderNo) > 0
           and length(bo.platformNo)
             > 0
-          and (cast(bo.platformNo as signed) - IFNULL(cast(bo.lockingNum as signed), '0')) > 0
+         <!-- and (cast(bo.platformNo as signed) - IFNULL(cast(bo.lockingNum as signed), '0')) > 0-->
     </select>
 
     <select id="getVehicleApply" resultType="com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo">

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

@@ -160,7 +160,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
         bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
-        return busSalesOrderService.complete(bv);
+        return busSalesOrderService.complete(bv,true);
     }
 
     @Override

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

@@ -2385,15 +2385,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     if (StringUtils.isNotBlank(applyListVo.getTotalNum())) {
                         //总数量
                         int totalNum = Integer.parseInt(applyListVo.getTotalNum());
-                        if (StringUtils.isNotBlank(applyListVo.getLockingNum())) {
+                        int lockNum = busSalesVehicleOrderService.selectByLinkSid1(applyListVo.getSid());
+                        //可使用数量
+                        int canUseNum = totalNum - lockNum;
+                        if(canUseNum<=0){
+                            continue;
+                        }
+                        appReadyCarVo.setCanUseNum(String.valueOf(canUseNum));
+                       /* if (StringUtils.isNotBlank(applyListVo.getLockingNum())) {
                             //采购订单锁定数量
-                            int lockNum = Integer.parseInt(applyListVo.getLockingNum());
+//                            int lockNum = Integer.parseInt(applyListVo.getLockingNum());
+                            int lockNum = busSalesVehicleOrderService.selectByLinkSid1(applyListVo.getSid());
                             //可使用数量
                             int canUseNum = totalNum - lockNum;
                             appReadyCarVo.setCanUseNum(String.valueOf(canUseNum));
                         } else {
                             appReadyCarVo.setCanUseNum(String.valueOf(totalNum));
-                        }
+                        }*/
                     } else {
                         appReadyCarVo.setCanUseNum("0");
                     }
@@ -2455,6 +2463,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 if (v.getSid().equals(v2.getSid())) {
                                     v.setTotalNum(v2.getTotalNum());
                                     v.setCanUseNum(v2.getCanUseNum());
+                                }else{
+                                    //查询该订单的总数量
+                                    int countAll = busSalesVehicleOrderService.selectByTotal(v.getSid());
+                                    int lockNum = busSalesVehicleOrderService.selectByLinkSid1(v.getSid());
+                                    //可使用数量
+                                    int canUseNum = countAll - lockNum;
+                                    if(canUseNum<=0){
+                                        canUseNum = 0;
+                                        orderInfo.setNotice("当前车型已经更新，请进行确认");
+                                    }
+                                    v.setTotalNum(String.valueOf(countAll));
+                                    v.setCanUseNum(String.valueOf(canUseNum));
                                 }
                             }
                         }
@@ -2717,15 +2737,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     if (StringUtils.isNotBlank(applyListVo.getTotalNum())) {
                         //总数量
                         int totalNum = Integer.parseInt(applyListVo.getTotalNum());
-                        if (StringUtils.isNotBlank(applyListVo.getLockingNum())) {
+                        int lockNum = busSalesVehicleOrderService.selectByLinkSid1(applyListVo.getSid());
+                        //可使用数量
+                        int canUseNum = totalNum - lockNum;
+                        if(canUseNum<=0){
+                            continue;
+                        }
+                        appReadyCarVo.setCanUseNum(String.valueOf(canUseNum));
+                        /*if (StringUtils.isNotBlank(applyListVo.getLockingNum())) {
                             //锁定数量
-                            int lockNum = Integer.parseInt(applyListVo.getLockingNum());
+//                            int lockNum = Integer.parseInt(applyListVo.getLockingNum());
+                            int lockNum = busSalesVehicleOrderService.selectByLinkSid1(applyListVo.getSid());
                             //可使用数量
                             int canUseNum = totalNum - lockNum;
                             appReadyCarVo.setCanUseNum(String.valueOf(canUseNum));
                         } else {
                             appReadyCarVo.setCanUseNum(String.valueOf(totalNum));
-                        }
+                        }*/
                     } else {
                         appReadyCarVo.setCanUseNum("0");
                     }
@@ -3315,15 +3343,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         if (StringUtils.isNotBlank(applyListVo.getTotalNum())) {
                             //总数量
                             int totalNum = Integer.parseInt(applyListVo.getTotalNum());
-                            if (StringUtils.isNotBlank(applyListVo.getLockingNum())) {
+                            int lockNum = busSalesVehicleOrderService.selectByLinkSid1(applyListVo.getSid());
+                            //可使用数量
+                            int canUseNum = totalNum - lockNum;
+                            if(canUseNum<=0){
+                                canUseNum = 0;
+                            }
+                            appReadyCarVo.setCanUseNum(String.valueOf(canUseNum));
+                            /*if (StringUtils.isNotBlank(applyListVo.getLockingNum())) {
                                 //锁定数量
-                                int lockNum = Integer.parseInt(applyListVo.getLockingNum());
+//                                int lockNum = Integer.parseInt(applyListVo.getLockingNum());
+                                int lockNum = busSalesVehicleOrderService.selectByLinkSid1(applyListVo.getSid());
                                 //可使用数量
                                 int canUseNum = totalNum - lockNum;
                                 appReadyCarVo.setCanUseNum(String.valueOf(canUseNum));
                             } else {
                                 appReadyCarVo.setCanUseNum(String.valueOf(totalNum));
-                            }
+                            }*/
                         } else {
                             appReadyCarVo.setCanUseNum("0");
                         }
@@ -3337,6 +3373,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(sid);
                 appReadyCarList.removeAll(Collections.singleton(null));
                 if (!appReadyCarList.isEmpty()) {
+                    for (int i = 0; i < appReadyCarList.size(); i++) {
+                        AppReadyCarListVo v = appReadyCarList.get(i);
+                        //查询该订单的总数量
+                        int countAll = busSalesVehicleOrderService.selectByTotal(v.getSid());
+                        int lockNum = busSalesVehicleOrderService.selectByLinkSid1(v.getSid());
+                        //可使用数量
+                        int canUseNum = countAll - lockNum;
+                        if(canUseNum<=0){
+                            isVehicleOrder = false;
+                        }
+                    }
                     //验证所选采购订单的车辆是否发生了变化
                     boolean isCheck = isCheck2(map, appReadyCarList);
                     boolean isCheck3 = isCheck3(appReadyCarList);
@@ -4840,8 +4887,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-           /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();*/
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrderOne.getType())) {
                 //更新已选择的车架号的状态为审批中
                 List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
@@ -4857,7 +4902,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
                     //查询该采购订单的已使用台数
                     int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
-                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
+//                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
                     //更新该采购订单的锁定台数
                     ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
                 }
@@ -4885,7 +4930,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             }
                             baseVehicleStateDto.setSaleOrderSid(finalBusSalesOrderOne.getSid());
                             baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
-//                            baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
                             if ("2".equals(finalBusSalesOrderOne.getPayTypeKey())) {//贷款
                                 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrderOne.getSid()).getData();
                                 if (loanSolutions != null) {
@@ -4958,29 +5002,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bv.setInstanceId(dto.getProcInsId());
             //流程定义id
             bv.setModelId(busSalesOrder.get().getProcDefId());
-           /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            return complete(bv, false);
-            AppOrderDetailsVo vo = resultBean.getData();*/
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrderOne.getType())) {
-                //更新已选择的车架号的状态为审批中
-                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
-                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
-                busMainDepositUpdateQuery.setVinSidList(list);
-                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
-                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
-                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-            }
-            if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(busSalesOrderOne.getType())) {
-                List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
-                for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
-                    String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
-                    //查询该采购订单的已使用台数
-                    int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
-                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
-                    //更新该采购订单的锁定台数
-                    ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
-                }
-            }
-            return complete(bv);
         }
         return rb;
     }
@@ -5210,7 +5232,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @param bv
      * @return
      */
-    public ResultBean complete(BusinessVariables bv) {
+    public ResultBean complete(BusinessVariables bv, boolean isTrue) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrder busSalesOrder = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = getOrderMap(busSalesOrder);
@@ -5228,6 +5250,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busSalesOrder = fetchBySid(bv.getBusinessSid());
             //极光推送
             if (!"Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                if (!isTrue) {//重新提交
+                    if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
+                        //更新已选择的车架号的状态为审批中
+                        List<String> list = busSalesOrderVehicleService.selectVehicleSid(busSalesOrder.getSid());
+                        BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                        busMainDepositUpdateQuery.setVinSidList(list);
+                        busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                        busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+                        baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+                    }
+                    if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(busSalesOrder.getType())) {
+                        List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrder.getSid());
+                        for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
+                            String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
+                            //查询该采购订单的已使用台数
+                            int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
+                            //更新该采购订单的锁定台数
+                            ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
+                        }
+                    }
+                }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -6293,7 +6336,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BeanUtil.copyProperties(orderFlowableQuery, bv);
 //        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
         bv.setModelId(busSalesOrder.getProcDefId());
-        ResultBean resultBean = complete(bv);
+        ResultBean resultBean = complete(bv, true);
         if (resultBean.getSuccess()) {
             if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType()) || (com.yxt.common.base.utils.StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
                 //更新销售订单的采购系统

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -89,4 +89,5 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
 
     List<BusSalesVehicleOrder> selectByOrderSid(String salesOrderSid);
 
+    int selectByTotal(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -82,4 +82,8 @@
     <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">
         select * from bus_sales_vehicle_order where salesOrderSid = #{salesOrderSid}
     </select>
+
+    <select id="selectByTotal" resultType="int">
+        select platformNo from anrui_base.bus_vehicle_order where sid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -202,4 +202,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         return baseMapper.selectByOrderSid(salesOrderSid);
     }
 
+    public int selectByTotal(String sid) {
+        return baseMapper.selectByTotal(sid);
+    }
 }

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

@@ -391,7 +391,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             //首次认款
             List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
             BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-            if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) {
+            if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney())?new BigDecimal(dto.getCollectionMoney()):BigDecimal.ZERO) != 0) {
                 return rb.setMsg("认款总额与收款金额不符");
             }
             List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();

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

@@ -94,7 +94,7 @@ public class LoanHomevisitFileexamineDetailsVo implements Vo {
     private List<String> carProperty;
 
     @ApiModelProperty("消贷合同编号")
-    private List<String> loanCotractNos;
+    private List<LoanXdConDetailsVo> loanXdCons;
     @ApiModelProperty("资方合同编号")
-    private List<String> bankContractNos;
+    private List<LoanZfConDetailsVo> loanZfCons;
 }

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

@@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(家访资料审核) <br/>
  * File: LoanHomevisitFileexamineDto.java <br/>
@@ -49,11 +52,50 @@ import lombok.Data;
 @ApiModel(value = "家访资料审核 数据传输对象", description = "家访资料审核 数据传输对象")
 public class LoanHomevisitFileexamineDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
-
     private String remarks;
-	@ApiModelProperty("家访考察sid")
     private String homeVisitSid;
-    @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
+
+    @ApiModelProperty("定位信息")
+    private List<String> location = new ArrayList<>();
+    @ApiModelProperty("房屋照片")
+    private List<String> house = new ArrayList<>();
+    @ApiModelProperty("门口照片")
+    private List<String> doorway = new ArrayList<>();
+    @ApiModelProperty("客厅卧室")
+    private List<String> indoor = new ArrayList<>();
+    @ApiModelProperty("合影照等")
+    private List<String> groupPhoto = new ArrayList<>();
+
+    @ApiModelProperty("贷款人身份证")
+    private List<String> lenderIdCard = new ArrayList<>();
+    @ApiModelProperty("贷款人户口本")
+    private List<String> lenderAccount = new ArrayList<>();
+    @ApiModelProperty("贷款人婚姻证明")
+    private List<String> lenderMarriageCertificate = new ArrayList<>();
+    @ApiModelProperty("贷款人驾驶本")
+    private List<String> lenderDriverBook = new ArrayList<>();
+    @ApiModelProperty("贷款人银行流水")
+    private List<String> lenderBankStatement = new ArrayList<>();
+    @ApiModelProperty("配偶身份证")
+    private List<String> spouseIdCard = new ArrayList<>();
+    @ApiModelProperty("配偶户口本")
+    private List<String> spouseAccount = new ArrayList<>();
+    @ApiModelProperty("担保人身份证")
+    private List<String> guarantorIdCard = new ArrayList<>();
+    @ApiModelProperty("担保人户口本")
+    private List<String> guarantorAccount = new ArrayList<>();
+
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages = new ArrayList<>();
+    @ApiModelProperty("房产")
+    private List<String> houseProperty = new ArrayList<>();
+    @ApiModelProperty("车辆")
+    private List<String> carProperty = new ArrayList<>();
+
+    @ApiModelProperty("消贷合同编号")
+    private List<LoanXdConDetailsDto> loanXdCons = new ArrayList<>();
+    @ApiModelProperty("资方合同编号")
+    private List<LoanZfConDetailsDto> loanZfCons = new ArrayList<>();
 }

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

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
+ * Description: 家访资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情")
+public class LoanXdConDetailsDto implements Dto {
+
+    @ApiModelProperty("消贷合同编号")
+    private String loanCotractNo;
+    @ApiModelProperty("消贷合同编号页面展示")
+    private String loanCotractNoShow;
+    @ApiModelProperty("消贷合同附件")
+    private List<String> loanCotractImages = new ArrayList<>();
+}

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

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+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: LoanHomevisitFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
+ * Description: 家访资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情")
+public class LoanXdConDetailsVo implements Vo {
+
+    @ApiModelProperty("消贷合同编号")
+    private String loanCotractNo;
+    @ApiModelProperty("消贷合同编号页面展示")
+    private String loanCotractNoShow;
+    @ApiModelProperty("消贷合同附件")
+    private List<String> loanCotractImages;
+}

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

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
+ * Description: 家访资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情")
+public class LoanZfConDetailsDto implements Dto {
+
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("资方合同编号页面展示")
+    private String bankContractNoShow;
+    @ApiModelProperty("资方合同附件")
+    private List<String> bankContractImages = new ArrayList<>();
+}

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

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+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: LoanHomevisitFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
+ * Description: 家访资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情")
+public class LoanZfConDetailsVo implements Vo {
+
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("资方合同编号页面展示")
+    private String bankContractNoShow;
+    @ApiModelProperty("资方合同附件")
+    private List<String> bankContractImages;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -191,4 +191,9 @@ public interface LoanHomevisitInvestigateFeign {
     @PostMapping("/saveAssetCertificateInfo")
     @ResponseBody
     public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZCLDto dto);
+
+    @ApiOperation("家访考察是否通过")
+    @PostMapping("/saveReportInfo")
+    @ResponseBody
+    public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -185,4 +185,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+		return null;
+	}
 }

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

@@ -32,26 +32,23 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoanco
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 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.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -78,6 +75,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
     @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
@@ -171,6 +170,224 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             this.insertByDto(dto);
             return;
         }
+        loanHomevisitInvestigateFileService.delByMainSid(dto.getHomeVisitSid());
+        //定位信息
+        for (String dwxx : dto.getLocation()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
+            if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dwxx);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //房屋照片
+        for (String fwzp : dto.getHouse()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType());
+            if (fwzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                fwzp = fwzp.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(fwzp);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //门口照片
+        for (String mkzp : dto.getDoorway()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType());
+            if (mkzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                mkzp = mkzp.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(mkzp);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //客厅卧室
+        for (String ktwszp : dto.getIndoor()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType());
+            if (ktwszp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                ktwszp = ktwszp.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(ktwszp);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //合影照等
+        for (String hyzd : dto.getGroupPhoto()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType());
+            if (hyzd.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                hyzd = hyzd.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(hyzd);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人身份证
+        for (String dkrsfz : dto.getLenderIdCard()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType());
+            if (dkrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrsfz = dkrsfz.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrsfz);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人户口本
+        for (String dkrhkb : dto.getLenderAccount()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType());
+            if (dkrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrhkb = dkrhkb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrhkb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人婚姻证明
+        for (String dkrhyzm : dto.getLenderMarriageCertificate()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType());
+            if (dkrhyzm.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrhyzm = dkrhyzm.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzm);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人驾驶本
+        for (String dkrjsb : dto.getLenderDriverBook()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType());
+            if (dkrjsb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrjsb = dkrjsb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrjsb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人银行流水
+        for (String dkryhls : dto.getLenderBankStatement()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType());
+            if (dkryhls.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkryhls = dkryhls.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkryhls);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //配偶身份证
+        for (String posfz : dto.getSpouseIdCard()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType());
+            if (posfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                posfz = posfz.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(posfz);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //配偶户口本
+        for (String pohkb : dto.getSpouseAccount()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType());
+            if (pohkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                pohkb = pohkb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(pohkb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //担保人身份证
+        for (String dbrsfz : dto.getGuarantorIdCard()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
+            if (dbrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dbrsfz = dbrsfz.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dbrsfz);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //担保人户口本
+        for (String dbrhkb : dto.getGuarantorAccount()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType());
+            if (dbrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dbrhkb = dbrhkb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dbrhkb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //银行卡
+        for (String yhk : dto.getYhkImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+            if (yhk.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(yhk);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //房产
+        for (String fc : dto.getHouseProperty()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType());
+            if (fc.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                fc = fc.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(fc);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //车辆
+        for (String cl : dto.getCarProperty()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType());
+            if (cl.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                cl = cl.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(cl);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        List<LoanXdConDetailsDto> loanXdCons = dto.getLoanXdCons();
+        List<LoanZfConDetailsDto> loanZfCons = dto.getLoanZfCons();
+        //消贷合同附件
+        for (LoanXdConDetailsDto loanXdCon : loanXdCons) {
+            List<String> loanCotractImages = loanXdCon.getLoanCotractImages();
+            for (String loanCotractImage : loanCotractImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+                loanHomevisitInvestigateFileDto.setAttachType(loanXdCon.getLoanCotractNo());
+                if (loanCotractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    loanCotractImage = loanCotractImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(loanCotractImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+        }
+        //资方合同附件
+        for (LoanZfConDetailsDto loanZfCon : loanZfCons) {
+            List<String> bankContractImages = loanZfCon.getBankContractImages();
+            for (String bankContractImage : bankContractImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
+                loanHomevisitInvestigateFileDto.setAttachType(loanZfCon.getBankContractNo());
+                if (bankContractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    bankContractImage = bankContractImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(bankContractImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+        }
         this.updateByDto(dto);
     }
 
@@ -195,19 +412,44 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid);
         BeanUtil.copyProperties(loanHomevisitFileexamine, vo);
         LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid());
+        //查询消贷合同
         List<BusSalesOrderLoancontractDetailsVo> busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData();
-		List<String> loanCotractNos = new ArrayList<>();
+        List<LoanXdConDetailsVo> loanXdConDetailsVos = new ArrayList<>();
-		List<String> bankContractNos = new ArrayList<>();
+        List<LoanZfConDetailsVo> loanZfConDetailsVos = new ArrayList<>();
         for (BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo : busSalesOrderLoancontractDetailsVos) {
-			loanCotractNos.add("消贷合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+            LoanXdConDetailsVo loanXdConDetailsVo = new LoanXdConDetailsVo();
+            List<String> loanCotractImages = new ArrayList<>();
+            LoanZfConDetailsVo loanZfConDetailsVo = new LoanZfConDetailsVo();
+            List<String> bankContractImages = new ArrayList<>();
+            //消贷合同编号
+            loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
+            loanXdConDetailsVo.setLoanCotractNoShow("消贷合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+            //消贷合同附件
+            List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
+            if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){
+                for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
+                    loanCotractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+                }
+                loanXdConDetailsVo.setLoanCotractImages(loanCotractImages);
+            }
+            //资方合同编号
             if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())) {
-				bankContractNos.add("资方合同号(暂无)");
+                loanZfConDetailsVo.setBankContractNoShow("资方合同号(暂无)");
             } else {
-				bankContractNos.add("资方合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+                loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
+                loanZfConDetailsVo.setBankContractNoShow("资方合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+                //资方合同附件
+                List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
+                if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0){
+                    for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) {
+                        bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+                    }
+                    loanZfConDetailsVo.setBankContractImages(bankContractImages);
+                }
             }
         }
-		vo.setLoanCotractNos(loanCotractNos);
+        vo.setLoanXdCons(loanXdConDetailsVos);
-		vo.setBankContractNos(bankContractNos);
+        vo.setLoanZfCons(loanZfConDetailsVos);
         //定位信息
         List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
         List<String> location = new ArrayList<>();

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

@@ -72,4 +72,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
     void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("adress") String adress);
 
     LoanHomeVisitInvestigateInitCustomerVo getHomeVisitCustomerInfo(String sid);
+
+    @Update("update loan_homevisit_investigate set state = '2',remarks = #{comment},investigateValue = #{jg} where sid = #{sid}")
+    void saveReportInfo(String comment, String jg, String sid);
 }

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

@@ -208,4 +208,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
     public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
         return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto);
     }
+
+    @Override
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+        return loanHomevisitInvestigateService.saveReportInfo(comment, agree, sid);
+    }
 }

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

@@ -720,7 +720,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //定位信息
         for (String dwxx : dto.getLocation()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
             if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -732,7 +731,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //房屋照片
         for (String fwzp : dto.getHouse()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType());
             if (fwzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -744,7 +742,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //门口照片
         for (String mkzp : dto.getDoorway()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType());
             if (mkzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -756,7 +753,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //客厅卧室
         for (String ktwszp : dto.getIndoor()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType());
             if (ktwszp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -768,7 +764,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //合影照等
         for (String hyzd : dto.getGroupPhoto()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType());
             if (hyzd.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -873,7 +868,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //贷款人身份证
         for (String dkrsfz : dto.getLenderIdCard()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType());
             if (dkrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -885,7 +879,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //贷款人户口本
         for (String dkrhkb : dto.getLenderAccount()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType());
             if (dkrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -897,7 +890,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //贷款人婚姻证明
         for (String dkrhyzm : dto.getLenderMarriageCertificate()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType());
             if (dkrhyzm.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -909,7 +901,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //贷款人驾驶本
         for (String dkrjsb : dto.getLenderDriverBook()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType());
             if (dkrjsb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -921,7 +912,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //贷款人银行流水
         for (String dkryhls : dto.getLenderBankStatement()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType());
             if (dkryhls.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -933,7 +923,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //配偶身份证
         for (String posfz : dto.getSpouseIdCard()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType());
             if (posfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -945,7 +934,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //配偶户口本
         for (String pohkb : dto.getSpouseAccount()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType());
             if (pohkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -957,7 +945,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //担保人身份证
         for (String dbrsfz : dto.getGuarantorIdCard()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
             if (dbrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -969,7 +956,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //担保人户口本
         for (String dbrhkb : dto.getGuarantorAccount()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType());
             if (dbrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1020,7 +1006,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //银行卡
         for (String yhk : dto.getYhkImages()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
             if (yhk.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1032,7 +1017,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //房产
         for (String fc : dto.getHouseProperty()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType());
             if (fc.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1044,7 +1028,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //车辆
         for (String cl : dto.getCarProperty()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType());
             if (cl.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1055,4 +1038,14 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         }
         return rb.success();
     }
+
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String jg = "不通过";
+        if (agree){
+            jg = "通过";
+        }
+        baseMapper.saveReportInfo(comment, jg, sid);
+        return rb.success();
+    }
 }

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

@@ -941,10 +941,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
             loanSolutionsDetailService.insert(loanSolutionsDetail);
         } else {
-
+            if(StringUtils.isBlank(dto.getFactoryDiscount())){
+                return rb.setMsg("厂家贴息不能为空");
+            }
             if (StringUtils.isBlank(dto.getDiscountCar())) {
                 return rb.setMsg("贴息抵车款不能为空");
             }
+            if(new BigDecimal(dto.getDiscountCar()).compareTo(new BigDecimal(dto.getFactoryDiscount()))>0){
+                return rb.setMsg("贴息抵车款金额不允许超过厂家贴息的金额");
+            }
             if (loanSolutions != null) {
                 baseMapper.deleteByOrderSid(dto.getBusSid());
                 loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -539,7 +539,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     }
                     baseVehicleDto.setVehMark(baseVehicle.getVehMark());
                     baseVehicleDto.setInsideCode(baseVehicle.getInsideCode());
+                    if(StringUtils.isNotBlank(vehicleDetailsVo.getWitPinMoney())){
                         baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
+                    }
                     baseVehicleDto.setVinNo(scmVehicleEnterlibrary.getVinNo());
                     baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid
                     baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称

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

@@ -39,6 +39,11 @@ public interface LoanHomeVisitInvestigateFeign {
     @ResponseBody
     public ResultBean saveAppointmentInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateReservationDto dto);
 
+    @ApiOperation("家访考察是否通过")
+    @PostMapping("/saveReportInfo")
+    @ResponseBody
+    public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid);
+
     @ApiOperation("初始化家访考察报告状态")
     @GetMapping("/getHomeVisitReportInfo")
     @ResponseBody
@@ -133,6 +138,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @PostMapping("/getHomeAppealList")
     @ResponseBody
     ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
+
     /****************************************流程审批******************************************/
 
     @ApiOperation("提交流程")

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

@@ -52,6 +52,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
         return loanHomeVisitInvestigateService.saveAppointmentInfo(dto);
     }
 
+    @Override
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+        return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid);
+    }
+
     @Override
     public ResultBean<AppLoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
         return loanHomeVisitInvestigateService.getHomeVisitReportInfo(sid);

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

@@ -52,7 +52,6 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVis
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
-import com.yxt.anrui.terminal.api.risk.creditreview.ShareholderDetailsVo;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery;
@@ -130,6 +129,12 @@ public class LoanHomeVisitInvestigateService {
         return rb.success();
     }
 
+    public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        loanHomevisitInvestigateFeign.saveReportInfo(comment,agree,sid);
+        return rb.success();
+    }
+
     public ResultBean<AppLoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomeVisitInvestigateInitReportStateVo data = loanHomevisitInvestigateFeign.getHomeVisitReportInfo(sid).getData();