diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index e07c35ad9..e3a314d92 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -524,13 +524,19 @@ public class DataTowerServiceImpl implements DataTowerService { // 近一周缴费金额 weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); - Map weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { - return m.get("create_time"); + Map weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { + return (String)m.get("create_time"); }, m -> { - return m.get("carcount"); + return m.get("fee"); })); TreeMap 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); // 查询近一周的缴费车辆----end------ diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index d76514fa7..b7a391586 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -92,10 +92,10 @@