资方信审终审通过后修改车辆业务状态中的资方终审为1

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java

@@ -48,4 +48,9 @@ public interface BaseVehicleStateFeign {
     @PostMapping("updateBusStateByBusSid")
     ResultBean updateBusStateByBusSid(@RequestParam("busVinSid") String busVinSid, @RequestParam("busState") String busState);
 
+    @ApiModelProperty("根据车辆业务sid更新资方终审状态")
+    @PostMapping("updateManageState")
+    ResultBean updateManageState(@RequestParam("busVinSid") String busSid);
+
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java

@@ -30,4 +30,6 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
 
 
     int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState);
+
+    int updateManageState(String busSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -6,6 +6,11 @@
         set busState = #{busState}
         where busSid = #{busVinSid}
     </update>
+    <update id="updateManageState">
+        update base_vehicle_state
+        set manageState = 1
+        where busSid = #{busSid}
+    </update>
     <select id="selectOnes" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
         select *
         from base_vehicle_state

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java

@@ -55,5 +55,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
         return baseVehicleStateService.updateBusStateByBusSid(busVinSid, busState);
     }
 
+    @Override
+    public ResultBean updateManageState(String busSid) {
+        return baseVehicleStateService.updateManageState(busSid);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -209,4 +209,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
         int i = baseMapper.updateBusStateByBusSid(busVinSid,busState);
         return rb.success();
     }
+
+    public ResultBean updateManageState(String busSid) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.updateManageState(busSid);
+        return rb.success();
+    }
 }

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

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

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

@@ -96,9 +96,9 @@ public interface BusSalesOrderBorrowerFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(@RequestBody PagerQuery<BusNoGuaranteeCreditReviewQuery> pq);
 
-    @ApiOperation("根据销售订单SID获取一条记录")
+    @ApiOperation("根据销售订单SID获取记录")
     @GetMapping("/fetchDetailsByOrderSid/{orderSid}")
     @ResponseBody
-    public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
+    public ResultBean<List<BusSalesOrderBorrowerDetailsVo>> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
 
 }

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

@@ -91,7 +91,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 	}
 
 	@Override
-	public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsByOrderSid(String orderSid) {
+	public ResultBean<List<BusSalesOrderBorrowerDetailsVo>> fetchDetailsByOrderSid(String orderSid) {
 		return null;
 	}
 }

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

@@ -103,5 +103,6 @@ public interface BusSalesOrderLoancontractFeign {
     @ApiOperation("推送融资放款的其他应收单应收")
     @PostMapping("/pushOtherReceivable")
     @ResponseBody
-    ResultBean pushOtherReceivable(@RequestBody LoanContractPush loanContractPush);
+    ResultBean pushOtherReceivable(@RequestBody LoanOtherReceivablePush loanOtherReceivablePush);
+
 }

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

@@ -96,7 +96,7 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	}
 
 	@Override
-	public ResultBean pushOtherReceivable(LoanContractPush loanContractPush) {
+	public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
 		return null;
 	}
 }

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

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.bussalesorderloancontract;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/27 9:37
+ */
+@Data
+public class LoanOtherReceivablePush {
+    @ApiModelProperty("借款人sid")
+    private String borrowerSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+}

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

@@ -136,4 +136,8 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<List<BusVehicleBorrowVo>> saleOrderInputLenderVins(@PathVariable("sale0rderSid") String sale0rderSid);
 
+    @ApiOperation("根据贷款人sid查询车辆")
+    @GetMapping("/selectOneByBorrowerSid")
+    @ResponseBody
+    ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
 }

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

@@ -128,4 +128,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(String borrowerSid) {
+        return null;
+    }
+
 }

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

@@ -82,8 +82,8 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
 
     IPage<BusNoGuaranteeCreditReviewVo> noGuaranteeCreditReviewPage(IPage<BusSalesOrderBorrower> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderBorrower> qw);
 
