|
|
|
@ -278,7 +278,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
|
data.put("clients", cleanDaysDetails.size());
|
|
|
|
|
data.put("reports", cleanDaysDetails.size() < 20 ? cleanDaysDetails : cleanDaysDetails.subList(0, 20));
|
|
|
|
|
return data;
|
|
|
|
|
}).collect(HashMap::new, (map, data) -> map.put(data.getString("clean_days"), data), Map::putAll);
|
|
|
|
|
}).collect(TreeMap::new, (map, data) -> map.put(data.getString("clean_days"), data), Map::putAll);
|
|
|
|
|
|
|
|
|
|
log.put("clean_days", cleanDaysStatistics);
|
|
|
|
|
if (StringUtils.isNotEmpty(log.getString("plan_detail"))) {
|
|
|
|
@ -300,7 +300,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
|
cleanDaysReport.put("clients", logs.stream().mapToInt(log -> log.getJSONObject("clean_days").getJSONObject("T+" + cleanDays).getIntValue("clients")).sum());
|
|
|
|
|
cleanDaysReport.put("total_settle", logs.stream().map(log -> log.getJSONObject("clean_days").getJSONObject("T+" + cleanDays).getBigDecimal("total_settle")).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
|
|
|
|
|
return cleanDaysReport;
|
|
|
|
|
}).collect(HashMap::new, (map, report) -> map.put(report.getString("clean_days"), report), Map::putAll);
|
|
|
|
|
}).collect(TreeMap::new, (map, report) -> map.put(report.getString("clean_days"), report), Map::putAll);
|
|
|
|
|
total.put("logs", logs);
|
|
|
|
|
total.put("clean_days", totalCleanDaysSatistics);
|
|
|
|
|
List<JSONObject> channels = clearingDetailAnalysisMapper.analysisChannelReportDaily(settleDate);
|
|
|
|
|