|
|
|
@ -168,8 +168,16 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
int size = resultList.size(); |
|
|
|
if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) { |
|
|
|
return rb.success().setData(resultList).setMsg(importReturn.getCheckInfo2()); |
|
|
|
} else if (StringUtils.isNotBlank(importReturn.getCheckInfo3())) { |
|
|
|
String checkInfo3 = importReturn.getCheckInfo3(); |
|
|
|
String[] split = checkInfo3.split("-"); |
|
|
|
Integer i = Integer.valueOf(split[0]); |
|
|
|
int i1 = i.intValue(); |
|
|
|
int i2 = size - i1; |
|
|
|
String sBankNo = split[1]; |
|
|
|
return rb.success().setData(resultList).setMsg("共" + size + "条记录，成功导入" + i2 + "条，导入未成功的资方合同号为：" + sBankNo + "。导入点击“确定”，不导入点击”取消“。"); |
|
|
|
} else { |
|
|
|
return rb.success().setData(resultList).setMsg("数据校验成功，请点击“确定”按钮，导入数据。"); |
|
|
|
return rb.success().setData(resultList).setMsg("数据校验成功共" + size + "条记录，导入点击“确定”，不导入点击”取消“。"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
String checkResult = importReturn.getCheckInfo(); |
|
|
|
@ -185,6 +193,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
int[] resultIndex = new int[resultCell.length]; |
|
|
|
Set<String> checkWord = new HashSet<>(); |
|
|
|
Set<String> checkWord2 = new HashSet<>(); |
|
|
|
Set<String> checkWord3 = new HashSet<>(); |
|
|
|
for (int r = 1; r <= sheet.getLastRowNum(); r++) { |
|
|
|
Row row = sheet.getRow(r); |
|
|
|
if (row == null) { |
|
|
|
@ -253,7 +262,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
importVoList.add(importVo); |
|
|
|
} |
|
|
|
StringBuffer sbBankCNo = new StringBuffer(); |
|
|
|
|
|
|
|
int i = 0; |
|
|
|
if (!importVoList.isEmpty()) { |
|
|
|
for (RepaymentExcelInfo excelInfo : importVoList) { |
|
|
|
if (StringUtils.isBlank(excelInfo.getRealReturnTime()) || |
|
|
|
@ -286,6 +295,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
List<LoanRepaymentPlanDetails> planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(bankContractNo, period); |
|
|
|
if (planDetails.isEmpty() || planDetails == null) { |
|
|
|
sbBankCNo.append(bankContractNo).append("、"); |
|
|
|
i++; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getBankContractNo()) && StringUtils.isNotBlank(excelInfo.getRealReturnTime())) { |
|
|
|
@ -294,18 +304,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
if (!realReturnTime.equals("error")) { |
|
|
|
List<LoanRepaymentHistory> histories = baseMapper.selByBankNoAndActDate(bankContractNo, realReturnTime); |
|
|
|
if (!histories.isEmpty() || histories.size() > 0) { |
|
|
|
checkWord2.add("实还日期:" + realReturnTime + "、资方合同编号:" + bankContractNo); |
|
|
|
checkWord2.add(bankContractNo + "(" + realReturnTime + ")"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
String bankCo = ""; |
|
|
|
if (sbBankCNo.length() > 0) { |
|
|
|
sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length()); |
|
|
|
bankCo = "资方合同号" + sbBankCNo + "不存在"; |
|
|
|
} |
|
|
|
checkWord.add(bankCo); |
|
|
|
// String bankCo = "";
|
|
|
|
// if (sbBankCNo.length() > 0) {
|
|
|
|
// sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
|
|
|
|
// bankCo = "资方合同号" + sbBankCNo + "不存在";
|
|
|
|
// }
|
|
|
|
// checkWord.add(bankCo);
|
|
|
|
StringBuffer sbcheck1 = new StringBuffer(); |
|
|
|
if (!checkWord.isEmpty()) { |
|
|
|
for (String s : checkWord) { |
|
|
|
@ -332,10 +342,20 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
} |
|
|
|
} |
|
|
|
if (sbcheck2.length() > 0) { |
|
|
|
sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length()); |
|
|
|
importReturn.setCheckInfo2("已存在" + sbcheck2.toString() + "的记录，是否继续导入，导入点击“确定”，不导入点击”取消“。"); |
|
|
|
if (sbBankCNo.length() > 0) { |
|
|
|
sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length()); |
|
|
|
sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length()); |
|
|
|
importReturn.setCheckInfo2("1.平台中不存在的资方编号：" + sbBankCNo + "。2.平台中已存在资方实还日期记录：" + sbcheck2 + "。是否继续导入，导入点击“确定”，不导入点击”取消“。导入时只有系统中存在的资方合同号的记录才导入系统。"); |
|
|
|
} else { |
|
|
|
sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length()); |
|
|
|
importReturn.setCheckInfo2("平台中已存在资方实还日期记录：" + sbcheck2 + "。是否继续导入，导入点击“确定”，不导入点击”取消“。"); |
|
|
|
} |
|
|
|
return importReturn; |
|
|
|
} |
|
|
|
if (sbBankCNo.length() > 0) { |
|
|
|
sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length()); |
|
|
|
importReturn.setCheckInfo3(i + "-" + sbBankCNo); |
|
|
|
} |
|
|
|
return importReturn; |
|
|
|
} |
|
|
|
|
|
|
|
@ -806,7 +826,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
//直还+转付余额为零的设置默认划扣状态已通过
|
|
|
|
List<String> hisSidsForBuckle = baseMapper.selSidsForBuckle(pushUseOrgSid); |
|
|
|
if (!hisSidsForBuckle.isEmpty()) { |
|
|
|
int i = baseMapper.setBuckleState(hisSidsForBuckle,"003","审核通过"); |
|
|
|
int i = baseMapper.setBuckleState(hisSidsForBuckle, "003", "审核通过"); |
|
|
|
} |
|
|
|
if (histories.isEmpty() && hisSidsForBuckle.isEmpty()) { |
|
|
|
return rb.setMsg("暂无可更新的数据"); |
|
|
|
@ -1344,18 +1364,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("p.orgSidPath", orgSidPath); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("p.orgSidPath", orgSidPath); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("p.orgSidPath", orgSidPath); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("p.orgSidPath", orgSidPath); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("p.salesUserSid", pagerQuery.getUserSid()); |
|
|
|
qw.eq("a.salesUserSid", pagerQuery.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<RepaymentDetailsListVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
@ -1366,77 +1386,77 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
} |
|
|
|
//=======================
|
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { |
|
|
|
qw.like("p.vinNo", pagerQuery.getVinNo()); |
|
|
|
qw.like("a.vinNo", pagerQuery.getVinNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { |
|
|
|
qw.like("p.useOrgName", pagerQuery.getUseOrgName()); |
|
|
|
qw.like("a.useOrgName", pagerQuery.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getDept())) { |
|
|
|
qw.like("p.dept", pagerQuery.getDept()); |
|
|
|
qw.like("a.dept", pagerQuery.getDept()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) { |
|
|
|
qw.like("h.returnWayKey", pagerQuery.getReturnWayKey()); |
|
|
|
qw.like("a.returnWayKey", pagerQuery.getReturnWayKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getStaffName())) { |
|
|
|
qw.like("p.staffName", pagerQuery.getStaffName()); |
|
|
|
qw.like("a.staffName", pagerQuery.getStaffName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) { |
|
|
|
qw.like("h.buckleKey", pagerQuery.getBuckleKey()); |
|
|
|
qw.like("a.buckleKey", pagerQuery.getBuckleKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) { |
|
|
|
qw.like("p.loanContractNo", pagerQuery.getLoanContractNo()); |
|
|
|
qw.like("a.loanContractNo", pagerQuery.getLoanContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getPeriod())) { |
|
|
|
qw.eq("p.period", pagerQuery.getPeriod()); |
|
|
|
qw.eq("a.period", pagerQuery.getPeriod()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getBankName())) { |
|
|
|
qw.like("p.bankName", pagerQuery.getBankName()); |
|
|
|
qw.like("a.bankName", pagerQuery.getBankName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) { |
|
|
|
qw.like("p.bankContractNo", pagerQuery.getBankContractNo()); |
|
|
|
qw.like("a.bankContractNo", pagerQuery.getBankContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getCustomer())) { |
|
|
|
qw.like("p.customer", pagerQuery.getCustomer()); |
|
|
|
qw.like("a.customer", pagerQuery.getCustomer()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) { |
|
|
|
qw.like("p.borrowerName", pagerQuery.getBorrowerName()); |
|
|
|
qw.like("a.borrowerName", pagerQuery.getBorrowerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getBillNo())) { |
|
|
|
qw.like("h.skdBillNo", pagerQuery.getBillNo()); |
|
|
|
qw.like("a.skdBillNo", pagerQuery.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getUpdateState())) { |
|
|
|
qw.eq("h.updateState", pagerQuery.getUpdateState()); |
|
|
|
qw.eq("a.updateState", pagerQuery.getUpdateState()); |
|
|
|
} |
|
|
|
String dueStartDate = pagerQuery.getDueStartDate(); |
|
|
|
String dueEndDate = pagerQuery.getDueEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(dueEndDate), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String actualStartDate = pagerQuery.getActualStartDate(); |
|
|
|
String actualEndDate = pagerQuery.getActualEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (a.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(actualEndDate), "date_format (a.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String dataStartTime = pagerQuery.getDataStartTime(); |
|
|
|
String dataEndTime = pagerQuery.getDataEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (h.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (a.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(dataEndTime), "date_format (a.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String closingStartDate = pagerQuery.getClosingStartDate(); |
|
|
|
String closingEndDate = pagerQuery.getClosingEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (h.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(closingEndDate), "date_format (h.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (a.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(closingEndDate), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String updateStartTime = pagerQuery.getUpdateStartDate(); |
|
|
|
String updateEndTime = pagerQuery.getUpdateEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (h.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(updateEndTime), "date_format (h.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (a.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("1", "1"); |
|
|
|
qw.orderBy(true, true, "p.useOrgName") |
|
|
|
.orderBy(true, true, "p.vinNo") |
|
|
|
.orderBy(true, true, "p.period") |
|
|
|
.orderBy(true, true, "p.loanContractNo") |
|
|
|
qw.orderBy(true, true, "a.useOrgName") |
|
|
|
.orderBy(true, true, "a.vinNo") |
|
|
|
.orderBy(true, true, "a.period") |
|
|
|
.orderBy(true, true, "a.loanContractNo") |
|
|
|
; |
|
|
|
IPage<RepaymentDetailsListVo> pagging = baseMapper.repaymentDetailsList(page, qw); |
|
|
|
PagerVo<RepaymentDetailsListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
|
God
1 year ago