-    @Select("select * from bus_sales_order_borrower where salesOrderSid =#{orderSid}")
-    BusSalesOrderBorrower fetchDetailsByOrderSid(String orderSid);
+    @Select("select * from bus_sales_order_borrower where salesOrderSid =#{orderSid} and isDelete = 0")
+    List<BusSalesOrderBorrower> fetchDetailsByOrderSid(String orderSid);
 
     List<LenderVo> saleOrderInputLender(String saleOrderSid);
 

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

@@ -34,49 +34,60 @@
     </select>
     <select id="noGuaranteeCreditReviewPage"
             resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusNoGuaranteeCreditReviewVo">
-        SELECT bo.sid                                 AS salesOrderSid,
-               DATE_FORMAT(bo.createDate, '%Y-%m-%d') AS orderDate,
-               bo.useOrgName                          AS company,
-               bo.orgName                             AS department,
-               bo.staffName                           AS salesman,
-               bo.contractNo                          AS contractNo,
-               bor.borrowerName                       AS borrowerName,
-               bor.bankName                           AS bankName,
-               bor.mobile                             AS mobile,
-               cr.homeVisit                           AS homeVisit,
-               cr.homeVisitDate                       AS homeVisitDate,
-               cr.creditReview                        AS creditReview,
-               cr.creditReviewDate                    AS creditReviewDate,
-               cr.loanReview                          AS loanReview,
-               cr.loanReviewDate                      AS loanReviewDate,
-               cr.isLoan                              AS isLoan,
-               cr.isLoanDate                          AS isLoanDate
+        SELECT bor.sid AS salesOrderSid,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') AS orderDate,
+        bo.useOrgName AS company,
+        bo.orgName AS department,
+        bo.staffName AS salesman,
+        bo.contractNo AS contractNo,
+        bor.borrowerName AS borrowerName,
+        bor.bankName AS bankName,
+        bor.mobile AS mobile,
+        cr.homeVisit AS homeVisit,
+        cr.homeVisitDate AS homeVisitDate,
+        cr.creditReview AS creditReview,
+        cr.creditReviewDate AS creditReviewDate,
+        cr.loanReview AS loanReview,
+        cr.loanReviewDate AS loanReviewDate,
+        cr.isLoan AS isLoan,
+        cr.isLoanDate AS isLoanDate
         FROM bus_sales_order_borrower AS bor
-                 LEFT JOIN bus_sales_order AS bo ON bor.salesOrderSid = bo.sid
-                 LEFT JOIN anrui_riskcenter.loan_noguarantee_credit_review AS cr ON cr.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_order AS bo ON bor.salesOrderSid = bo.sid
+        LEFT JOIN anrui_riskcenter.loan_noguarantee_credit_review AS cr ON cr.borrowerSid = bor.sid
         <where>${ew.sqlSegment}</where>
     </select>
 
     <select id="saleOrderInputLender" resultType="com.yxt.anrui.buscenter.api.bussalesorder.LenderVo">
-        select vehCount as vinNum,sid,borrowerName as lenderName from bus_sales_order_borrower where salesOrderSid = #{saleOrderSid}
+        select vehCount as vinNum, sid, borrowerName as lenderName
+        from bus_sales_order_borrower
+        where salesOrderSid = #{saleOrderSid}
 
     </select>
 
     <select id="selectBorrow" resultType="int">
-        select count(*) from anrui_riskcenter.loan_homevisit_prep where saleOrderBorrowerSid = #{sid}
+        select count(*)
+        from anrui_riskcenter.loan_homevisit_prep
+        where saleOrderBorrowerSid = #{sid}
     </select>
 
     <select id="selectByNum" resultType="int">
-        select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{salesOrderSid}
+        select ifnull(sum(vehCount), 0)
+        from bus_sales_order_borrower
+        where salesOrderSid = #{salesOrderSid}
     </select>
 
     <select id="selectByOrderSids" resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower">
