|
|
|
@@ -320,7 +320,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private ResultData getRentRateHistory(String tenantId) { |
|
|
|
HashMap<String, Object> datamap = new HashMap<>(); |
|
|
|
Map<String, Object> datamap = new LinkedHashMap<>(); |
|
|
|
datamap.put("2018/10","10%"); |
|
|
|
datamap.put("2018/11","20%"); |
|
|
|
datamap.put("2018/12","10%"); |
|
|
|
@@ -660,8 +660,9 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
List<String> timeList = new ArrayList<>(); |
|
|
|
List<Object> valList = new ArrayList<>(); |
|
|
|
for (String date : days) { |
|
|
|
Object o = weekCarCollect.get(date); |
|
|
|
timeList.add(date.substring(5, date.length()).replace("-", "/")); |
|
|
|
String newdate = date.substring(5, date.length()).replace("-", "/"); |
|
|
|
Object o = weekCarCollect.get(newdate); |
|
|
|
timeList.add(newdate); |
|
|
|
if (o == null) { |
|
|
|
valList.add(0L); |
|
|
|
} else { |
|
|
|
|