diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 803f636fab..9081b50065 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/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 baseManufacturerBankDto = dto.getBaseManufacturerBankDto(); - if (baseManufacturerBankDto.size() > 0) { + List stringList = baseManufacturerBankDto.stream().map(v->v.getSid()).collect(Collectors.toList()); + List 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 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())){ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index f911ddd477..86c3f1c301 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/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 getBankList(String sid); + + List selectByManSid(String sid); + + int updateBySidIsDeletes(String s); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index f68b27e71a..0c6f7fc88d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -165,4 +165,13 @@ + + + + + UPDATE base_manufacturer_bank + SET isDelete = 1 where sid = #{s} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index 60914fa74f..083e250da3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/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 getBankList(String sid) { return baseMapper.getBankList(sid); } + + public List selectByManSid(String sid) { + return baseMapper.selectByManSid(sid); + } + + public int updateBySidIsDeletes(String s) { + return baseMapper.updateBySidIsDeletes(s); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java index de110e2ce8..d906f93169 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java +++ b/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 getOrderLoanPagerList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + IPage getOrderLoanPagerList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name,@Param("list") List list); LoanPreloanCreditApply judgeIsLoan(String sid); LoanPreloanCreditApply judgeIsLoan3(String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index 474e61d77c..89b2d2a8eb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/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 - ${ew.sqlSegment} + ${ew.sqlSegment} and la.custTypeKey = 1 and concat(IFNULL(la.custName , '') @@ -43,6 +43,41 @@ , #{name} , '%') + + and la.custSid not in + + #{item} + + + + 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 + + ${ew.sqlSegment} and la.custTypeKey = 2 + + and concat(IFNULL(la.qyName + , '') + , ifnull(la.`phone` + , ''), + , ifnull(la.`idCard` + , '')) LIKE concat('%' + , #{name} + , '%') + + + and la.qySid not in + + #{item} + + order by la.id desc) a group by a.custSid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 6e5b6ae2b4..69db7cc05e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/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 qw = new QueryWrapper<>(); + List borrowSidList = new ArrayList<>(); if (query != null) { //资方信用审核通过的 // qw.eq("la.zffkjgKey", "001"); @@ -601,11 +602,11 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService 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 now()"); } IPage page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName()); + IPage pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName(),borrowSidList); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; }