|
|
@ -564,7 +564,7 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp |
|
|
|
loanOverdueFinDetailVo.setCreateDate(DateUtil.today()); |
|
|
|
//截止时间
|
|
|
|
loanOverdueFinDetailVo.setStopDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
List<LoanOverdueFinDetailsDto> detailsList = detailsList(useOrgSid); |
|
|
|
List<LoanOverdueFinDetailsDto> detailsList = detailsList(useOrgSid, loanOverdueFinDetailVo.getStopDate()); |
|
|
|
loanOverdueFinDetailVo.setDetailsVoList(detailsList); |
|
|
|
} else {//编辑初始化
|
|
|
|
LoanOverdueFin loanOverdueFin = fetchBySid(sid); |
|
|
@ -586,11 +586,11 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp |
|
|
|
return rb.success().setData(loanOverdueFinDetailVo); |
|
|
|
} |
|
|
|
|
|
|
|
public List<LoanOverdueFinDetailsDto> detailsList(String useOrgSid) { |
|
|
|
public List<LoanOverdueFinDetailsDto> detailsList(String useOrgSid, String stopDate) { |
|
|
|
QueryWrapper qw = new QueryWrapper(); |
|
|
|
qw.groupBy("a1.vinNo"); |
|
|
|
qw.groupBy("a1.busVinSid"); |
|
|
|
List<LoanOverdueFinDetailsDto> detailsDtoList = baseMapper.detailsList(useOrgSid, qw); |
|
|
|
List<LoanOverdueFinDetailsDto> detailsDtoList = baseMapper.detailsList(useOrgSid, qw, stopDate); |
|
|
|
detailsDtoList.removeAll(Collections.singleton(null)); |
|
|
|
return detailsDtoList; |
|
|
|
} |
|
|
|