From 6d81e676e047ebc0406162bf63eedea569dc88f6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 11 Sep 2023 16:15:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/api/bussalesorder/BusSalesOrderFeign.java | 4 ++-- .../buscenter/api/bussalesorder/app/vin/VinListVo2.java | 2 ++ .../biz/bussalesorder/BusSalesOrderService.java | 9 +++++++-- .../api/autoservice/saleOrders/vininput/BusVinNoVo2.java | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 7e7b397929..bd344a3c1a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -183,7 +183,7 @@ public interface BusSalesOrderFeign { @ApiOperation("重新发起") @GetMapping("/rePublishSaleOrder") @ResponseBody - public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid")String saleOrderSid,@RequestParam(value = "customerSid",required = false)String customerSid,@RequestParam(value = "customerName",required = false)String customerName,@RequestParam(value = "customerMobile",required = false)String customerMobile) throws InvocationTargetException, IllegalAccessException; + public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "customerSid", required = false) String customerSid, @RequestParam(value = "customerName", required = false) String customerName, @RequestParam(value = "customerMobile", required = false) String customerMobile) throws InvocationTargetException, IllegalAccessException; /** * 新增保存销售订单信息 @@ -350,5 +350,5 @@ public interface BusSalesOrderFeign { @ApiOperation("根据销售订单查询销售订单相关表") @GetMapping("/getSalesOrderOne") @ResponseBody - ResultBean getSalesOrderOne(@RequestParam("sid")String sid); + ResultBean getSalesOrderOne(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java index 9db00248a3..e655245c34 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java @@ -22,4 +22,6 @@ public class VinListVo2 { private int viewType; @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人") private String groupName; + + private String pos; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a629438247..a88eeb1969 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -7286,12 +7286,15 @@ public class BusSalesOrderService extends MybatisBaseService borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList()); List vinList = new ArrayList<>(); + int pos = 0; for (int j = 0; j < borrowSidList.size(); j++) { VinListVo2 vinListVo2 = new VinListVo2(); String borrowSid = borrowSidList.get(j); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j); if (type == 1) { vinListVo2.setViewType(0); + pos = pos + 1; + vinListVo2.setPos(String.valueOf(pos)); } else if (type == 2) { vinListVo2.setViewType(1); String borrowName = busSalesOrderVehicle.getBorrowName(); @@ -7302,9 +7305,9 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 11 Sep 2023 16:56:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCapitalCreditResultService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index d5c1700fd9..cc6a7cbf12 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -227,4 +227,8 @@ public class LoanCapitalCreditResultService extends MybatisBaseService Date: Mon, 11 Sep 2023 16:57:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanpreloancreditapply/LoanPreloanCreditApplyService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 0d0948a510..716cc72e5c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -585,10 +585,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService