|
|
|
@ -137,6 +137,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell) { |
|
|
|
ReturnExcelInfo importReturn = new ReturnExcelInfo(); |
|
|
|
List<RepaymentExcelInfo> importVoList = new ArrayList<>(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
int[] resultIndex = new int[resultCell.length]; |
|
|
|
Set<String> checkWord = new HashSet<>(); |
|
|
|
Set<String> checkWord2 = new HashSet<>(); |
|
|
|
@ -154,6 +155,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
NullPointerException nullPointerException = new NullPointerException(); |
|
|
|
} |
|
|
|
String temp = getCellVal(row.getCell(i)).toString().trim(); |
|
|
|
Date dateCellValue = row.getCell(2).getDateCellValue(); |
|
|
|
for (int j = 0; j < resultCell.length; j++) { |
|
|
|
if (i == resultCell[j]) { |
|
|
|
switch (i) { |
|
|
|
@ -164,7 +166,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
importVo.setPeriod(temp); |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
importVo.setRealReturnTime(temp); |
|
|
|
importVo.setRealReturnTime(sdf.format(dateCellValue)); |
|
|
|
break; |
|
|
|
case 3: |
|
|
|
importVo.setRealMoney(temp); |
|
|
|
@ -204,7 +206,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
importVoList.add(importVo); |
|
|
|
} |
|
|
|
StringBuffer sbBankCNo = new StringBuffer(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
|
|
|
if (!importVoList.isEmpty()) { |
|
|
|
for (RepaymentExcelInfo excelInfo : importVoList) { |
|
|
|
if (StringUtils.isBlank(excelInfo.getRealReturnTime()) || |
|
|
|
@ -713,6 +715,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
baseMapper.updateById(repaymentHistory); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
return rb.setMsg("暂无可更新的还款记录"); |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
@ -839,10 +843,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
} |
|
|
|
} |
|
|
|
qw.eq("h.returnWayKey", "02"); |
|
|
|
qw.apply("date_format (h.actualDate,'%Y-%m-%d') <= date_format(p.dueDate,'%Y-%m-%d')"); |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getOverdue())) { |
|
|
|
if ("1".equals(pagerQuery.getOverdue())) { |
|
|
|
qw.apply("date_format (h.actualDate,'%Y-%m-%d') <= date_format(p.dueDate,'%Y-%m-%d')"); |
|
|
|
} else if ("0".equals(pagerQuery.getOverdue())) { |
|
|
|
qw.apply("date_format (h.actualDate,'%Y-%m-%d') > date_format(p.dueDate,'%Y-%m-%d')"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { |
|
|
|
qw.like("p.vinNo", pagerQuery.getVinNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) { |
|
|
|
qw.like("p.loanContractNo", pagerQuery.getLoanContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getPeriod())) { |
|
|
|
qw.eq("p.period", pagerQuery.getPeriod()); |
|
|
|
} |
|
|
|
|
God
1 year ago