|
|
@@ -524,13 +524,19 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
// 近一周缴费金额 |
|
|
// 近一周缴费金额 |
|
|
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); |
|
|
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); |
|
|
List<Map<String, Object>> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); |
|
|
List<Map<String, Object>> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); |
|
|
Map<Object, Object> weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { |
|
|
|
|
|
return m.get("create_time"); |
|
|
|
|
|
|
|
|
Map<String, Object> weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { |
|
|
|
|
|
return (String)m.get("create_time"); |
|
|
}, m -> { |
|
|
}, m -> { |
|
|
return m.get("carcount"); |
|
|
|
|
|
|
|
|
return m.get("fee"); |
|
|
})); |
|
|
})); |
|
|
TreeMap<Object, Object> weekMap = new TreeMap<>(); |
|
|
TreeMap<Object, Object> weekMap = new TreeMap<>(); |
|
|
weekMap.putAll(weekCollect); |
|
|
|
|
|
|
|
|
SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd"); |
|
|
|
|
|
for (Date date:days) { |
|
|
|
|
|
weekMap.put(sdfForWeek.format(date),"0"); |
|
|
|
|
|
} |
|
|
|
|
|
for (String key : weekCollect.keySet()) { |
|
|
|
|
|
weekMap.put(key,weekCollect.get(key)); |
|
|
|
|
|
} |
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
// 查询近一周的缴费车辆----end------ |
|
|
// 查询近一周的缴费车辆----end------ |
|
|
|
|
|
|
|
|
|