Browse Source

优化审批流&开发车辆显示

release_toaliyun_real
luozukai 7 years ago
parent
commit
d7ef247d0c
1 changed files with 14 additions and 2 deletions
  1. +14
    -2
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;


@@ -529,7 +530,7 @@ public class DataTowerServiceImpl implements DataTowerService {
}, m -> {
return m.get("fee");
}));
TreeMap<Object, Object> weekMap = new TreeMap<>();
TreeMap<String, Object> weekMap = new TreeMap<>();
SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd");
for (Date date:days) {
weekMap.put(sdfForWeek.format(date),"0");
@@ -537,7 +538,18 @@ public class DataTowerServiceImpl implements DataTowerService {
for (String key : weekCollect.keySet()) {
weekMap.put(key,weekCollect.get(key));
}
datamap.put("oneWeekCarPayFeeCount",weekMap);

TreeMap<String, Object> weekResultMap = new TreeMap<>();
int count = 1;
for (String key : weekMap.keySet()) {
if(count == 7){
weekResultMap.put("日",weekMap.get(key));
}else{
weekResultMap.put(count+"",weekMap.get(key));
}
count++;
}
datamap.put("oneWeekCarPayFeeCount",weekResultMap);
// 查询近一周的缴费车辆----end------

//今日车流量


Loading…
Cancel
Save