优化

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

@@ -49,7 +49,7 @@ public interface LoanFinOtherPolicyFeign {
 
     @GetMapping("selectList")
     @ApiOperation("获取产品政策下其他融，或分公司下其他融")
-    ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name);
+    ResultBean<List<OtherPolicyVo>> 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);
 
     @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启")
     @PostMapping("setState")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java

@@ -30,7 +30,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
 
     List<OtherPolicyVo> selectListOne(@Param("sid") String sid,@Param("name") String name);
 
-    List<OtherPolicyVo> selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
+    List<OtherPolicyVo> selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param("type") String type,@Param("deptSid") String deptSid);
 
     IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml

@@ -36,23 +36,56 @@
     </select>
 
     <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
-        select lfo.sid, lfo.otherPolicyName as name, lfo.period, lfo.periodKey, lfo.yearRatio,lfo.maxLoanRatio,lfo.maxLoanAmount
+        select lfo.sid,
+               lfo.otherPolicyName as name,
+               lfo.period,
+               lfo.periodKey,
+               lfo.yearRatio,
+               lfo.maxLoanRatio,
+               lfo.maxLoanAmount
         from loan_fin_otherpolicy lfo
-        where lfo.mainPolicySid = #{sid} and useSate = 0 and riskState = 0
+        where lfo.mainPolicySid = #{sid}
+          and useSate = 0
+          and riskState = 0
         <if test="name != null and name != ''">
             and lfo.otherPolicyName like concat('%', #{name}, '%')
         </if>
     </select>
 
     <select id="selectListTwo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
-        select lfo.sid, lfo.otherPolicyName as name
+       select distinct a.sid, a.name,a.id from ( select lfo.sid, lfo.otherPolicyName as name,lfo.id
         from loan_fin_otherpolicy lfo
         where lfo.useOrgSid = #{useOrgSid}
           and lfo.filingState = 2
           and lfo.validDateTo > now()
+        and lfo.useSate = 0
+        and lfo.riskState = 0
         <if test="name != null and name != ''">
             and lfo.otherPolicyName like concat('%', #{name}, '%')
         </if>
+        <if test="deptSid != null and deptSid != ''">
+            and lfo.useDeptSids like concat('%',#{deptSid},'%')
+        </if>
+        <if test="type != null and type != ''">
+            and lfo.vehTypeKey like concat('%',#{type},'%')
+        </if>
+        union all
+        select lfo.sid, lfo.otherPolicyName as name,lfo.id
+        from loan_fin_otherpolicy lfo
+        where lfo.useOrgSid = #{useOrgSid}
+        and lfo.filingState = 2
+        and lfo.useSate = 0
+        and lfo.riskState = 0
+        and lfo.validDateTo > now()
+        <if test="name != null and name != ''">
+            and lfo.otherPolicyName like concat('%', #{name}, '%')
+        </if>
+        <if test="useOrgSid != null and useOrgSid != ''">
+            and lfo.useOrgSid like concat('%',#{useOrgSid},'%') and (lfo.useDeptSids is null or lfo.useDeptSids = '')
+        </if>
+        <if test="type != null and type != ''">
+            and lfo.vehTypeKey like concat('%',#{type},'%')
+        </if>) a order by a.id desc
     </select>
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyPageVo">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java

@@ -51,8 +51,8 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
     }
 
     @Override
-    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name) {
-        return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name);
+    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name,String modelSid) {
+        return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name,modelSid);
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -14,6 +14,7 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
+import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -40,6 +42,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanFinPolicyService loanFinPolicyService;
 
     /**
      * 根据主产品sid查询
@@ -88,13 +92,15 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         return baseMapper.selectByMainSids(sid);
     }
 
-    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name) {
+    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name,String modelSid) {
         ResultBean<List<OtherPolicyVo>> rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        String vehTypeKey = loanFinPolicyService.selectVehType(modelSid);
+        String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size() - 1);
         List<OtherPolicyVo> list = baseMapper.selectListOne(sid,name);
         list.removeAll(Collections.singleton(null));
         if (list.isEmpty()) {
-            list = baseMapper.selectListTwo(useOrgSid,name);
+            list = baseMapper.selectListTwo(useOrgSid,name,vehTypeKey,deptSid);
             list.removeAll(Collections.singleton(null));
         }
 

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

@@ -23,11 +23,11 @@ public interface LoanFinPolicyMapper extends BaseMapper<LoanFinPolicy> {
     @Select("select * from loan_fin_policy where bankSid = #{sid}")
     List<LoanFinPolicy> selectByBankSid(String sid);
 
-    IPage<AppLoanFinPolicyVo> getProductList(IPage<LoanFinPolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFinPolicy> qw, @Param("name") String name);
+    IPage<AppLoanFinPolicyVo> getProductList(IPage<LoanFinPolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFinPolicy> qw, @Param("name") String name,@Param("useOrgSid") String useOrgSid,@Param("deptSid") String deptSid);
 
     AppPolicyDetailsVo getProductInfo(String sid);
 
-    List<PolicyVo> selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey);
+    List<PolicyVo> selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey,@Param("useOrgSid") String useOrgSid);
 
     String selectVehType(String modelSid);
 }

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

@@ -45,8 +45,29 @@
     </select>
 
     <select id="getProductList" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo">
+        select distinct a.sid, a.policyName, a.id from ( select lfp.sid,
+                                                                lfp.policyName,
+                                                                lfp.id
+                                                         from loan_fin_policy lfp
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and lfp.policyName LIKE concat('%'
+                  , #{name}
+                  , '%')
+            </if>
+            and lfp.validDateTo
+              > now()
+            <if test="deptSid != null and deptSid != ''">
+                and lfp.useDeptSids like concat('%'
+                  , #{deptSid}
+                  , '%')
+            </if>
+        </where>
+        union all
         select lfp.sid,
-               lfp.policyName
+            lfp.policyName,
+            lfp.id
         from loan_fin_policy lfp
         <where>
             ${ew.sqlSegment}
@@ -57,8 +78,14 @@
             </if>
             and lfp.validDateTo
               > now()
+            <if test="useOrgSid != null and useOrgSid != ''">
+                and lfp.useOrgSid like concat('%'
+                  , #{useOrgSid}
+                  , '%') and (lfp.useDeptSids is null or lfp.useDeptSids = '')
+            </if>
         </where>
-        order by lfp.id desc
+        ) a
+        order by a.id desc
     </select>
 
     <select id="getProductInfo" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.AppPolicyDetailsVo">
@@ -93,7 +120,23 @@
     </select>
 
     <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo">
-        select lfp.policyName              name,
+       select distinct
+        a.sid,
+        a.name,
+        a.downPayRatio,
+        a.downPayRatioKey,
+        a.period,
+        a.periodKey,
+        a.bondRatio,
+        a.bondRatioKey,
+        a.yearRatio,
+        a.serviceChargeTypeKey,
+        a.serviceChargeTypeValue,
+        a.depositPremium,
+        a.depositSettle,
+        a.nominalPrice,
+        a.vehAccidentAmount,
+        a.id from ( select lfp.policyName              name,
                lfp.sid,
                lfp.downPayRatio,
                lfp.downPayRatioKey,
@@ -107,7 +150,8 @@
                lfp.depositPremium,
                lfp.depositSettle,
                lfp.nominalPrice,
-               lfp.vehAccidentAmount
+               lfp.vehAccidentAmount,
+        lfp.id
         from loan_fin_policy lfp
         where lfp.filingState = 1
           and isPack = #{isPack}
@@ -123,6 +167,38 @@
         <if test="name != null and name != ''">
             and lfp.policyName like concat('%', #{name}, '%')
         </if>
+        union all
+        select lfp.policyName              name,
+        lfp.sid,
+        lfp.downPayRatio,
+        lfp.downPayRatioKey,
+        lfp.period,
+        lfp.periodKey,
+        lfp.bondRatio,
+        lfp.bondRatioKey,
+        lfp.yearRatio,
+        lfp.serviceAmountTypeKey as serviceChargeTypeKey,
+        lfp.serviceAmount        as serviceChargeTypeValue,
+        lfp.depositPremium,
+        lfp.depositSettle,
+        lfp.nominalPrice,
+        lfp.vehAccidentAmount,
+        lfp.id
+        from loan_fin_policy lfp
+        where lfp.filingState = 1
+        and isPack = #{isPack}
+        <if test="useOrgSid != null and useOrgSid != ''">
+            and lfp.useOrgSid like concat('%', #{useOrgSid}, '%') and (lfp.useDeptSids is null or lfp.useDeptSids = '')
+        </if>
+        <if test="vehTypeKey != null and vehTypeKey != ''">
+            and lfp.vehTypeKey like concat('%', #{vehTypeKey}, '%')
+        </if>
+        and lfp.validDateTo > now()
+        and lfp.useSate = 0
+        and lfp.riskState = 0
+        <if test="name != null and name != ''">
+            and lfp.policyName like concat('%', #{name}, '%')
+        </if>) a order by a.id desc
     </select>
 
     <select id="selectVehType" resultType="java.lang.String">

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanfinpolicy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -589,6 +590,8 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
     public PagerVo<AppLoanFinPolicyVo> getProductList(PagerQuery<AppLoanFinPolicyQuery> pagerQuery) {
         AppLoanFinPolicyQuery query = pagerQuery.getParams();
         QueryWrapper<LoanFinPolicy> qw = new QueryWrapper<>();
+        String useOrgSid = "";
+        String deptSid = "";
         if (query != null) {
             //========================================数据授权开始
            /* PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@@ -628,17 +631,17 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 return p;
             }*/
             if (StringUtils.isNotBlank(query.getOrgPath())) {
-                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-                qw.eq("lfp.useOrgSid", useOrgSid);
-                String deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size()-1);
-                qw.like("lfp.useDeptSids", deptSid);
+                 useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+//                qw.eq("lfp.useOrgSid", useOrgSid);
+                 deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size()-1);
+//                qw.like("lfp.useDeptSids", deptSid);
             }
             qw.eq("lfp.filingState", 1);
             qw.eq("lfp.useSate", 0);
             qw.eq("lfp.riskState", 0);
         }
         IPage<LoanFinPolicy> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppLoanFinPolicyVo> pagging = baseMapper.getProductList(page, qw, query.getName());
+        IPage<AppLoanFinPolicyVo> pagging = baseMapper.getProductList(page, qw, query.getName(),useOrgSid,deptSid);
         PagerVo<AppLoanFinPolicyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
 
@@ -671,8 +674,12 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         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<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey);
+        List<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey,useOrgSid);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
+    public String selectVehType(String modelSid) {
+        return baseMapper.selectVehType(modelSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java

@@ -48,7 +48,7 @@ public interface SolutionsFeign {
     @ApiOperation("获取产品政策下其他融，或分公司下其他融")
     @GetMapping("/selectOtherList")
     @ResponseBody
-    ResultBean<List<OtherPolicysVo>> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name);
+    ResultBean<List<OtherPolicysVo>> 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);
 
     @ApiOperation("初始化金融方案2")
     @GetMapping("/selectDetailsVo2")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java

@@ -44,8 +44,8 @@ public class SolutionsRest implements SolutionsFeign {
     }
 
     @Override
-    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name) {
-        return solutionsService.selectOtherList(orgPath, userSid, sid, name);
+    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name,String modelSid) {
+        return solutionsService.selectOtherList(orgPath, userSid, sid, name,modelSid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java

@@ -75,10 +75,10 @@ public class SolutionsService {
         return rb.success().setData(listNew);
     }
 
-    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name) {
+    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name,String modelSid) {
         ResultBean<List<OtherPolicysVo>> rb = ResultBean.fireFail();
         List<OtherPolicysVo> listNew = new ArrayList<>();
-        ResultBean<List<OtherPolicyVo>> resultBean = loanFinOtherPolicyFeign.selectList(orgPath, userSid, sid, name);
+        ResultBean<List<OtherPolicyVo>> resultBean = loanFinOtherPolicyFeign.selectList(orgPath, userSid, sid, name,modelSid);
         if (resultBean.getData() != null && !resultBean.getData().isEmpty()) {
             List<OtherPolicyVo> list = resultBean.getData();
             list.removeAll(Collections.singleton(null));