From 5b6f1abab25ffdc12309d81f552b811079cdf899 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 8 Sep 2023 11:52:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E8=BD=A6=E6=9E=B6=E5=8F=B72?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 6 ++ .../BusSalesOrderFeignFallback.java | 6 ++ .../api/bussalesorder/app/vin/VinListVo2.java | 20 +++++++ .../api/bussalesorder/app/vin/VinVo2.java | 18 ++++++ .../BusSalesOrderVehicle.java | 2 + .../biz/bussalesorder/BusSalesOrderRest.java | 6 ++ .../bussalesorder/BusSalesOrderService.java | 60 +++++++++++++++++-- .../BusSalesOrderVehicleMapper.java | 3 + .../BusSalesOrderVehicleMapper.xml | 11 ++++ .../BusSalesOrderVehicleService.java | 8 +++ .../loansolutions/LoanSolutionsService.java | 42 ++++++------- .../saleOrders/AppBusSalesOrderFeign.java | 5 ++ .../AppBusSalesOrderFeignFallback.java | 5 ++ .../saleOrders/vininput/BusVinNoVo2.java | 19 ++++++ .../saleOrders/vininput/VinNoVo2.java | 19 ++++++ .../saleOrders/AppBusSalesOrderRest.java | 10 ++-- .../saleOrders/AppBusSalesOrderService.java | 15 +++-- 17 files changed, 222 insertions(+), 33 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo2.java 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 34777eef46..7e7b397929 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 @@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; @@ -250,6 +251,11 @@ public interface BusSalesOrderFeign { @ResponseBody ResultBean saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid); + @ApiOperation("初始化|录入车架号列表") + @GetMapping("/saleOrderInputVin2/{saleOrderSid}") + @ResponseBody + ResultBean saleOrderInputVin2(@PathVariable("saleOrderSid") String saleOrderSid); + @ApiOperation("采购订单编号list") @GetMapping("/getList/{saleOrderSid}") @ResponseBody diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 83b192a8c5..6fa0ae63dc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; @@ -226,6 +227,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { return null; } + @Override + public ResultBean saleOrderInputVin2(String saleOrderSid) { + return null; + } + @Override public ResultBean> getList(String saleOrderSid) { return null; 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 new file mode 100644 index 0000000000..5af500dc70 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/8 + **/ +@Data +public class VinListVo2 { + + @ApiModelProperty("贷款人") + private String borrowName; + private String borrowSid; + private List vinList; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo2.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo2.java new file mode 100644 index 0000000000..1fee744d26 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo2.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/8 + **/ +@Data +public class VinVo2 { + + private String saleOrderSid; + + private List vinList; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java index 02628a22a8..2b871cd6eb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java @@ -67,5 +67,7 @@ public class BusSalesOrderVehicle extends BaseEntity { private String temporaryName; @ApiModelProperty("贷款人sid") private String borrowerSid; + @ApiModelProperty("贷款人") + private String borrowName; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index a947db99d9..073274ef41 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; @@ -301,6 +302,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return busSalesOrderService.saleOrderInputVin(saleOrderSid); } + @Override + public ResultBean saleOrderInputVin2(String saleOrderSid) { + return busSalesOrderService.saleOrderInputVin2(saleOrderSid); + } + @Override public ResultBean> getList(String saleOrderSid) { return busSalesOrderService.getList(saleOrderSid); 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 f16bcbadbd..78c12c7d59 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 @@ -2100,12 +2100,12 @@ public class BusSalesOrderService extends MybatisBaseService saleOrderInputVin2(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + VinVo2 vinVo = new VinVo2(); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid); + busSalesOrderVehicleList.removeAll(Collections.singleton(null)); + List borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList()); + List vinList = new ArrayList<>(); + for (int j = 0; j < borrowSidList.size(); j++) { + VinListVo2 vinListVo2 = new VinListVo2(); + String borrowSid = borrowSidList.get(j); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j); + String borrowName = busSalesOrderVehicle.getBorrowName(); + vinListVo2.setBorrowName(borrowName); + vinListVo2.setBorrowSid(borrowSid); + busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid); + busSalesOrderVehicleList.removeAll(Collections.singleton(null)); + if (!busSalesOrderVehicleList.isEmpty()) { + List vinList2 = new ArrayList<>(); + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + VinListVo vinListVo = new VinListVo(); + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + vinListVo.setLinkNo(busSalesOrderVehicle.getLinkNo()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) { + vinListVo.setLinkSid(busSalesOrderVehicle.getLinkSid()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) { + //根据车架号查询是否已出库 + ResultBean baseVehicleResultBean = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid()); + if (baseVehicleResultBean.getSuccess()) { + BaseVehicleSelectVo vo = baseVehicleResultBean.getData(); + if (vo != null) { + if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) { + vinListVo.setState(true); + } else { + vinListVo.setState(false); + } + } + } + } + vinList2.add(vinListVo); + } + vinListVo2.setVinList(vinList2); + } + vinList.add(vinListVo2); + } + vinVo.setSaleOrderSid(saleOrderSid); + vinVo.setVinList(vinList); + return rb.success().setData(vinVo); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index c34c43ed01..6ed93329c1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -108,6 +108,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectByOrderSid(@Param("salesOrderSid") String salesOrderSid); + List selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid); @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}") BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid); @@ -149,4 +150,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectListByOrdersSid(String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 533f314313..e4beae389d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -80,6 +80,12 @@ where salesOrderSid = #{salesOrderSid} + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index bab630adf1..ea35893f08 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -294,6 +294,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectListByOrderSid2(String saleOrderSid,String borrowSid) { + return baseMapper.selectByOrderSid2(saleOrderSid,borrowSid); + } + public ResultBean> appVehicleQKKPList2(BusVehicleQKKPQuery query) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); @@ -571,4 +575,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectListByOrdersSid(String saleOrderSid) { + return baseMapper.selectListByOrdersSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index a5663af52f..7a77592672 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -834,7 +834,7 @@ public class LoanSolutionsService extends MybatisBaseService getVinList(@PathVariable("saleOrderSid") String saleOrderSid); + @ApiOperation("初始化|录入车架号列表") + @GetMapping("/init/saleOrderInputVin2/{saleOrderSid}") + @ResponseBody + ResultBean getVinList2(@PathVariable("saleOrderSid") String saleOrderSid); + @ApiOperation("补录车架号，选择列表") @PostMapping("/init/saleOrderVin") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index e1090ac477..1736339267 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -259,6 +259,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { return null; } + @Override + public ResultBean getVinList2(String saleOrderSid) { + return null; + } + @Override public ResultBean> saleOrderVin(PagerQuery query) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo2.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo2.java new file mode 100644 index 0000000000..afff5ac201 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo2.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/8 + **/ +@Data +public class BusVinNoVo2 { + @ApiModelProperty("贷款人") + private String borrowName; + private String borrowSid; + private List vinList; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo2.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo2.java new file mode 100644 index 0000000000..c22f4610c2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo2.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/8 + **/ +@Data +public class VinNoVo2 { + + private String saleOrderSid; + + private List vinList; + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 057b01d1e8..7ca7bfe3fd 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -44,10 +44,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -351,6 +348,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.getVinList(saleOrderSid); } + @Override + public ResultBean getVinList2(String saleOrderSid) { + return appBusSalesOrderService.getVinList2(saleOrderSid); + } + @Override public ResultBean> saleOrderVin(PagerQuery query) { return appBusSalesOrderService.saleOrderVin(query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 952735efbd..4f0f721825 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto; @@ -95,10 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*; import com.yxt.anrui.terminal.api.base.common.CarModelVo; import com.yxt.anrui.terminal.api.base.common.SystemVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; @@ -740,4 +738,13 @@ public class AppBusSalesOrderService { } return rb.success(); } + + public ResultBean getVinList2(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + VinNoVo2 vinNoVo = new VinNoVo2(); + ResultBean resultBean = busSalesOrderFeign.saleOrderInputVin2(saleOrderSid); + VinVo2 vinVo = resultBean.getData(); + BeanUtil.copyProperties(vinVo, vinNoVo); + return rb.success().setData(vinNoVo); + } } \ No newline at end of file From 0d6950385a4234ba2ccd40c9eab0a185d043b4c1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 8 Sep 2023 11:55:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 7a77592672..d1ead49eb8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -691,7 +691,8 @@ public class LoanSolutionsService extends MybatisBaseService Date: Fri, 8 Sep 2023 14:11:28 +0800 Subject: [PATCH 3/7] =?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/loanfinpolicy/LoanFinPolicyStateQuery.java | 2 ++ .../riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java | 3 +++ .../api/autoservice/saleOrders/AppBusSalesOrderFeign.java | 5 +---- .../saleOrders/AppBusSalesOrderFeignFallback.java | 5 +---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyStateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyStateQuery.java index c9ffaa582d..e07b9bdf24 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyStateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyStateQuery.java @@ -17,4 +17,6 @@ public class LoanFinPolicyStateQuery { private List sidsList = new ArrayList<>(); @ApiModelProperty("useState为1时走停用，为0时走开启") private String useState; + @ApiModelProperty("操作人用户sid") + private String userSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 12f4bd653c..a102336e8d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -278,6 +279,8 @@ public class LoanFinPolicyService extends MybatisBaseService Date: Fri, 8 Sep 2023 14:40:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanfinpolicy/LoanFinPolicyService.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index a102336e8d..577d3dc4b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -120,7 +120,11 @@ public class LoanFinPolicyService extends MybatisBaseService Date: Fri, 8 Sep 2023 15:37:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutRest.java | 3 +- .../basevehicleout/BaseVehicleOutService.java | 26 +- .../api/loanfileexamine/LoanFileexamine.java | 62 +++++ .../LoanFileexamineDetailsVo.java | 82 ++++++ .../loanfileexamine/LoanFileexamineDto.java | 63 +++++ .../loanfileexamine/LoanFileexamineFeign.java | 78 ++++++ .../LoanFileexamineFeignFallback.java | 72 ++++++ .../loanfileexamine/LoanFileexamineQuery.java | 79 ++++++ .../loanfileexamine/LoanFileexamineVo.java | 76 ++++++ .../LoanHomevisitFileexamineDetailsVo.java | 3 + .../LoanAttachTypeEnum.java | 5 + .../LoanFileexamineMapper.java | 65 +++++ .../loanfileexamine/LoanFileexamineMapper.xml | 37 +++ .../loanfileexamine/LoanFileexamineRest.java | 100 ++++++++ .../LoanFileexamineService.java | 240 ++++++++++++++++++ .../LoanFinOtherPolicyService.java | 30 ++- .../LoanHomevisitFileexamineService.java | 11 +- 17 files changed, 1009 insertions(+), 23 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index 16645ad19d..6c72fecbb5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -133,6 +134,4 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { public ResultBean deleteByVehReturn(String vinSid, String mainSid) { return baseVehicleOutService.deleteByVehReturn(vinSid,mainSid); } - - } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 7ceda7bb43..3e6d9ca19c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -920,11 +920,7 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { - SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumGcOrSz); + List gcOrSzDtosDK = new ArrayList<>(); + for (int i1 = gcOrSzDtos.size() - 1; i1 < gcOrSzDtos.size(); i1++) { + gcOrSzDtosDK.add(gcOrSzDtos.get(i1)); + } + SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz); finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); } } catch (Exception e) { @@ -1754,9 +1751,9 @@ public class BaseVehicleOutService extends MybatisBaseService gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) { SalOutStock salOutStock = new SalOutStock(); //单据编号 - if (StringUtils.isNotBlank(temporaryNumGcOrSz)){ + if (StringUtils.isNotBlank(temporaryNumGcOrSz)) { salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz); - }else { + } else { salOutStock.setFBillNo(baseVehicleOutApply.getBillNo()); } //日期 @@ -2199,13 +2196,10 @@ public class BaseVehicleOutService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamine.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核", description = "放款资料审核") +@TableName("loan_fileexamine") +public class LoanFileexamine extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; // 销售订单sid + @ApiModelProperty("销售订单消贷合同sid") + private String loanContractSid; // 销售订单消贷合同sid + @ApiModelProperty("资方状态") + private String bankState; // 资方状态 + @ApiModelProperty("资料状态") + private String fileState; // 资料状态 + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java new file mode 100644 index 0000000000..16d792809c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo
+ * Description: 放款资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 视图数据详情", description = "放款资料审核 视图数据详情") +public class LoanFileexamineDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("消贷合同编号") + private String loanContractNo; + @ApiModelProperty("贷款人名称") + private String borrowerName; + @ApiModelProperty("台数") + private Integer num; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("车架号拼接") + private String vinNo; + @ApiModelProperty("银行卡") + private List yhkImages; + @ApiModelProperty("购置税发票") + private List gzsfpImages; + @ApiModelProperty("保险发票") + private List bxfpImages; + @ApiModelProperty("保单") + private List bdImages; + @ApiModelProperty("融资合同") + private List rzhtImages; + @ApiModelProperty("资方状态") + private String bankState; + @ApiModelProperty("证明附件") + private List zmfjImages; + @ApiModelProperty("备注") + private String remarks; +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java new file mode 100644 index 0000000000..41bd7dd965 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto
+ * Description: 放款资料审核 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 数据传输对象", description = "放款资料审核 数据传输对象") +public class LoanFileexamineDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; // 销售订单sid + @ApiModelProperty("销售订单消贷合同sid") + private String loanContractSid; // 销售订单消贷合同sid + @ApiModelProperty("资方状态") + private String bankState; // 资方状态 + @ApiModelProperty("资料状态") + private String fileState; // 资料状态 + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java new file mode 100644 index 0000000000..a13b6b15c2 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineFeign.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "放款资料审核") +@FeignClient( + contextId = "anrui-riskcenter-LoanFileexamine", + name = "anrui-riskcenter", + path = "v1/loanfileexamine", + fallback = LoanFileexamineFeignFallback.class) +public interface LoanFileexamineFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody LoanFileexamineDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java new file mode 100644 index 0000000000..aeaf09fb41 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeignFallback
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class LoanFileexamineFeignFallback implements LoanFileexamineFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-riskcenter/loanfileexamine/listPage无法访问"); + } + + @Override + public ResultBean save(LoanFileexamineDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-riskcenter/loanfileexamine/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java new file mode 100644 index 0000000000..221f635e63 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineQuery.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery
+ * Description: 放款资料审核 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 查询条件", description = "放款资料审核 查询条件") +public class LoanFileexamineQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("销售部门名称") + private String saleDeptName; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("消贷合同编号") + private String loanContractNo; + @ApiModelProperty("贷款人名称") + private String loanPeoName; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("金融产品名称") + private String policyName; + @ApiModelProperty("资方合同号") + private String bankContractNo; + @ApiModelProperty("资方状态") + private String bankState; + @ApiModelProperty("资料状态") + private String fileState; + @ApiModelProperty("组织全路径") + private String orgSidPath; + private String menuUrl; + private String type; + private String names; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java new file mode 100644 index 0000000000..9b66a7d8d7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo
+ * Description: 放款资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 视图数据对象", description = "放款资料审核 视图数据对象") +public class LoanFileexamineVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("销售部门名称") + private String orgName; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("资方状态") + private String bankState; + @ApiModelProperty("资料状态") + private String fileState; + @ApiModelProperty("消贷合同编号") + private String loanContractNo; + @ApiModelProperty("台数") + private String num; + @ApiModelProperty("贷款人名称") + private String borrowerName; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("金融产品名称") + private String policyName; + @ApiModelProperty("资方合同号") + private String bankContractNo; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java index 4327a0d5f8..9e783ab635 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java @@ -52,8 +52,11 @@ import java.util.List; public class LoanHomevisitFileexamineDetailsVo implements Vo { private String sid; + @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("家访考察sid") private String homeVisitSid; + @ApiModelProperty("销售订单sid") private String saleOrderSid; @ApiModelProperty("定位信息") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java index f718c953a6..92af6990fd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java @@ -26,6 +26,11 @@ public enum LoanAttachTypeEnum { CL("017", "车辆"), SSFJ("018", "申诉附件"), XSFJ("019", "信审附件"), + GZSFP("020", "购置税发票"), + BXFP("021", "保险发票"), + BD("022", "保单"), + RZ("023", "融资合同"), + ZMFJ("024", "证明附件"), ; /** diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java new file mode 100644 index 0000000000..a19af91ff3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanfileexamine; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; + +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineMapper.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineMapper
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface LoanFileexamineMapper extends BaseMapper { + + //@Update("update loan_fileexamine set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_fileexamine") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml new file mode 100644 index 0000000000..36e28d46f4 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java new file mode 100644 index 0000000000..c48fa8f44b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanfileexamine; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "放款资料审核") +@RestController("com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest") +@RequestMapping("v1/loanfileexamine") +public class LoanFileexamineRest implements LoanFileexamineFeign { + + @Autowired + private LoanFileexamineService loanFileexamineService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanFileexamineService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanFileexamineDto dto){ + ResultBean rb = ResultBean.fireFail(); + loanFileexamineService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + loanFileexamineService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java new file mode 100644 index 0000000000..09ff74b8eb --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -0,0 +1,240 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanfileexamine; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileFeign; +import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineService.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineService
+ * Description: 放款资料审核 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class LoanFileexamineService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; + @Autowired + private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; + + public PagerVo listPageVo(PagerQuery pq) { + LoanFileexamineQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bl.busNo",305); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getLoanContractNo())) { + qw.like("bl.loanContractNo", query.getLoanContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bl.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getBankName())) { + qw.like("bl.bankName", query.getBankName()); + } + if (StringUtils.isNotBlank(query.getPolicyName())) { + qw.like("bl.policyName", query.getPolicyName()); + } + if (StringUtils.isNotBlank(query.getBankContractNo())) { + qw.like("bl.bankContractNo", query.getBankContractNo()); + } + if (StringUtils.isNotBlank(query.getBankState())) { + qw.like("lf.bankState", query.getBankState()); + } + if (StringUtils.isNotBlank(query.getFileState())) { + qw.like("lf.fileState", query.getFileState()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanFileexamineDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanFileexamineDto dto){ + LoanFileexamine entity = new LoanFileexamine(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanFileexamineDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + LoanFileexamine entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid){ + LoanFileexamine entity = fetchBySid(sid); + LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo(); + BeanUtil.copyProperties(entity, vo); + BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData(); + vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName()); + vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData(); + vo.setStaffName(busSalesOrder.getStaffName()); + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData(); + String vinNos = ""; + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; + } + vo.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(","))); + //银行卡 + List yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImages = new ArrayList<>(); + if (yhkVos != null && yhkVos.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) { + yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setYhkImages(yhkImages); + //购置税发票 + List gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType()); + List gzsfpImages = new ArrayList<>(); + if (gzsfpVos != null && gzsfpVos.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) { + gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setGzsfpImages(gzsfpImages); + //保险发票 + List bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType()); + List bxfpImages = new ArrayList<>(); + if (bxfpVos != null && bxfpVos.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) { + bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setBxfpImages(bxfpImages); + return vo; + } +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index f681bceeb3..a784c5fd69 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -187,7 +187,20 @@ public class LoanFinOtherPolicyService extends MybatisBaseService homeInforListPage(PagerQuery pq) { LoanHomevisitFileexamineQuery query = pq.getParams(); @@ -415,6 +419,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData(); List loanXdConDetailsVos = new ArrayList<>(); @@ -426,7 +431,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService bankContractImages = new ArrayList<>(); //消贷合同编号 loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); - loanXdConDetailsVo.setLoanCotractNoShow("消贷合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + loanXdConDetailsVo.setLoanCotractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); //消贷合同附件 List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { @@ -437,10 +442,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0) { From fbb697806b4807da71f4f881f31e1eb3d03bfab7 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 8 Sep 2023 17:45:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 78c12c7d59..64ab3b1d81 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 @@ -2103,7 +2103,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Fri, 8 Sep 2023 17:56:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractDetailsVo.java | 2 +- .../LoanHomeVisitAppealPageVo.java | 10 +++- .../LoanXdConDetailsVo.java | 3 +- .../LoanZfConDetailsVo.java | 3 +- .../LoanFileexamineService.java | 2 +- .../LoanHomevisitAppealMapper.xml | 4 ++ .../LoanHomevisitFileexamineService.java | 48 ++++++++++--------- .../AppLoanHomeVisitAppealPageVo.java | 10 +++- .../LoanHomeVisitInvestigateService.java | 4 ++ 9 files changed, 57 insertions(+), 29 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDetailsVo.java index 824da0d5c0..c82462bb30 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDetailsVo.java @@ -60,7 +60,7 @@ public class BusSalesOrderLoancontractDetailsVo implements Vo { @ApiModelProperty("台数") private Integer vehCount; // 台数 @ApiModelProperty("消贷合同编号") - private String loanCotractNo; // 消贷合同编号 + private String loanContractNo; // 消贷合同编号 @ApiModelProperty("资方合同号") private String bankContractNo; // 资方合同号 @ApiModelProperty("资方名称") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomeVisitAppealPageVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomeVisitAppealPageVo.java index 608010b510..2e22fc0d6b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomeVisitAppealPageVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomeVisitAppealPageVo.java @@ -7,8 +7,16 @@ import lombok.Data; @Data public class LoanHomeVisitAppealPageVo implements Vo { - @ApiModelProperty("sid") + @ApiModelProperty("申诉sid") private String sid; + @ApiModelProperty("考察sid") + private String kcSid; + @ApiModelProperty("审批状态") + private String nodeState; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("联系电话") + private String mobile; @ApiModelProperty("分公司名称") private String useOrgName; @ApiModelProperty("销售部门名称") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java index 4a327f9cee..f67fac7116 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java @@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -55,5 +56,5 @@ public class LoanXdConDetailsVo implements Vo { @ApiModelProperty("消贷合同编号页面展示") private String loanCotractNoShow; @ApiModelProperty("消贷合同附件") - private List loanCotractImages; + private List loanCotractImages = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java index 23020da18b..0bb4642c74 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java @@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -55,5 +56,5 @@ public class LoanZfConDetailsVo implements Vo { @ApiModelProperty("资方合同编号页面展示") private String bankContractNoShow; @ApiModelProperty("资方合同附件") - private List bankContractImages; + private List bankContractImages = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index 09ff74b8eb..462efeffe1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -197,7 +197,7 @@ public class LoanFileexamineService extends MybatisBaseService SELECT la.sid, + la.homeVisitSid AS kcSid, + la.nodeState, + bo.`contractNo` AS contractId, bo.`useOrgName`, bo.`orgName`, bo.`staffName`, bb.`borrowerName` AS lenderName, + bb.`mobile`, li.homeVisStaffName AS jfMember, li.resHomeVisDate AS times, li.`remarks`, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java index fa092381b6..0e98676979 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java @@ -430,24 +430,25 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService bankContractImages = new ArrayList<>(); //消贷合同编号 - loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); - loanXdConDetailsVo.setLoanCotractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo()); + loanXdConDetailsVo.setLoanCotractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getLoanContractNo() + ")"); //消贷合同附件 - List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanContractNo()); if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { loanCotractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); } loanXdConDetailsVo.setLoanCotractImages(loanCotractImages); } + loanXdConDetailsVos.add(loanXdConDetailsVo); //资方合同编号 if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())) { loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(暂无)"); } else { - loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); - loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo()); + loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getBankContractNo() + ")"); //资方合同附件 - List loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + List loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanContractNo()); if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) { bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); @@ -455,11 +456,12 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); + List dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DWXX.getAttachType()); List location = new ArrayList<>(); if (dwxxImages != null && dwxxImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { @@ -468,7 +470,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); + List fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FWZP.getAttachType()); List house = new ArrayList<>(); if (fwzpImages != null && fwzpImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { @@ -477,7 +479,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); + List mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.MKZP.getAttachType()); List doorway = new ArrayList<>(); if (mkzpImages != null && mkzpImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { @@ -486,7 +488,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); + List ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.KTWSZP.getAttachType()); List indoor = new ArrayList<>(); if (ktwszpImages != null && ktwszpImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { @@ -495,7 +497,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); + List hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.HYZD.getAttachType()); List groupPhoto = new ArrayList<>(); if (hyzdImages != null && hyzdImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { @@ -504,7 +506,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); + List dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRSFZ.getAttachType()); List lenderIdCard = new ArrayList<>(); if (dkrsfzImages != null && dkrsfzImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) { @@ -513,7 +515,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); + List dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRHKB.getAttachType()); List lenderAccount = new ArrayList<>(); if (dkrhkbImages != null && dkrhkbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) { @@ -522,7 +524,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); + List dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRHYZM.getAttachType()); List lenderMarriageCertificate = new ArrayList<>(); if (dkrhyzmImages != null && dkrhyzmImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) { @@ -531,7 +533,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); + List dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRJSB.getAttachType()); List lenderDriverBook = new ArrayList<>(); if (dkrjsbImages != null && dkrjsbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) { @@ -540,7 +542,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); + List dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DKRYHLS.getAttachType()); List lenderBankStatement = new ArrayList<>(); if (dkryhlsImages != null && dkryhlsImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) { @@ -549,7 +551,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); + List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.POSFZ.getAttachType()); List spouseIdCard = new ArrayList<>(); if (posfzImages != null && posfzImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { @@ -558,7 +560,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); + List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.POHKB.getAttachType()); List spouseAccount = new ArrayList<>(); if (pohkbImages != null && pohkbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { @@ -567,7 +569,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); + List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DBRSFZ.getAttachType()); List pohkbImage = new ArrayList<>(); if (dbrsfzImages != null && dbrsfzImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { @@ -576,7 +578,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); + List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DBRHKB.getAttachType()); List guarantorAccount = new ArrayList<>(); if (dbrhkbImages != null && dbrhkbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { @@ -585,7 +587,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.YHK.getAttachType()); List yhkImagess = new ArrayList<>(); if (yhkImages != null && yhkImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) { @@ -594,7 +596,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); + List fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FC.getAttachType()); List houseProperty = new ArrayList<>(); if (fcImages != null && fcImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) { @@ -603,7 +605,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); + List clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.CL.getAttachType()); List carProperty = new ArrayList<>(); if (clImages != null && clImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java index 8f41049597..b16f6fad3d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java @@ -7,8 +7,16 @@ import lombok.Data; @Data public class AppLoanHomeVisitAppealPageVo implements Vo { - @ApiModelProperty("sid") + @ApiModelProperty("申诉sid") private String sid; + @ApiModelProperty("考察sid") + private String kcSid; + @ApiModelProperty("审批状态") + private String nodeState; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("联系电话") + private String mobile; @ApiModelProperty("分公司-销售部门-销售专员") private String salesName; @ApiModelProperty("贷款人姓名") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 3daddd6e1e..5036ba20c0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -371,12 +371,16 @@ public class LoanHomeVisitInvestigateService { for (LoanHomeVisitAppealPageVo record : records) { AppLoanHomeVisitAppealPageVo appealPageVo = new AppLoanHomeVisitAppealPageVo(); appealPageVo.setSid(record.getSid()); + appealPageVo.setKcSid(record.getKcSid()); appealPageVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName()); appealPageVo.setLenderName(record.getLenderName()); appealPageVo.setJfMember(record.getJfMember()); appealPageVo.setTimes(record.getTimes()); appealPageVo.setRemarks(record.getRemarks()); appealPageVo.setAppealReason(record.getAppealReason()); + appealPageVo.setMobile(record.getMobile()); + appealPageVo.setNodeState(record.getNodeState()); + appealPageVo.setContractId(record.getContractId()); appLoanHomeVisitAppealPageVos.add(appealPageVo); } v.setRecords(appLoanHomeVisitAppealPageVos);