-        select * from bus_sales_order_borrower bb left join
-            bus_sales_order bo on bo.sid = bb.salesOrderSid
-        where bo.customerSid = bb.customSid and bo.sid = #{saleOrderSid}
+        select *
+        from bus_sales_order_borrower bb
+                 left join
+             bus_sales_order bo on bo.sid = bb.salesOrderSid
+        where bo.customerSid = bb.customSid
+          and bo.sid = #{saleOrderSid}
     </select>
 
     <select id="selectByCr" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
-        select * from anrui_riskcenter.loan_preloan_credit_apply where sid = #{sid}
+        select *
+        from anrui_riskcenter.loan_preloan_credit_apply
+        where sid = #{sid}
     </select>
 </mapper>

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

@@ -116,7 +116,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     }
 
     @Override
-    public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsByOrderSid(String orderSid) {
+    public ResultBean<List<BusSalesOrderBorrowerDetailsVo>> fetchDetailsByOrderSid(String orderSid) {
         return busSalesOrderBorrowerService.fetchDetailsByOrderSid(orderSid);
     }
 }

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

@@ -54,6 +54,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -149,8 +150,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success().setData(orderNumVo);
     }*/
 
-//    public ResultBean confirmBorrow(OrderBorrowQuery query) {
-    public ResultBean confirmBorrow(String saleOrderSid,String sid) {
+    //    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+    public ResultBean confirmBorrow(String saleOrderSid, String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.selectByCr(sid);
         //销售订单sid
@@ -277,12 +278,19 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return p;
     }
 
-    public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsByOrderSid(String orderSid) {
-        ResultBean<BusSalesOrderBorrowerDetailsVo> rb = ResultBean.fireFail();
-        BusSalesOrderBorrower entity = baseMapper.fetchDetailsByOrderSid(orderSid);
-        BusSalesOrderBorrowerDetailsVo vo = new BusSalesOrderBorrowerDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return rb.success().setData(vo);
+    public ResultBean<List<BusSalesOrderBorrowerDetailsVo>> fetchDetailsByOrderSid(String orderSid) {
+        ResultBean<List<BusSalesOrderBorrowerDetailsVo>> rb = ResultBean.fireFail();
+        List<BusSalesOrderBorrowerDetailsVo> list = new ArrayList<>();
+        List<BusSalesOrderBorrower> entity = baseMapper.fetchDetailsByOrderSid(orderSid);
+        entity.removeAll(Collections.singleton(null));
+        if (!entity.isEmpty()) {
+            for (BusSalesOrderBorrower busSalesOrderBorrower : entity) {
+                BusSalesOrderBorrowerDetailsVo vo = new BusSalesOrderBorrowerDetailsVo();
+                BeanUtil.copyProperties(busSalesOrderBorrower, vo);
+                list.add(vo);
+            }
+        }
+        return rb.success().setData(list);
     }
 
     public List<LenderVo> saleOrderInputLender(String saleOrderSid) {

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

@@ -125,7 +125,7 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
 	}
 
 	@Override
-	public ResultBean pushOtherReceivable(LoanContractPush loanContractPush) {
-		return busSalesOrderLoancontractService.pushOtherReceivable(loanContractPush);
+	public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
+		return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush);
 	}
 }

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

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
@@ -337,13 +338,15 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         return rb.success();
     }
 
