Browse Source

[停车][修改]:停车缴费统计问题

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
79ad581c6b
2 changed files with 17 additions and 10 deletions
  1. +14
    -8
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java

+ 14
- 8
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java View File

@@ -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("停车-近一周新增会员历史-结束");


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -761,8 +761,9 @@ public class WxChartServiceImpl implements WxChartDataService {
List<String> timeList = new ArrayList<>(); List<String> timeList = new ArrayList<>();
List<Object> valList = new ArrayList<>(); List<Object> valList = new ArrayList<>();
for (String date : days) { 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) { if (o == null) {
valList.add(0L); valList.add(0L);
} else { } else {


Loading…
Cancel
Save