金融产品政策

2 years ago · 0fef5764c8
7 changed files with 98 additions and 70 deletions
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicy.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicy.java
@ -51,6 +51,10 @@ public class LoanFinPolicy extends BaseEntity {
    @ApiModelProperty("保证金比例（%）")
    private BigDecimal bondRatio;
    private String bondRatioKey;
+    @ApiModelProperty("保证金类型key")
+    private String bondTypeKey;
+    @ApiModelProperty("保证金类型")
+    private String bondType;
    @ApiModelProperty("期数")
    private int period;
    private String periodKey;
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java
@ -55,6 +55,10 @@ public class LoanFinPolicyDto implements Dto {
    @ApiModelProperty("保证金比例（%）")
    private String bondRatio;
    private String bondRatioKey;
+    @ApiModelProperty("保证金类型key")
+    private String bondTypeKey;
+    @ApiModelProperty("保证金类型")
+    private String bondType;
    @ApiModelProperty("期数")
    private int period;
    private String periodKey;
--- 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
@ -6,10 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;

 /**
 * @description:
@ -29,7 +26,7 @@ public interface LoanFinPolicyFeign {
    ResultBean saveOrUpdatePolicy(@RequestBody LoanFinPolicyDto dto);

    @ApiOperation("初始化、详情")
-    @PostMapping("details")
+    @GetMapping("details")
    ResultBean<LoanFinPolicyVo> details(@RequestParam("sid") String sid);

    @ApiOperation("删除")
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyQuery.java
@ -36,7 +36,7 @@ public class LoanFinPolicyQuery implements Query {
    @ApiModelProperty("有效期至结束")
    private String validDateToEnd;
    @ApiModelProperty("期数")
-    private int period;
+    private String period;
    @ApiModelProperty("服务费类型")
    private String serviceAmountTypeKey;
    //最低首付比例  至
@ -46,4 +46,5 @@ public class LoanFinPolicyQuery implements Query {
    private String menuUrl;
    private String orgPath;
    private String userSid;
+    private String menuSid;
 }
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java
@ -54,6 +54,10 @@ public class LoanFinPolicyVo implements Vo {
    @ApiModelProperty("保证金比例（%）")
    private String bondRatio;
    private String bondRatioKey;
+    @ApiModelProperty("保证金类型key")
+    private String bondTypeKey;
+    @ApiModelProperty("保证金类型")
+    private String bondType;
    @ApiModelProperty("期数")
    private int period;
    private String periodKey;
--- 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
@ -204,40 +204,35 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
        QueryWrapper<LoanFinPolicy> qw = new QueryWrapper<>();
        if (query != null) {
            //========================================数据授权开始
-            if (StringUtils.isNotBlank(query.getMenuUrl())) {
-                //=======================
-                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-                privilegeQuery.setOrgPath(query.getOrgPath());
-                privilegeQuery.setMenuUrl(query.getMenuUrl());
-                privilegeQuery.setUserSid(query.getUserSid());
-                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-                if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                    String orgSidPath = query.getOrgPath();
-                    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("lfp.orgSidPath", orgSidPath);
-                    } else if ("2".equals(orgLevelKey)) {
-                        orgSidPath = orgSidPath.substring(0, i2);
-                        qw.like("lfp.orgSidPath", orgSidPath);
-                    } else if ("3".equals(orgLevelKey)) {
-                        orgSidPath = orgSidPath.substring(0, i3);
-                        qw.like("lfp.orgSidPath", orgSidPath);
-                    } else if ("4".equals(orgLevelKey)) {
-                        orgSidPath = orgSidPath.substring(0, i4);
-                        qw.like("lfp.orgSidPath", orgSidPath);
-                    } else if ("5".equals(orgLevelKey)) {
-                        qw.eq("lfp.createBySid", query.getUserSid());
-                    } else {
-                        PagerVo<LoanFinPolicyVos> p = new PagerVo<>();
-                        return p;
-                    }
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                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("lfp.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("lfp.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("lfp.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("lfp.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("lfp.createBySid", query.getUserSid());
                } else {
                    PagerVo<LoanFinPolicyVos> p = new PagerVo<>();
                    return p;
@ -246,37 +241,58 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                PagerVo<LoanFinPolicyVos> p = new PagerVo<>();
                return p;
            }
-            //报备状态
-            if (StringUtils.isNotBlank(query.getFilingStateKey())) {
-                qw.eq("lfp.filingState", query.getFilingStateKey());
-            }
-            //风控状态
-            if (StringUtils.isNotBlank(query.getRiskStateKey())) {
-                qw.eq("lfp.riskState", query.getRiskStateKey());
-            }
-            //使用状态
-            if (StringUtils.isNotBlank(query.getUseSateKey())) {
-                qw.eq("lfp.useSate", query.getUseSateKey());
-            }
-            //分公司
-            if (StringUtils.isNotBlank(query.getUseOrgName())) {
-                qw.like("lfp.useOrgName", query.getUseOrgName());
-            }
-            //业务类型
-            if (StringUtils.isNotBlank(query.getBusTypeKey())) {
-                qw.eq("lfp.busTypeKey", query.getBusTypeKey());
-            }
-            //车辆大类
-            //车辆功能
-            //适用销售部门
-            //产品政策名称
-            //有效期至开始
-            //有效期至结束
-            //期数
-            //最低首付比例开始
-            //最低首付比例结束
-
+        } else {
+            PagerVo<LoanFinPolicyVos> p = new PagerVo<>();
+            return p;
+        }
+        //报备状态
+        if (StringUtils.isNotBlank(query.getFilingStateKey())) {
+            qw.eq("lfp.filingState", query.getFilingStateKey());
+        }
+        //风控状态
+        if (StringUtils.isNotBlank(query.getRiskStateKey())) {
+            qw.eq("lfp.riskState", query.getRiskStateKey());
+        }
+        //使用状态
+        if (StringUtils.isNotBlank(query.getUseSateKey())) {
+            qw.eq("lfp.useSate", query.getUseSateKey());
+        }
+        //分公司
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("lfp.useOrgName", query.getUseOrgName());
+        }
+        //业务类型
+        if (StringUtils.isNotBlank(query.getBusTypeKey())) {
+            qw.eq("lfp.busTypeKey", query.getBusTypeKey());
+        }
+        //车辆大类
+        if (StringUtils.isNotBlank(query.getVehCategoryKey())) {
+            qw.eq("lfp.vehCategoryKey", query.getVehCategoryKey());
+        }
+        //车辆功能
+        if (StringUtils.isNotBlank(query.getVehTypeKey())) {
+            qw.eq("lfp.vehTypeKey", query.getVehTypeKey());
+        }
+        //适用销售部门
+        if (StringUtils.isNotBlank(query.getUseDeptNames())) {
+            qw.like("lfp.useDeptNames", query.getUseDeptNames());
+        }
+        //产品政策名称
+        if (StringUtils.isNotBlank(query.getPolicyName())) {
+            qw.like("lfp.policeName", query.getPolicyName());
+        }
+        //有效期至开始~  //有效期至结束
+        if (StringUtils.isNotBlank(query.getValidDateToStart()) && StringUtils.isNotBlank(query.getValidDateToEnd())) {
+            qw.between("lfp.validDateTo", query.getValidDateToStart(), query.getValidDateToEnd());
+        }

+        //期数
+        if (StringUtils.isNotBlank(query.getPeriod())) {
+            qw.eq("lfp.periodKey", query.getPeriod());
+        }
+        //最低首付比例  至
+        if (StringUtils.isNotBlank(query.getDownPayRatioLeastStart()) && StringUtils.isNotBlank(query.getDownPayRatioLeastEnd())) {
+            qw.between("lfp.downPayRatioLeast", query.getDownPayRatioLeastStart(), query.getDownPayRatioLeastEnd());
        }
        IPage<LoanFinPolicy> page = PagerUtil.queryToPage(pagerQuery);
        IPage<LoanFinPolicyVos> pagging = baseMapper.pagerList(page, qw);
--- a/doc/databases/risk_center.sql
+++ b/doc/databases/risk_center.sql
@ -1163,6 +1163,8 @@ CREATE TABLE `loan_fin_policy`
    `downPayRatioLeastKey`   VARCHAR(255)         DEFAULT NULL COMMENT '最低首付比例（%）key',
    `bondRatio`              decimal(10, 0)       DEFAULT NULL COMMENT '保证金比例（%）',
    `bondRatioKey`           VARCHAR(255)         DEFAULT NULL COMMENT '保证金比例（%）key',
+    `bondTypeKey`            VARCHAR(255)         DEFAULT NULL COMMENT '保证金类型key',
+    `bondType`               VARCHAR(255)         DEFAULT NULL COMMENT '保证金类型',
    `period`                 int(64)              DEFAULT NULL COMMENT '期数',
    `periodKey`              VARCHAR(255)         DEFAULT NULL COMMENT '期数key',
    `yearRatio`              decimal(10, 2)       DEFAULT NULL COMMENT '标准年利率（%）',