|
|
|
@@ -305,6 +305,11 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
return getSaleDataHistory(tenantId, startdate, enddate); |
|
|
|
} |
|
|
|
|
|
|
|
//商铺出租率走势 |
|
|
|
if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { |
|
|
|
return getRentRateHistory(tenantId); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); |
|
|
|
@@ -2251,6 +2256,23 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
return map; |
|
|
|
} |
|
|
|
|
|
|
|
public static Map<String,String> getDateMap2(Date begin, Date end) { |
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
Map<String,String> map = new LinkedHashMap<>(); |
|
|
|
map.put(format.format(begin), "0"); |
|
|
|
Calendar calBegin = Calendar.getInstance(); |
|
|
|
calBegin.setTime(begin); |
|
|
|
Calendar calEnd = Calendar.getInstance(); |
|
|
|
calEnd.setTime(end); |
|
|
|
calEnd.add(Calendar.DAY_OF_MONTH, -1); |
|
|
|
end = calEnd.getTime(); |
|
|
|
while (calBegin.getTime().before(end)) { |
|
|
|
calBegin.add(Calendar.DAY_OF_MONTH, 1); |
|
|
|
map.put(format.format(calBegin.getTime()), "0%"); |
|
|
|
} |
|
|
|
return map; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 首页商铺出租数据 |
|
|
|
* @param tenantId |
|
|
|
@@ -2296,6 +2318,22 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
return new ResultData(datamap); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 首页商铺出租率走势 |
|
|
|
* @param tenantId |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private ResultData getRentRateHistory(String tenantId) { |
|
|
|
HashMap<String, Object> datamap = new HashMap<>(); |
|
|
|
try { |
|
|
|
Map<String,String> m = getDateMap2(new SimpleDateFormat("yyyy-MM-dd").parse("2019-05-01"),new SimpleDateFormat("yyyy-MM-dd").parse("2019-05-30")); |
|
|
|
}catch (Exception e){ |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(datamap); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 费用收缴数据 |
|
|
|
* @param tenantId |
|
|
|
|