-    public ResultBean pushOtherReceivable(LoanContractPush loanContractPush) {
+    public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
         ResultBean rb = ResultBean.fireFail();
-        String saleOrderSid = loanContractPush.getSaleOrderSid();
-        // String loanContractSid = loanContractPush.getLoanContractSid();
+        String saleOrderSid = loanOtherReceivablePush.getSaleOrderSid();
+        String borrowerSid = loanOtherReceivablePush.getBorrowerSid();
         BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(saleOrderSid);
+//        //根据消贷合同查询贷款人
+//        BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
         if (null != salesOrder) {
-            BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerService.fetchDetailsByOrderSid(saleOrderSid).getData();
+            BusSalesOrderBorrower borrowerDetailsVo = busSalesOrderBorrowerService.fetchBySid(borrowerSid);
             if (null != borrowerDetailsVo) {
                 //-----------获取其他应收单对象----------------
                 CapitalCreditResult creditResult = new CapitalCreditResult();

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

@@ -143,5 +143,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.saleOrderInputLenderVins(sale0rderSid);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(String borrowerSid) {
+        return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid);
+    }
+
 
 }

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

@@ -603,6 +603,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     }
 
     public BusSalesOrderVehicle selectBySidAndOrderBo(String saleOrderSid, String pos) {
-        return baseMapper.selectBySidAndOrderBo(saleOrderSid,pos);
+        return baseMapper.selectBySidAndOrderBo(saleOrderSid, pos);
+    }
+
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(String borrowerSid) {
+        ResultBean<BusSalesOrderVehicle> rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid(borrowerSid);
+        return rb.success().setData(busSalesOrderVehicle);
     }
 }

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

@@ -15,8 +15,8 @@ import lombok.Data;
 @ApiModel(value = "公司非担保业务进度维护", description = "公司非担保业务进度维护")
 @TableName("loan_noguarantee_credit_review")
 public class LoanNoGuaranteeCreditReview extends BaseEntity {
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
+    @ApiModelProperty("贷款人sid")
+    private String borrowerSid;
     @ApiModelProperty("家访考察结果")
     private String homeVisit;
     @ApiModelProperty("家访考察结果")

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

@@ -29,8 +29,15 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
+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.buscenter.api.bussalesorderloancontract.LoanContractPush;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanOtherReceivablePush;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
@@ -82,6 +89,10 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
 
     public PagerVo<LoanCapitalCreditResultVo> listPageVo(PagerQuery<LoanCapitalCreditResultQuery> pq) {
         LoanCapitalCreditResultQuery query = pq.getParams();
@@ -170,19 +181,32 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             return rb.success();
         }
         List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(dtoSid, LoanAttachTypeEnum.XSFJ.getAttachType());
-        if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0){
+        if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0) {
             return rb.setMsg("请上传附件");
         }
         baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult());
         busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo());
-        if("通过".equals(dto.getCapCarefulResult())){//通过推送融资放款到应收未收
+        if ("通过".equals(dto.getCapCarefulResult())) {//通过推送融资放款到应收未收
             LoanCapitalCreditResult loanCapitalCreditResult = fetchBySid(dtoSid);
             LoanContractPush loanContractPush = new LoanContractPush();
+            LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
             loanContractPush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
             loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
+            loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            String borrowerSid = "";
+            if (loancontractDetailsVo != null) {
+                loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
+                borrowerSid = loancontractDetailsVo.getBorrowerSid();
+            }
             ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
-            ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanContractPush);
+            ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
+            //资方信审终审通过后修改车辆业务状态中的资方终审为1.
+            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+            if (busSalesOrderVehicle.getData() != null) {
+                ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
+            }
         }
         return rb.success();
     }

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

@@ -21,6 +21,6 @@ import org.apache.ibatis.annotations.Select;
 public interface LoanNoGuaranteeCreditReviewMapper extends BaseMapper<LoanNoGuaranteeCreditReview> {
 
 
-    @Select("SELECT * FROM loan_noguarantee_credit_review WHERE salesOrderSid = #{salesOrderSid}")
-    LoanNoGuaranteeCreditReview selectOneByOrderSid(String salesOrderSid);
+    @Select("SELECT * FROM loan_noguarantee_credit_review WHERE borrowerSid = #{salesOrderSid}")
+    LoanNoGuaranteeCreditReview selectOneByBorrowerSid(String salesOrderSid);
 }

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

@@ -1,12 +1,16 @@
 package com.yxt.anrui.riskcenter.biz.loannoguaranteecreditreview;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanContractPush;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanOtherReceivablePush;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview;
