金融产品政策部分代码

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -152,6 +152,10 @@ public interface BaseVehmodelConfigFeign {
     @GetMapping("/selectCarConfigSummary/{modelSid}/{configSid}/{userSid}")
     public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("获取车型配置总结（即常用配置一句话描述）(销售订单)")
+    @GetMapping("/selectCarConfigSummary1/{modelSid}/{configSid}/{orgSid}")
+    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary1(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("orgSid") String orgSid);
+
     /**
      * 车型配置关联表新增配置并关联
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@@ -128,6 +128,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
         return null;
     }
 
+    @Override
+    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary1(String modelSid, String configSid, String orgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean saveAndRelationConfig(BaseModelConfigDto dto) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -42,7 +42,6 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
@@ -1431,14 +1430,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public IPage<VehicleModelPriceVo> getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         // 1、根据业务员部门sid查询分公司sid
-//        String orgPath = pagerQuery.getParams().getOrgPath();
-//        String orgSid = "";
-//        if (StringUtils.isBlank(orgPath)) {
-//            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-//        } else {
-//            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-//        }
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        String orgPath = pagerQuery.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isBlank(orgPath)) {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        }
+//        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         if (StringUtils.isNotBlank(orgSid)) {
             pagerQuery.getParams().setUseOrg(orgSid);
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -187,6 +187,11 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
         return baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
     }
 
+    @Override
+    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary1(String modelSid, String configSid, String orgSid) {
+        return baseVehmodelConfigService.selectCarConfigSummary1(modelSid, configSid,orgSid);
+    }
+
     @Override
     public ResultBean saveAndRelationConfig(BaseModelConfigDto dto) {
         return baseVehmodelConfigService.saveAndRelationConfig(dto);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -467,17 +467,17 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         for (Map<String, String> map : maps) {
             String modelSid = map.get("modelSid");
             String configurationItemsSid = map.get("configurationItemsSid");
-            String userSid = map.get("userSid"); 
+            String userSid = map.get("userSid");
             String orgPath = map.get("orgPath");
             String useOrgSid = "";
-            if(StringUtils.isNotBlank(orgPath)){
+            if (StringUtils.isNotBlank(orgPath)) {
                 useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-            }else{
+            } else {
                 useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
             }
             if ("0".equals(useOrgSid)) {
                 return rb.setMsg("该用户无分公司，不允许操作");
-            } 
+            }
             BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, useOrgSid);
             if (vo == null) {
                 return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
@@ -534,6 +534,17 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return rb.setData(new AppCarConfigSummaryVo());
     }
 
+    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary1(String modelSid, String configSid, String orgSid) {
+        ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
+        AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, orgSid);
+        if (appModelConfigListVo != null) {
+            AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
+            return rb.success().setData(configSummaryVo);
+        }
+
+        return rb.setData(new AppCarConfigSummaryVo());
+    }
+
     /**
      * 拼接常用配置字段
      *
@@ -651,11 +662,11 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         if (StringUtils.isNotBlank(query.getConfigName())) {
             qw.and(wrapper -> wrapper.like("bmc.configName", query.getConfigName()).or().like("bmc.configCode", query.getConfigName()));
         }
-        if (StringUtils.isNotBlank(query.getCarBrandSid())){
+        if (StringUtils.isNotBlank(query.getCarBrandSid())) {
             qw.eq("bvm.carBrand", query.getCarBrandSid());
         }
-        if (StringUtils.isNotBlank(query.getInsideCode())){
-            qw.like("bvc.insideCode",query.getInsideCode());
+        if (StringUtils.isNotBlank(query.getInsideCode())) {
+            qw.like("bvc.insideCode", query.getInsideCode());
         }
         qw.eq("bvm.isDelete", 0);
         qw.eq("bmc.isDelete", 0);
@@ -695,7 +706,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         QueryWrapper<BaseVehmodelConfigVehicleVos> qw = new QueryWrapper<>();
         qw.eq("bvc.useOrgSid", query.getUseOrgSid());
         qw.like("bb.useOrg", query.getUseOrgSid());
-        qw.eq("bb.sid",query.getBrandSid());
+        qw.eq("bb.sid", query.getBrandSid());
         if (StringUtils.isNotBlank(query.getVehicleAlias())) {
             qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", query.getVehicleAlias()).or().like("bvm.vehicleTypeCode", query.getVehicleAlias()));
         }
@@ -888,7 +899,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
         BaseModelConfigVo baseModelConfigVo = baseModelConfigService.selectByConfigName(useOrgSid, configName);
-        if (baseModelConfigVo != null){
+        if (baseModelConfigVo != null) {
             String modelSid = dto.getVehicleSid();
             String configurationItemsSid = baseModelConfigVo.getSid();
             BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, useOrgSid);
@@ -903,7 +914,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             baseVehmodelConfig.setModelSid(modelSid);
             baseVehmodelConfig.setConfigurationItemsSid(configurationItemsSid);
             save(baseVehmodelConfig);
-        }else {
+        } else {
             entity.setCreateOrgSId(useOrgSid);
             // 配置编码
             int i1 = baseModelConfigService.selectCount();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2238,11 +2238,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String saleOrderSid = appInitModelQuery.getSalesOrderSid();
         String customerSid = appInitModelQuery.getCustomerSid();
         String userSid = appInitModelQuery.getUserSid();
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         if (busSalesOrder == null) {
             return rb.setMsg("销售订单单据信息不存在");
         }
+        String orgSid = sysStaffOrgFeign.getOrgSidByPath(busSalesOrder.getOrgSidPath()).getData();
         String type = "";
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
         vo.setSaleOrderSid(saleOrderSid);
@@ -2533,10 +2534,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String configSid = appBusSaleOrderInitModelInfoQuery.getConfigSid();
         String customerSid = appBusSaleOrderInitModelInfoQuery.getCustomerSid();
         String userSid = appBusSaleOrderInitModelInfoQuery.getUserSid();
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         String special = appBusSaleOrderInitModelInfoQuery.getSpecial();
         String saleOrderSid = appBusSaleOrderInitModelInfoQuery.getSaleOrderSid();
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        String orgSid = sysStaffOrgFeign.getOrgSidByPath(busSalesOrder.getOrgSidPath()).getData();
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
         //选择的车型信息的数据
         AppOrderInfoVo orderInfo = new AppOrderInfoVo();
@@ -2551,7 +2553,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //销售订单选择的采购订单的列表
         List<AppReadyCarListVo> appReadyCarLists = new ArrayList<>();
         //根据车型及配置查询车型信息
-        ResultBean<AppCarConfigSummaryVo> appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid);
+        String orgSids = sysStaffOrgFeign.getOrgSidByPath(busSalesOrder.getOrgSidPath()).getData();
+        ResultBean<AppCarConfigSummaryVo> appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary1(modelSid, configSid, orgSids);
         if (appCarConfigSummaryVoResultBean.getSuccess()) {
             AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData();
             //车型sid

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java

@@ -39,13 +39,14 @@ public class LoanFinOtherPolicy extends BaseEntity {
     @ApiModelProperty("车辆功能value")
     private String vehTypeValue;
     @ApiModelProperty("最高融资额比例（%）")
-    private String maxLoanRatio;
+    private BigDecimal maxLoanRatio;
     @ApiModelProperty("最高融资额")
     private BigDecimal maxLoanAmount;
     @ApiModelProperty("期数")
     private int period;
+    private String periodKey;
     @ApiModelProperty("年利率（%）")
-    private String yearRatio;
+    private BigDecimal yearRatio;
     @ApiModelProperty("有效期至")
     private String validDateTo;
     @ApiModelProperty("报备状态：1已报备，0未报备")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVo.java

@@ -23,6 +23,7 @@ public class LoanFinOtherPolicyVo implements Vo {
     private String maxLoanAmount;
     @ApiModelProperty("期数")
     private int period;
+    private String periodKey;
     @ApiModelProperty("年利率")
     private String yearRatio;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicy.java

@@ -43,15 +43,19 @@ public class LoanFinPolicy extends BaseEntity {
     @ApiModelProperty("单车意外险")
     private BigDecimal vehAccidentAmount;
     @ApiModelProperty("首付比例（%）")
-    private String downPayRatio;
+    private BigDecimal downPayRatio;
+    private String downPayRatioKey;
     @ApiModelProperty("最低首付比例（%）")
-    private String downPayRatioLeast;
+    private BigDecimal downPayRatioLeast;
+    private String downPayRatioLeastKey;
     @ApiModelProperty("保证金比例（%）")
-    private String bondRatio;
+    private BigDecimal bondRatio;
+    private String bondRatioKey;
     @ApiModelProperty("期数")
     private int period;
+    private String periodKey;
     @ApiModelProperty("标准年利率（%）")
-    private String yearRatio;
+    private BigDecimal yearRatio;
     @ApiModelProperty("服务费类型key")
     private String serviceAmountTypeKey;
     @ApiModelProperty("服务费类型value")
@@ -86,4 +90,6 @@ public class LoanFinPolicy extends BaseEntity {
     private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
+
+    private String orgSidPath;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java

@@ -47,12 +47,16 @@ public class LoanFinPolicyDto implements Dto {
     private String vehAccidentAmount;
     @ApiModelProperty("首付比例（%）")
     private String downPayRatio;
-    /*    @ApiModelProperty("最低首付比例（%）")
-        private String downPayRatioLeast;*/
+    private String downPayRatioKey;
+    @ApiModelProperty("最低首付比例（%）")
+    private String downPayRatioLeast;
+    private String downPayRatioLeastKey;
     @ApiModelProperty("保证金比例（%）")
     private String bondRatio;
+    private String bondRatioKey;
     @ApiModelProperty("期数")
     private int period;
+    private String periodKey;
     @ApiModelProperty("标准年利率（%）")
     private String yearRatio;
     @ApiModelProperty("服务费类型key")
@@ -71,10 +75,6 @@ public class LoanFinPolicyDto implements Dto {
     private String validDateTo;
     @ApiModelProperty("是否有其他融：1有，0无")
     private int isOtherProduct;
-    /*    @ApiModelProperty("适用销售部门sids(逗号分隔)")
-        private String useDeptSids;
-        @ApiModelProperty("适用销售部门名称(逗号分隔)")
-        private String useDeptNames;*/
     @ApiModelProperty("全组织路径")
     private String orgPath;
     @ApiModelProperty("适用销售部门List")
@@ -82,5 +82,7 @@ public class LoanFinPolicyDto implements Dto {
     @ApiModelProperty("其他融")
     private LoanFinOtherPolicyDto loanFinOtherPolicy;
 
+    private String userSid;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyQuery.java

@@ -43,6 +43,7 @@ public class LoanFinPolicyQuery implements Query {
     private String downPayRatioLeastStart;
     private String downPayRatioLeastEnd;
 
-    @ApiModelProperty("0是分公司，1是风控中心")
-    private int state;
+    private String menuUrl;
+    private String orgPath;
+    private String userSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java

@@ -43,10 +43,16 @@ public class LoanFinPolicyVo implements Vo {
     private String vehAccidentAmount;
     @ApiModelProperty("首付比例（%）")
     private String downPayRatio;
+    private String downPayRatioKey;
+    @ApiModelProperty("最低首付比例（%）")
+    private String downPayRatioLeast;
+    private String downPayRatioLeastKey;
     @ApiModelProperty("保证金比例（%）")
     private String bondRatio;
+    private String bondRatioKey;
     @ApiModelProperty("期数")
     private int period;
+    private String periodKey;
     @ApiModelProperty("标准年利率（%）")
     private String yearRatio;
     @ApiModelProperty("服务费类型key")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -2,5 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyMapper">
     <select id="pagerList" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVos">
+        select lfp.*
+        from loan_fin_policy lfp
+                 left join loan_fin_otherpolicy lfop on lfp.sid = lfop.mainPolicySid
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyDto;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVo;
@@ -39,6 +41,9 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
 
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
     public ResultBean saveOrUpdatePolicy(LoanFinPolicyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -67,6 +72,8 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             loanFinPolicy.setCreateOrgSid(useOrgSid);
             loanFinPolicy.setUseOrgName(useOrgName);
             loanFinPolicy.setCreateOrgName(useOrgName);
+            loanFinPolicy.setCreateBySid(dto.getUserSid());
+            loanFinPolicy.setOrgSidPath(orgPath);
             baseMapper.insert(loanFinPolicy);
             if (dto.getIsOtherProduct() == 1) {
                 LoanFinOtherPolicy loanFinOtherPolicy = new LoanFinOtherPolicy();
@@ -182,7 +189,79 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         LoanFinPolicyQuery query = pagerQuery.getParams();
         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 (org.apache.commons.lang3.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;
+                    }
+                } else {
+                    PagerVo<LoanFinPolicyVos> p = new PagerVo<>();
+                    return p;
+                }
+            } 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());
+            }
+            //车辆大类
+            //车辆功能
+            //适用销售部门
+            //产品政策名称
+            //有效期至开始
+            //有效期至结束
+            //期数
+            //最低首付比例开始
+            //最低首付比例结束
+
 
         }
         IPage<LoanFinPolicy> page = PagerUtil.queryToPage(pagerQuery);

doc/databases/risk_center.sql

@@ -1063,7 +1063,7 @@ CREATE TABLE `loan_fin_policy`
     `depositSettle`          decimal(10, 0)       DEFAULT NULL COMMENT '落户保证金',
     `nominalPrice`           decimal(10, 0)       DEFAULT NULL COMMENT '名义/留购价款',
     `validDateTo`            varchar(255)         DEFAULT NULL COMMENT '有效期至',
-    `filingState`            int(64)              DEFAULT NULL COMMENT '报备状态：1已报备，0未报备',
+    `filingState`            int(64)              DEFAULT NULL COMMENT '报备状态：1已报备，0未报备,2报备中',
     `useSate`                int(64)              DEFAULT NULL COMMENT '使用状态：1停用  0正常 各分公司设置的状态',
     `riskState`              int(64)              DEFAULT NULL COMMENT '风控状态：1禁用 0正常  风控中心设置的状态',
     `isOtherProduct`         int(64)              DEFAULT NULL COMMENT '是否有其他融：1有，0无',
@@ -1127,6 +1127,119 @@ CREATE TABLE `loan_fin_otherPolicy`
   DEFAULT CHARSET = utf8 COMMENT ='其他融产品';
 
 
+-- ------------------------------------------新
+-- 金融产品政策
+DROP TABLE IF EXISTS `loan_fin_policy`;
+CREATE TABLE `loan_fin_policy`
+(
+    `id`                     int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                    varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`            int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`               int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                  int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`               int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`            varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`            varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `policyName`             VARCHAR(255)         DEFAULT NULL COMMENT '政策名称：组合（资方简称+（担保/非担保）+首付比例+保证金比例+是否打包），如中车(担保)30+0打包',
+    `bankSid`                VARCHAR(255)         DEFAULT NULL COMMENT '资方sid',
+    `bankShortName`          VARCHAR(255)         DEFAULT NULL COMMENT '资方名称',
+    `busTypeKey`             VARCHAR(255)         DEFAULT NULL COMMENT '业务类型key',
+    `busTypeValue`           VARCHAR(255)         DEFAULT NULL COMMENT '业务类型value',
+    `vehCategoryKey`         VARCHAR(255)         DEFAULT NULL COMMENT '车辆大类key',
+    `vehCategoryValue`       VARCHAR(255)         DEFAULT NULL COMMENT '车辆大类value',
+    `vehTypeKey`             VARCHAR(255)         DEFAULT NULL COMMENT '车辆功能key',
+    `vehTypeValue`           VARCHAR(255)         DEFAULT NULL COMMENT '车辆功能value',
+    `isPack`                 int(64)              DEFAULT NULL COMMENT '是否打包：1打包、2不打包',
+    `guaranteeTypeKey`       VARCHAR(255)         DEFAULT NULL COMMENT '担保类型key',
+    `guaranteeTypeValue`     VARCHAR(255)         DEFAULT NULL COMMENT '担保类型value',
+    `isVehFloat`             int(32)              DEFAULT NULL COMMENT '是否车损上浮',
+    `vehAccidentAmount`      decimal(10, 0)       DEFAULT NULL COMMENT '单车意外险',
+    `downPayRatio`           decimal(10, 0)       DEFAULT NULL COMMENT '首付比例（%）',
+    `downPayRatioKey`        VARCHAR(255)         DEFAULT NULL COMMENT '首付比例（%）key',
+    `downPayRatioLeast`      decimal(10, 0)       DEFAULT NULL COMMENT '最低首付比例（%）',
+    `downPayRatioLeastKey`   VARCHAR(255)         DEFAULT NULL COMMENT '最低首付比例（%）key',
+    `bondRatio`              decimal(10, 0)       DEFAULT NULL COMMENT '保证金比例（%）',
+    `bondRatioKey`           VARCHAR(255)         DEFAULT NULL COMMENT '保证金比例（%）key',
+    `period`                 int(64)              DEFAULT NULL COMMENT '期数',
+    `periodKey`              VARCHAR(255)         DEFAULT NULL COMMENT '期数key',
+    `yearRatio`              decimal(10, 2)       DEFAULT NULL COMMENT '标准年利率（%）',
+    `serviceAmountTypeKey`   varchar(255)         DEFAULT NULL COMMENT '服务费类型key',
+    `serviceAmountTypeValue` varchar(255)         DEFAULT NULL COMMENT '服务费类型value',
+    `serviceAmount`          decimal(10, 0)       DEFAULT NULL COMMENT '服务费',
+    `depositPremium`         decimal(10, 0)       DEFAULT NULL COMMENT '保险保证金',
+    `depositSettle`          decimal(10, 0)       DEFAULT NULL COMMENT '落户保证金',
+    `nominalPrice`           decimal(10, 0)       DEFAULT NULL COMMENT '名义/留购价款',
+    `validDateTo`            varchar(255)         DEFAULT NULL COMMENT '有效期至',
+    `filingState`            int(64)              DEFAULT NULL COMMENT '报备状态：1已报备，0未报备,2报备中',
+    `useSate`                int(64)              DEFAULT NULL COMMENT '使用状态：1停用  0正常 各分公司设置的状态',
+    `riskState`              int(64)              DEFAULT NULL COMMENT '风控状态：1禁用 0正常  风控中心设置的状态',
+    `isOtherProduct`         int(64)              DEFAULT NULL COMMENT '是否有其他融：1有，0无',
+    `useDeptSids`            text                 DEFAULT NULL COMMENT '适用销售部门sids(逗号分隔)',
+    `useDeptNames`           text                 DEFAULT NULL COMMENT '适用销售部门名称(逗号分隔)',
+    `createOrgSid`           varchar(255)         DEFAULT NULL COMMENT '创建组织sid',
+    `createOrgName`          varchar(255)         DEFAULT NULL COMMENT '创建组织名称',
+    `useOrgSid`              varchar(255)         DEFAULT NULL COMMENT '使用组织sid',
+    `useOrgName`             varchar(255)         DEFAULT NULL COMMENT '使用组织名称',
+    `orgPath`                varchar(255)         DEFAULT NULL COMMENT '组织全路径',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='金融产品政策';
+
+
+-- 其他融产品
+DROP TABLE IF EXISTS `loan_fin_otherPolicy`;
+CREATE TABLE `loan_fin_otherPolicy`
+(
+    `id`               int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`              varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`      int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`       timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`       timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`         int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`            int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`         int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`          varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`      varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`      varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `otherPolicyName`  VARCHAR(255)         DEFAULT NULL COMMENT '产品名称：组合（资方+产品类别+最高融资比例+期数）',
+    `bankSid`          VARCHAR(255)         DEFAULT NULL COMMENT '资方sid',
+    `bankShortName`    VARCHAR(255)         DEFAULT NULL COMMENT '资方名称',
+    `mainPolicySid`    VARCHAR(64)          DEFAULT NULL COMMENT '主产品sid(可以为空)',
+    `productTypeKey`   VARCHAR(64)          DEFAULT NULL COMMENT '产品类别Key',
+    `productTypeValue` VARCHAR(64)          DEFAULT NULL COMMENT '产品类别value',
+    `busTypeKey`       VARCHAR(255)         DEFAULT NULL COMMENT '业务类型key',
+    `busTypeValue`     VARCHAR(255)         DEFAULT NULL COMMENT '业务类型value',
+    `vehCategoryKey`   VARCHAR(255)         DEFAULT NULL COMMENT '车辆大类key',
+    `vehCategoryValue` VARCHAR(255)         DEFAULT NULL COMMENT '车辆大类value',
+    `vehTypeKey`       VARCHAR(255)         DEFAULT NULL COMMENT '车辆功能key',
+    `vehTypeValue`     VARCHAR(255)         DEFAULT NULL COMMENT '车辆功能value',
+    `maxLoanRatio`     decimal(10, 0)       DEFAULT NULL COMMENT '最高融资额比例（%）',
+    `maxLoanAmount`    decimal(10, 0)       DEFAULT NULL COMMENT '最高融资额',
+    `period`           int(64)              DEFAULT NULL COMMENT '期数',
+    `periodKey`        VARCHAR(255)         DEFAULT NULL COMMENT '期数key',
+    `yearRatio`        decimal(10, 2)       DEFAULT NULL COMMENT '年利率（%）',
+    `validDateTo`      varchar(255)         DEFAULT NULL COMMENT '有效期至',
+    `filingState`      int(64)              DEFAULT NULL COMMENT '报备状态：1已报备，0未报备',
+    `useSate`          int(64)              DEFAULT NULL COMMENT '使用状态：1停用  0正常 各分公司设置的状态',
+    `riskState`        int(64)              DEFAULT NULL COMMENT '风控状态：1禁用 0正常  风控中心设置的状态',
+    `isOtherProduct`   int(64)              DEFAULT NULL COMMENT '是否有其他融：1有，0无',
+    `useDeptSids`      text                 DEFAULT NULL COMMENT '适用销售部门sids(逗号分隔)',
+    `useDeptNames`     text                 DEFAULT NULL COMMENT '适用销售部门名称(逗号分隔)',
+    `createOrgSid`     varchar(255)         DEFAULT NULL COMMENT '创建组织sid',
+    `createOrgName`    varchar(255)         DEFAULT NULL COMMENT '创建组织名称',
+    `useOrgSid`        varchar(255)         DEFAULT NULL COMMENT '使用组织sid',
+    `useOrgName`       varchar(255)         DEFAULT NULL COMMENT '使用组织名称',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='其他融产品';
+
+
+