|
|
@ -497,66 +497,69 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')"). |
|
|
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')" |
|
|
apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" |
|
|
); |
|
|
); |
|
|
List<String> monthHeadAndLast = getMonthHeadAndLast(new Date()); |
|
|
// List<String> monthHeadAndLast = getMonthHeadAndLast(new Date());
|
|
|
String head = monthHeadAndLast.get(0); |
|
|
// String head = monthHeadAndLast.get(0);
|
|
|
String last = monthHeadAndLast.get(1); |
|
|
// String last = monthHeadAndLast.get(1);
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
String actualStartDate = pagerQuery.getActualStartDate(); |
|
|
String actualStartDate = pagerQuery.getActualStartDate(); |
|
|
String actualEndDate = pagerQuery.getActualEndDate(); |
|
|
String actualEndDate = pagerQuery.getActualEndDate(); |
|
|
try { |
|
|
qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). |
|
|
Date headT = sdf.parse(head); |
|
|
apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" |
|
|
Date lastT = sdf.parse(last); |
|
|
); |
|
|
Date ast = null; |
|
|
// try {
|
|
|
Date aed = null; |
|
|
// Date headT = sdf.parse(head);
|
|
|
if (StringUtils.isNotBlank(actualStartDate)) { |
|
|
// Date lastT = sdf.parse(last);
|
|
|
ast = sdf.parse(actualStartDate); |
|
|
// Date ast = null;
|
|
|
} |
|
|
// Date aed = null;
|
|
|
if (StringUtils.isNotBlank(actualEndDate)) { |
|
|
// if (StringUtils.isNotBlank(actualStartDate)) {
|
|
|
aed = sdf.parse(actualEndDate); |
|
|
// ast = sdf.parse(actualStartDate);
|
|
|
} |
|
|
// }
|
|
|
|
|
|
// if (StringUtils.isNotBlank(actualEndDate)) {
|
|
|
if (StringUtils.isBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) { |
|
|
// aed = sdf.parse(actualEndDate);
|
|
|
if (aed.before(lastT)) { |
|
|
// }
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
//
|
|
|
apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" |
|
|
// if (StringUtils.isBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) {
|
|
|
); |
|
|
// if (aed.before(lastT)) {
|
|
|
} else { |
|
|
// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
// apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
// );
|
|
|
); |
|
|
// } else {
|
|
|
} |
|
|
// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
|
|
|
} else if (StringUtils.isBlank(actualEndDate) && StringUtils.isNotBlank(actualStartDate)) { |
|
|
// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
|
|
|
if (headT.before(ast)) { |
|
|
// );
|
|
|
qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). |
|
|
// }
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
// } else if (StringUtils.isBlank(actualEndDate) && StringUtils.isNotBlank(actualStartDate)) {
|
|
|
); |
|
|
// if (headT.before(ast)) {
|
|
|
} else { |
|
|
// qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
// );
|
|
|
); |
|
|
// } else {
|
|
|
} |
|
|
// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
|
|
|
} else if (StringUtils.isNotBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) { |
|
|
// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
|
|
|
if (headT.before(ast) && aed.before(lastT)) { |
|
|
// );
|
|
|
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')" |
|
|
// } else if (StringUtils.isNotBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) {
|
|
|
); |
|
|
// if (headT.before(ast) && aed.before(lastT)) {
|
|
|
} else if (headT.before(ast) && !aed.before(lastT)) { |
|
|
// qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
|
|
|
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')"
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + lastT + "','%Y-%m-%d')" |
|
|
// );
|
|
|
); |
|
|
// } else if (headT.before(ast) && !aed.before(lastT)) {
|
|
|
} else if (!headT.before(ast) && aed.before(lastT)) { |
|
|
// qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + lastT + "','%Y-%m-%d')"
|
|
|
apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" |
|
|
// );
|
|
|
); |
|
|
// } else if (!headT.before(ast) && aed.before(lastT)) {
|
|
|
} else if (!headT.before(ast) && !aed.before(lastT)) { |
|
|
// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
// apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
// );
|
|
|
); |
|
|
// } else if (!headT.before(ast) && !aed.before(lastT)) {
|
|
|
} |
|
|
// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
|
|
|
} |
|
|
// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
|
|
|
} catch (ParseException e) { |
|
|
// );
|
|
|
e.printStackTrace(); |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
|
|
|
// } catch (ParseException e) {
|
|
|
|
|
|
// e.printStackTrace();
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
String dataStartTime = pagerQuery.getDataStartTime(); |
|
|
String dataStartTime = pagerQuery.getDataStartTime(); |
|
|
String dataEndTime = pagerQuery.getDataEndTime(); |
|
|
String dataEndTime = pagerQuery.getDataEndTime(); |
|
|
@ -564,11 +567,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')" |
|
|
apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')" |
|
|
); |
|
|
); |
|
|
qw.orderByDesc("h.dataTime"); |
|
|
qw.orderByDesc("h.dataTime"); |
|
|
if (StringUtils.isBlank(actualStartDate) && StringUtils.isBlank(actualEndDate)) { |
|
|
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
IPage<LoanRepaymentHistoryVo> pagging = baseMapper.monthListPage(page, qw); |
|
|
IPage<LoanRepaymentHistoryVo> pagging = baseMapper.monthListPage(page, qw); |
|
|
List<LoanRepaymentHistoryVo> records = pagging.getRecords(); |
|
|
List<LoanRepaymentHistoryVo> records = pagging.getRecords(); |
|
|
records.removeAll(Collections.singleton(null)); |
|
|
records.removeAll(Collections.singleton(null)); |
|
|
@ -715,12 +713,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
qw.ne("h.buckleKey", "002"); |
|
|
qw.ne("h.buckleKey", "002"); |
|
|
qw.ne("h.buckleKey", "003"); |
|
|
qw.ne("h.buckleKey", "003"); |
|
|
qw.eq("h.updateState", "0"); |
|
|
qw.eq("h.updateState", "0"); |
|
|
List<String> monthHeadAndLast = getMonthHeadAndLast(new Date()); |
|
|
|
|
|
String head = monthHeadAndLast.get(0); |
|
|
|
|
|
String last = monthHeadAndLast.get(1); |
|
|
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
|
|
|
List<String> histories = baseMapper.selUpdateStateList(qw); |
|
|
List<String> histories = baseMapper.selUpdateStateList(qw); |
|
|
if (!histories.isEmpty()) { |
|
|
if (!histories.isEmpty()) { |
|
|
for (String historySid : histories) { |
|
|
for (String historySid : histories) { |
|
|
@ -755,12 +747,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
qw.like("p.orgSidPath", orgSidPath); |
|
|
qw.like("p.orgSidPath", orgSidPath); |
|
|
qw.ne("h.buckleKey", "002"); |
|
|
qw.ne("h.buckleKey", "002"); |
|
|
qw.ne("h.buckleKey", "003"); |
|
|
qw.ne("h.buckleKey", "003"); |
|
|
List<String> monthHeadAndLast = getMonthHeadAndLast(new Date()); |
|
|
qw.eq("h.updateState","1"); |
|
|
String head = monthHeadAndLast.get(0); |
|
|
|
|
|
String last = monthHeadAndLast.get(1); |
|
|
|
|
|
qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
|
|
|
List<LoanRepaymentHistoryVo> histories = baseMapper.selbuckleNewInitList(qw); |
|
|
List<LoanRepaymentHistoryVo> histories = baseMapper.selbuckleNewInitList(qw); |
|
|
Set<String> planSids = new HashSet<>(); |
|
|
Set<String> planSids = new HashSet<>(); |
|
|
if (!histories.isEmpty()) { |
|
|
if (!histories.isEmpty()) { |
|
|
|
God
1 year ago