From e3367caa958488947142ac28524cc9047ddcbe11 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Sep 2023 14:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java | 4 ++--
 .../BusSalesOrderBorrowerFeignFallback.java                   | 4 ++--
 .../biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java  | 4 ++--
 .../bussalesorderborrower/BusSalesOrderBorrowerService.java   | 4 ++--
 .../riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java  | 2 ++
 .../loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml   | 3 ++-
 .../yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java  | 2 ++
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java
index f9fe783f86..ab30b2cc4e 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java
@@ -81,7 +81,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ResponseBody
     ResultBean updateBusNo(@RequestParam("busNo") String busNo, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
-    @ApiOperation("点击贷款人确认时弹出的数量")
+/*    @ApiOperation("点击贷款人确认时弹出的数量")
     @GetMapping("/getOrderNum")
     @ResponseBody
     ResultBean<OrderNumVo> getOrderNum(@RequestParam("sid") String sid);
@@ -89,7 +89,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ApiOperation("确认数量")
     @PostMapping("/confirmBorrow")
     @ResponseBody
-    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);
+    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);*/
 
     @ApiOperation("公司非担保业务进度维护")
     @PostMapping("/noGuaranteeCreditReviewPage")
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java
index d69c177f12..c4573bdc85 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java
@@ -75,7 +75,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 		return null;
 	}
 
-	@Override
+/*	@Override
 	public ResultBean<OrderNumVo> getOrderNum(String sid) {
 		return null;
 	}
@@ -83,7 +83,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 	@Override
 	public ResultBean confirmBorrow(OrderBorrowQuery query) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(PagerQuery<BusNoGuaranteeCreditReviewQuery> pq) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java
index d3d994a508..a90014a7fa 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java
@@ -98,7 +98,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
         return busSalesOrderBorrowerService.updateBusNo(busNo, saleOrderBorrowerSid);
     }
 
-    @Override
+  /*  @Override
     public ResultBean<OrderNumVo> getOrderNum(String sid) {
         return busSalesOrderBorrowerService.getOrderNum(sid);
     }
@@ -106,7 +106,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     public ResultBean confirmBorrow(OrderBorrowQuery query) {
         return busSalesOrderBorrowerService.confirmBorrow(query);
-    }
+    }*/
 
     @Override
     public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(PagerQuery<BusNoGuaranteeCreditReviewQuery> pq) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
index 3ed687e249..663896c8d4 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
@@ -132,7 +132,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success();
     }
 
-    public ResultBean<OrderNumVo> getOrderNum(String sid) {
+  /*  public ResultBean<OrderNumVo> getOrderNum(String sid) {
         ResultBean<OrderNumVo> rb = ResultBean.fireFail();
         OrderNumVo orderNumVo = new OrderNumVo();
         BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid);
@@ -181,7 +181,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         }
         baseMapper.insert(busSalesOrderBorrower);
         return rb.success();
-    }
+    }*/
 
     /**
      * 公司非担保业务进度维护
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java
index d549865855..23d5ff4517 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java
@@ -30,5 +30,7 @@ public class LoanPreloanVo implements Vo {
     @ApiModelProperty("申请日期")
     private String createTime;
 
+    private String sid;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml
index 8efc961183..c0cb51a35f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml
@@ -25,7 +25,8 @@
         select distinct(la.idCard),la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
         la.zffkjg,
         la.capitalName,
-        lp.peoName
+        lp.peoName,
+        la.sid
         from loan_preloan_credit_apply la
         left join loan_preloan_credit_peo lp on la.sid = lp.mainSid
         <where>
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
index 3d473a2dd9..a402829870 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
@@ -204,5 +204,7 @@ public class AppSolutionVo {
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
 
+    private String modelSid;
+
 
 }