From 0c1f9f2d46bd5529922e03195ae587cb7882059b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 15 Jul 2019 16:41:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E7=BC=B4=E8=B4=B9=E7=BB=9F=E8=AE=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataTowerServiceImpl.java | 22 ++++++++++++------- .../service/impl/WxChartServiceImpl.java | 5 +++-- 2 files changed, 17 insertions(+), 10 deletions(-) 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 1f65f4abe..f85ed8528 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -540,10 +540,13 @@ public class DataTowerServiceImpl implements DataTowerService { TreeMap weekMap = new TreeMap<>(); 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); logger.info("停车-查询近一周的缴费金额-结束"); @@ -558,10 +561,13 @@ public class DataTowerServiceImpl implements DataTowerService { })); TreeMap weekCarMap = new TreeMap<>(); 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); logger.info("停车-近一周新增会员历史-结束"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 01a19c19b..e1062da24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -747,8 +747,9 @@ public class WxChartServiceImpl implements WxChartDataService { List timeList = new ArrayList<>(); List valList = new ArrayList<>(); for (String date : days) { - Object o = weekCollect.get(date); - timeList.add(date.substring(5, date.length()).replace("-", "/")); + String dateStr = date.substring(5, date.length()).replace("-", "/"); + timeList.add(dateStr); + Object o = weekCollect.get(dateStr); if (o == null) { valList.add(0L); } else {