@@ -44,23 +48,28 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
 
     public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> details(String salesOrderSid) {
         ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> rb = ResultBean.fireFail();
         LoanNoGuaranteeCreditReviewDetailsVo vo = new LoanNoGuaranteeCreditReviewDetailsVo();
         vo.setSalesOrderSid(salesOrderSid);
-        LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid);
-        BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
-        if (null != busSalesOrder) {
-            if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) {
-                vo.setSalesman(busSalesOrder.getStaffName());
-            }
-        }
-        BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
+        LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByBorrowerSid(salesOrderSid);
+        BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(salesOrderSid).getData();
         if (null != borrowerDetailsVo) {
             if (StringUtils.isNotBlank(borrowerDetailsVo.getBorrowerName())) {
                 vo.setBorrowerName(borrowerDetailsVo.getBorrowerName());
             }
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(borrowerDetailsVo.getSalesOrderSid()).getData();
+            if (null != busSalesOrder) {
+                if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) {
+                    vo.setSalesman(busSalesOrder.getStaffName());
+                }
+            }
+
         }
         if (null != entity) {
             BeanUtil.copyProperties(entity, vo);
@@ -97,10 +106,11 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveReviewInfo(LoanNoGuaranteeCreditReviewDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
-        String salesOrderSid = dto.getSalesOrderSid();
-        LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid);
+        String borrowerSid = dto.getSalesOrderSid();
+        LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByBorrowerSid(borrowerSid);
         if (null != entity) {
             BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setBorrowerSid(borrowerSid);
             baseMapper.updateById(entity);
             String sid = entity.getSid();
             //删除附件表中关于该linkSid的文件
@@ -117,9 +127,31 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             if (!loanReviewFiles.isEmpty()) {
                 loanFileService.saveAll(sid, loanReviewFiles, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType());
             }
+            //推送其他应收单
+            LoanNoGuaranteeCreditReview creditReview = fetchBySid(sid);
+            if (null != creditReview) {
+                if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
+                    if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(entity.getCreditReview())) {
+                        BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
+                        if (null != borrowerDetailsVo) {
+                            //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
+                            LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
+                            loanOtherReceivablePush.setBorrowerSid(creditReview.getBorrowerSid());
+                            loanOtherReceivablePush.setSaleOrderSid(borrowerDetailsVo.getSalesOrderSid());
+                            ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
+                        }
+                        //资方信审终审通过后修改车辆业务状态中的资方终审为1.
+                        ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+                        if (busSalesOrderVehicle.getData() != null) {
+                            ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
+                        }
+                    }
+                }
+            }
         } else {
             LoanNoGuaranteeCreditReview loanNoGuaranteeCreditReview = new LoanNoGuaranteeCreditReview();
             BeanUtil.copyProperties(dto, loanNoGuaranteeCreditReview, "id", "sid");
+            loanNoGuaranteeCreditReview.setBorrowerSid(borrowerSid);
             baseMapper.insert(loanNoGuaranteeCreditReview);
             String sid = loanNoGuaranteeCreditReview.getSid();
             //删除附件表中关于该linkSid的文件
@@ -141,15 +173,24 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             if (null != creditReview) {
                 if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
                     if ("通过".equals(creditReview.getCreditReview())) {
-                        //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
-                        LoanContractPush loanContractPush = new LoanContractPush();
-                        loanContractPush.setSaleOrderSid(creditReview.getSalesOrderSid());
-                        ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanContractPush);
+                        BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
+                        if (null != borrowerDetailsVo) {
+                            //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
+                            LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
+                            loanOtherReceivablePush.setBorrowerSid(creditReview.getBorrowerSid());
+                            loanOtherReceivablePush.setSaleOrderSid(borrowerDetailsVo.getSalesOrderSid());
+                            ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
+                        }
+                        //资方信审终审通过后修改车辆业务状态中的资方终审为1.
+                        ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+                        if (busSalesOrderVehicle.getData() != null) {
+                            ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
+                        }
                     }
                 }
             }
 
         }
-        return rb.success().setData(salesOrderSid);
+        return rb.success().setData(borrowerSid);
     }
 }