From 1e1e52bdb000c2b2093ea9ba2059149b74be3da0 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sun, 8 Oct 2023 13:32:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicyFeign.java | 5 +++++ .../LoanFinOtherPolicyRest.java | 5 +++++ .../LoanFinOtherPolicyService.java | 17 +++++++++++++++ .../api/risk/solutions/SolutionsFeign.java | 7 ++++++- .../biz/risk/solutions/SolutionsRest.java | 5 +++++ .../biz/risk/solutions/SolutionsService.java | 21 +++++++++++++++++++ 6 files changed, 59 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 16dd8a349b..1b361a9f90 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -51,6 +51,11 @@ public interface LoanFinOtherPolicyFeign { @ApiOperation("获取产品政策下其他融，或分公司下其他融") ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period); + + @GetMapping("selectList2") + @ApiOperation("移动端产品政策下其他融") + ResultBean> selectList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period); + @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启") @PostMapping("setState") ResultBean setState(@RequestBody LoanFinOtherPolicyStateQuery query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index 9bb9699b39..352e25cf57 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -54,6 +54,11 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name,modelSid ,period); } + @Override + public ResultBean> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + return loanFinOtherPolicyService.selectList2(orgPath,userSid,sid,name,modelSid ,period); + } + @Override public ResultBean setState(LoanFinOtherPolicyStateQuery query) { return loanFinOtherPolicyService.setState(query); 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 19f0396b46..519932c7e4 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 @@ -109,6 +109,23 @@ public class LoanFinOtherPolicyService extends MybatisBaseService> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + ResultBean> rb = ResultBean.fireFail(); + if(StringUtils.isNotBlank(sid)){ + List list = baseMapper.selectListOne(sid, name); + list.removeAll(Collections.singleton(null)); + if (list.isEmpty()) { + return rb.success().setData(new ArrayList<>()); + } + return rb.success().setData(list); + }else{ + return rb.success().setData(new ArrayList<>()); + } + + + } public PagerVo listPageVo(PagerQuery pq) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java index d2bfee9d6a..5d46bb82a0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java @@ -45,11 +45,16 @@ public interface SolutionsFeign { @RequestParam(value = "name", required = false) String name, @RequestParam(value = "modelSid", required = false) String modelSid); - @ApiOperation("获取产品政策下其他融，或分公司下其他融") + @ApiOperation("获取分公司下其他融") @GetMapping("/selectOtherList") @ResponseBody ResultBean> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period); + @ApiOperation("获取产品政策下其他融") + @GetMapping("/selectOtherList2") + @ResponseBody + ResultBean> selectOtherList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period); + @ApiOperation("初始化金融方案2") @GetMapping("/selectDetailsVo2") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java index ec0c7abf5e..5ea951ac9a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java @@ -48,6 +48,11 @@ public class SolutionsRest implements SolutionsFeign { return solutionsService.selectOtherList(orgPath, userSid, sid, name,modelSid,period); } + @Override + public ResultBean> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + return solutionsService.selectOtherList2(orgPath, userSid, sid, name,modelSid,period); + } + @Override public ResultBean selectDetailsVo2(String busSid) { return solutionsService.selectDetailsVo2(busSid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java index 2cdb0499fe..d6314b11ef 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java @@ -132,4 +132,25 @@ public class SolutionsService { } return rb.success(); } + + public ResultBean> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + ResultBean> rb = ResultBean.fireFail(); + List listNew = new ArrayList<>(); + ResultBean> resultBean = loanFinOtherPolicyFeign.selectList2(orgPath, userSid, sid, name, modelSid, period); + if (resultBean.getData() != null && !resultBean.getData().isEmpty()) { + List list = resultBean.getData(); + list.removeAll(Collections.singleton(null)); + for (int i = 0; i < list.size(); i++) { + OtherPolicyVo policyVo = list.get(i); + OtherPolicyExtraVo extraVo = new OtherPolicyExtraVo(); + OtherPolicysVo policysVo = new OtherPolicysVo(); + policysVo.setId(policyVo.getSid()); + policysVo.setDictValue(policyVo.getName()); + BeanUtil.copyProperties(policyVo, extraVo); + policysVo.setExtra(extraVo); + listNew.add(policysVo); + } + } + return rb.success().setData(listNew); + } }