|
|
|
@@ -875,9 +875,9 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
String startTime = (String)mapList.get(0).get("xTime"); |
|
|
|
String endTime = (String)mapList.get(mapList.size()-1).get("xTime"); |
|
|
|
List<String> days = DateUtils.getTjTimeList(startTime, endTime, 1==dateType.intValue()?"0":"1"); |
|
|
|
Map<String,Long> map = getMap(days); |
|
|
|
Map<String,Double> map = getDoubleMap(days); |
|
|
|
for (Map<String,Object> m : mapList) { |
|
|
|
map.put((String)m.get( "xTime"),(Long)m.get("buildArea")); |
|
|
|
map.put((String)m.get( "xTime"),(Double)m.get("buildArea")); |
|
|
|
} |
|
|
|
|
|
|
|
double all = total; |
|
|
|
@@ -899,6 +899,14 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
} |
|
|
|
return map; |
|
|
|
} |
|
|
|
|
|
|
|
public Map<String,Double> getDoubleMap(List<String> days){ |
|
|
|
Map<String,Double> map = new LinkedMap(); |
|
|
|
for (String d:days) { |
|
|
|
map.put(d.replace("-", "/"),0D); |
|
|
|
} |
|
|
|
return map; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 解单数据 - 月 |
|
|
|
|