diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index 30261249d5..83c27f1365 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -61,7 +61,7 @@ public interface LoanFinPolicyFeign { @RequestParam("userSid") String userSid, @RequestParam("isPack") String isPack, @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "vehTypeKey", required = false) String vehTypeKey); + @RequestParam(value = "modelSid", required = false) String modelSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java index 802a301dc2..0e0a2815d3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java @@ -28,4 +28,6 @@ public interface LoanFinPolicyMapper extends BaseMapper { AppPolicyDetailsVo getProductInfo(String sid); List selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey); + + String selectVehType(String modelSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index d9fedc0726..8270a5a610 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -117,4 +117,8 @@ and lfp.policyName like concat('%', #{name}, '%') + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java index f760eb6b4b..04325e2e70 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java @@ -69,7 +69,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign { } @Override - public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) { - return loanFinPolicyService.selectList(orgPath, userSid, isPack, name,vehTypeKey); + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String modelSid) { + return loanFinPolicyService.selectList(orgPath, userSid, isPack, name,modelSid); } } 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 20ec0ae733..1d5f1bf52c 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 @@ -660,9 +660,10 @@ public class LoanFinPolicyService extends MybatisBaseService> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) { + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String modelSid) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + String vehTypeKey = baseMapper.selectVehType(modelSid); String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size()-1); List list = baseMapper.selectListOne(deptSid, isPack, name,vehTypeKey); list.removeAll(Collections.singleton(null)); 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 e1b977909f..5c96bd6385 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 @@ -39,7 +39,11 @@ public interface SolutionsFeign { @ApiOperation("已备案的产品政策(分公司,有效期内)") @GetMapping("/selectList") @ResponseBody - ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("isPack") String isPack, @RequestParam(value = "name", required = false) String name); + ResultBean> selectList(@RequestParam("orgPath") String orgPath, + @RequestParam("userSid") String userSid, + @RequestParam("isPack") String isPack, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "modelSid", required = false) String modelSid); @ApiOperation("获取产品政策下其他融,或分公司下其他融") @GetMapping("/selectOtherList") 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 a9e4dc75fa..32160cc486 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 @@ -39,8 +39,8 @@ public class SolutionsRest implements SolutionsFeign { } @Override - public ResultBean> selectList(String orgPath, String userSid, String isPack, String name) { - return solutionsService.selectList(orgPath, userSid, isPack, name); + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String modelSid) { + return solutionsService.selectList(orgPath, userSid, isPack, name,modelSid); } @Override 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 a845646475..8addd5c549 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 @@ -54,10 +54,10 @@ public class SolutionsService { return rb.success().setData(appSolutionsDetailsVo).setCode(resultBean.getCode()); } - public ResultBean> selectList(String orgPath, String userSid, String isPack, String name) { + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String modelSid) { ResultBean> rb = ResultBean.fireFail(); List listNew = new ArrayList<>(); - ResultBean> resultBean = loanFinPolicyFeign.selectList(orgPath, userSid, isPack, name); + ResultBean> resultBean = loanFinPolicyFeign.selectList(orgPath, userSid, isPack, name,modelSid); if (resultBean.getData() != null && !resultBean.getData().isEmpty()) { List list = resultBean.getData(); list.removeAll(Collections.singleton(null));