From ef437bdabee16b59f2027e8ad1d2b3543b5f8a7e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 12 Sep 2023 09:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanfinpolicy/LoanFinPolicyFeign.java | 6 +- .../api/loanfinpolicy/LoanRiskStateQuery.java | 2 + .../loanfinpolicy/LoanFinPolicyMapper.java | 2 +- .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 7 +- .../biz/loanfinpolicy/LoanFinPolicyRest.java | 4 +- .../loanfinpolicy/LoanFinPolicyService.java | 107 ++++++++++++++++-- 6 files changed, 114 insertions(+), 14 deletions(-) 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 3a4dda2243..30261249d5 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 @@ -57,7 +57,11 @@ public interface LoanFinPolicyFeign { @ApiOperation("已备案的产品政策（分公司，有效期内）") @GetMapping("selectList") - 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 = "vehTypeKey", required = false) String vehTypeKey); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java index a9826a57e0..f41389ec08 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java @@ -18,4 +18,6 @@ public class LoanRiskStateQuery { private List sidsList = new ArrayList<>(); @ApiModelProperty("riskState为1时走禁用，为0时走启用") private String riskState; + + private String userSid; } 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 554e97f727..802a301dc2 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 @@ -27,5 +27,5 @@ public interface LoanFinPolicyMapper extends BaseMapper { AppPolicyDetailsVo getProductInfo(String sid); - List selectListOne(@Param("useOrgSid") String useOrgSid,@Param("isPack") String isPack,@Param("name") String name); + List selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey); } 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 ab6befe6aa..d9fedc0726 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 @@ -106,7 +106,12 @@ from loan_fin_policy lfp where lfp.filingState = 1 and isPack = #{isPack} - and lfp.useOrgSid = #{useOrgSid} + + and lfp.useDeptSids like concat('%',#{deptSid},'%') + + + and lfp.vehTypeKey like concat('%',#{vehTypeKey},'%') + and lfp.validDateTo > now() and lfp.useSate = 0 and lfp.riskState = 0 and lfp.policyName like concat('%', #{name}, '%') 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 f9cedbc83e..f760eb6b4b 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) { - return loanFinPolicyService.selectList(orgPath, userSid, isPack, name); + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) { + return loanFinPolicyService.selectList(orgPath, userSid, isPack, name,vehTypeKey); } } 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 455d62836d..20ec0ae733 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 @@ -52,9 +52,63 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); + useDeptList.removeAll(Collections.singleton(null)); + if (useDeptList.isEmpty()) { + return rb.setMsg("适用销售部门不允许为空"); + } if (StringUtils.isBlank(dto.getBankSid())) { - return rb.setMsg("资方不允许为空"); + return rb.setMsg("资方简称不允许为空"); + } + List vehTypeKeyList = dto.getVehTypeKeyList(); + vehTypeKeyList.removeAll(Collections.singleton(null)); + if (vehTypeKeyList.isEmpty()) { + return rb.setMsg("车辆功能不允许为空"); + } + String guaranteeTypeKey = dto.getGuaranteeTypeKey(); + if (StringUtils.isBlank(guaranteeTypeKey)) { + return rb.setMsg("担保类型不允许为空"); + } + //首付比例 + if (StringUtils.isBlank(dto.getDownPayRatio())) { + return rb.setMsg("首付比例不允许为空"); } + //最低首付比例 + if (StringUtils.isBlank(dto.getDownPayRatioLeast())) { + return rb.setMsg("最低首付比例不允许为空"); + } + //保证金比例 + if (StringUtils.isBlank(dto.getBondRatio())) { + return rb.setMsg("保证金比例不允许为空"); + } + //保证金类型 + if (StringUtils.isBlank(dto.getBondType())) { + return rb.setMsg("保证金类型不允许为空"); + } + //期数 + if(StringUtils.isBlank(dto.getPeriodKey())){ + return rb.setMsg("期数不允许为空"); + } + //标准年利率 + if (StringUtils.isBlank(dto.getYearRatio())) { + return rb.setMsg("标准年利率不允许为空"); + } + //服务费类型 + if (StringUtils.isBlank(dto.getServiceAmountTypeValue())) { + return rb.setMsg("服务费类型不允许为空"); + } + //服务费 + if (StringUtils.isBlank(dto.getServiceAmount())) { + return rb.setMsg("服务费不允许为空"); + } + //贴息放款类型 + if (StringUtils.isBlank(dto.getDiscountUseType())) { + return rb.setMsg("贴息放款类型不允许为空"); + } + if (StringUtils.isBlank(dto.getValidDateTo())) { + return rb.setMsg("有效期至不允许为空"); + } + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); String useOrgName = ""; ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); @@ -64,7 +118,6 @@ public class LoanFinPolicyService extends MybatisBaseService vehTypeKeyList = dto.getVehTypeKeyList(); if (!vehTypeKeyList.isEmpty()) { String vehTypeKey = String.join(",", vehTypeKeyList); loanFinPolicy.setVehTypeKey(vehTypeKey); @@ -74,7 +127,6 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); String deptSids = ""; String deptNames = ""; if (!useDeptList.isEmpty()) { @@ -131,6 +183,22 @@ public class LoanFinPolicyService extends MybatisBaseService vehTypeKeyList = dto.getVehTypeKeyList(); if (!vehTypeKeyList.isEmpty()) { String vehTypeKey = String.join(",", vehTypeKeyList); loanFinPolicy.setVehTypeKey(vehTypeKey); @@ -181,7 +248,6 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); if (!useDeptList.isEmpty()) { List deptSidsList = useDeptList.stream().map(v -> v.getDeptSid()).collect(Collectors.toList()); deptSids = String.join(",", deptSidsList); @@ -213,13 +279,13 @@ public class LoanFinPolicyService extends MybatisBaseService> selectList(String orgPath, String userSid, String isPack, String name) { + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - List list = baseMapper.selectListOne(useOrgSid, isPack, name); + 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)); return rb.success().setData(list); }