|
|
@@ -540,10 +540,13 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
|
|
|
|
|
TreeMap<String, Object> weekMap = new TreeMap<>(); |
|
|
TreeMap<String, Object> weekMap = new TreeMap<>(); |
|
|
for (String date:days) { |
|
|
for (String date:days) { |
|
|
weekMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
|
|
|
} |
|
|
|
|
|
for (String key : weekCollect.keySet()) { |
|
|
|
|
|
weekMap.put(key,weekCollect.get(key)); |
|
|
|
|
|
|
|
|
String dateStr = date.substring(5,date.length()).replace("-","/"); |
|
|
|
|
|
Object o = weekCollect.get(dateStr); |
|
|
|
|
|
if(o == null) { |
|
|
|
|
|
weekMap.put(dateStr,"0"); |
|
|
|
|
|
} else { |
|
|
|
|
|
weekMap.put(dateStr,o.toString()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
datamap.put("oneWeekCarPayFeeCount",weekMap); |
|
|
logger.info("停车-查询近一周的缴费金额-结束"); |
|
|
logger.info("停车-查询近一周的缴费金额-结束"); |
|
|
@@ -558,10 +561,13 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
})); |
|
|
})); |
|
|
TreeMap<String, Object> weekCarMap = new TreeMap<>(); |
|
|
TreeMap<String, Object> weekCarMap = new TreeMap<>(); |
|
|
for (String date:days) { |
|
|
for (String date:days) { |
|
|
weekCarMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
|
|
|
} |
|
|
|
|
|
for (String key : weekCarCollect.keySet()) { |
|
|
|
|
|
weekCarMap.put(key,weekCarCollect.get(key)); |
|
|
|
|
|
|
|
|
String dateStr = date.substring(5,date.length()).replace("-","/"); |
|
|
|
|
|
Object o = weekCarCollect.get(dateStr); |
|
|
|
|
|
if(o == null) { |
|
|
|
|
|
weekCarMap.put(dateStr, "0"); |
|
|
|
|
|
} else { |
|
|
|
|
|
weekCarMap.put(dateStr, o.toString()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
datamap.put("oneWeekNewCarUserHistory",weekCarMap); |
|
|
datamap.put("oneWeekNewCarUserHistory",weekCarMap); |
|
|
logger.info("停车-近一周新增会员历史-结束"); |
|
|
logger.info("停车-近一周新增会员历史-结束"); |
|
|
|