diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java index 80a31186c6..1643ba8245 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java @@ -29,5 +29,5 @@ public interface LoanOverdueFinMapper extends BaseMapper { int updateFlowFiled(Map beanToMap); - List detailsList(@Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw); + List detailsList(@Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("stopDate") String stopDate); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml index f591cb9eff..77bdcf5090 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml @@ -68,9 +68,6 @@ a1.borrowerName loanName FROM (SELECT lrpd.sid, lrpd.busVinSid, - lrpd.`useOrgName`, - lrpd.`dept`, - lrpd.`loanContractNo`, lrpd.borrowerName, lrpd.`vinNo`, lrpd.dueMoney, @@ -86,7 +83,7 @@ ON lrh.planDetailSid = lrpd.`sid` LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv ON lrpd.busVinSid = bv.sid - WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() + WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate} and lrpd.useOrgSid = #{useOrgSid} GROUP BY lrpd.`sid` HAVING (yq_total > 0)) a1 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java index d0aafbd5df..72ccb76e76 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java @@ -564,7 +564,7 @@ public class LoanOverdueFinService extends MybatisBaseService detailsList = detailsList(useOrgSid); + List detailsList = detailsList(useOrgSid, loanOverdueFinDetailVo.getStopDate()); loanOverdueFinDetailVo.setDetailsVoList(detailsList); } else {//编辑初始化 LoanOverdueFin loanOverdueFin = fetchBySid(sid); @@ -586,11 +586,11 @@ public class LoanOverdueFinService extends MybatisBaseService detailsList(String useOrgSid) { + public List detailsList(String useOrgSid, String stopDate) { QueryWrapper qw = new QueryWrapper(); qw.groupBy("a1.vinNo"); qw.groupBy("a1.busVinSid"); - List detailsDtoList = baseMapper.detailsList(useOrgSid, qw); + List detailsDtoList = baseMapper.detailsList(useOrgSid, qw, stopDate); detailsDtoList.removeAll(Collections.singleton(null)); return detailsDtoList; }