优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -489,7 +489,9 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         strings.add(sid);
 //        baseManufacturerBankService.updateBySidIsDelete(strings);
         List<BaseManufacturerBankDto> baseManufacturerBankDto = dto.getBaseManufacturerBankDto();
-        if (baseManufacturerBankDto.size() > 0) {
+        List<String> stringList = baseManufacturerBankDto.stream().map(v->v.getSid()).collect(Collectors.toList());
+        List<BaseManufacturerBank> baseManufacturerBankList = baseManufacturerBankService.selectByManSid(sid);
+         if (baseManufacturerBankDto.size() > 0) {
             for (BaseManufacturerBankDto manufacturerBankDto : baseManufacturerBankDto) {
                 ResultBean resultBean1 = saveBaseManufacturerBankDto(manufacturerBankDto, sid);
                 if (!resultBean1.getCode().equals("200")) {
@@ -497,6 +499,15 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 }
             }
         }
+         if(!baseManufacturerBankList.isEmpty()){
+             List<String> stringList1 = baseManufacturerBankList.stream().map(v->v.getSid()).collect(Collectors.toList());
+             stringList.removeAll(Collections.singleton(null));
+             for (int j = 0; j < stringList1.size(); j++) {
+                 if(!stringList.contains(stringList1.get(j))){
+                     baseManufacturerBankService.updateBySidIsDeletes(stringList1.get(j));
+                 }
+             }
+         }
         //BaseManufacturerFinance baseManufacturerFinance = baseManufacturerFinanceService.selectByBaseManufacturerSid(sid);
         //baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(), baseManufacturerFinance.getSid());
         if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -81,4 +81,8 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
      * @return
      */
     List<ManBankVo> getBankList(String sid);
+
+    List<BaseManufacturerBank> selectByManSid(String sid);
+
+    int updateBySidIsDeletes(String s);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -165,4 +165,13 @@
     <select id="getBankList" resultType="com.yxt.anrui.base.api.basemanufacturer.ManBankVo">
         select depositBank as receiveBank,bankAccount as receiveBankAccount from base_manufacturer_bank where manufacturerSid = #{sid}
     </select>
+
+    <select id="selectByManSid" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank">
+        select * from base_manufacturer_bank where manufacturerSid = #{sid}
+    </select>
+
+    <update id="updateBySidIsDeletes">
+        UPDATE base_manufacturer_bank
+        SET isDelete = 1 where sid = #{s}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -102,4 +102,12 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public List<ManBankVo> getBankList(String sid) {
         return baseMapper.getBankList(sid);
     }
+
+    public List<BaseManufacturerBank> selectByManSid(String sid) {
+        return baseMapper.selectByManSid(sid);
+    }
+
+    public int updateBySidIsDeletes(String s) {
+        return baseMapper.updateBySidIsDeletes(s);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@@ -61,7 +61,7 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     @Update("update loan_preloan_credit_apply set state = #{state},dateTo = #{dateTo} where sid = #{sid}")
     void updateStateBySid(@Param("sid") String sid, @Param("state") Integer state, @Param("dateTo") String dateTo);
 
-    IPage<LoanPreloanVo> getOrderLoanPagerList(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanPreloanCreditApply> qw, @Param("name") String name);
+    IPage<LoanPreloanVo> getOrderLoanPagerList(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanPreloanCreditApply> qw, @Param("name") String name,@Param("list") List<String> list);
 
     LoanPreloanCreditApply judgeIsLoan(String sid);
     LoanPreloanCreditApply judgeIsLoan3(String sid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -32,7 +32,7 @@
         from loan_preloan_credit_apply la
         left join loan_preloan_credit_peo lp on la.sid = lp.mainSid
         <where>
-            ${ew.sqlSegment}
+            ${ew.sqlSegment} and la.custTypeKey = 1
             <if test="name != null and name != ''">
                 and concat(IFNULL(la.custName
                 , '')
@@ -43,6 +43,41 @@
                 , #{name}
                 , '%')
             </if>
+            <if test="list != null and list.size() != 0">
+                and la.custSid not in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by la.id desc) a group by a.custSid
+        union all
+        select a.* from ( select la.qySid custSid,la.idCard,
+        la.qyName custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,
+        la.phone,la.gsfkjg,la.capitalName,
+        la.zffkjg,
+        lp.peoName,
+        la.sid
+        from loan_preloan_credit_apply la
+        left join loan_preloan_credit_peo lp on la.sid = lp.mainSid
+        <where>
+            ${ew.sqlSegment} and la.custTypeKey = 2
+            <if test="name != null and name != ''">
+                and concat(IFNULL(la.qyName
+                , '')
+                , ifnull(la.`phone`
+                , ''),
+                , ifnull(la.`idCard`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            <if test="list != null and list.size() != 0">
+                and la.qySid not in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by la.id desc) a group by a.custSid
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -580,6 +580,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         //实际购车人为销售订单的客户，
         LoanPreloanQuery query = pagerQuery.getParams();
         QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
+        List<String> borrowSidList = new ArrayList<>();
         if (query != null) {
             //资方信用审核通过的
 //            qw.eq("la.zffkjgKey", "001");
@@ -601,11 +602,11 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             qw.eq("la.isDelete", 0);
             qw.eq("la.state", 2);
             //排除销售订单已选择的贷款人
-            List<String> borrowSidList = baseMapper.selectBySid(query.getOrderSid());
+            borrowSidList = baseMapper.selectBySid(query.getOrderSid());
             borrowSidList.removeAll(Collections.singleton(null));
-            if (borrowSidList.size() > 0) {
+           /* if (borrowSidList.size() > 0) {
                 qw.notIn("la.custSid", borrowSidList);
-            }
+            }*/
             //根据销售订单sid查询资方
             LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(query.getOrderSid());
             if (loanSolutions != null) {
@@ -618,7 +619,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             qw.apply("la.dateTo > now()");
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());
+        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName(),borrowSidList);
         PagerVo<LoanPreloanVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }