|
|
|
@@ -669,7 +669,8 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
// get all |
|
|
|
WxShop query = new WxShop(); |
|
|
|
query.updateTenantInfo(tenantEntity); |
|
|
|
List<WxShop> allList = wxShopMapper.findList(query); |
|
|
|
Long total = wxShopMapper.getCountByWxShop(query); |
|
|
|
// List<WxShop> allList = wxShopMapper.findList(query); |
|
|
|
|
|
|
|
List<Map<String,Object>> mapList = wxShopMapper.rentRateHistory(queryMap); |
|
|
|
if(CollectionUtils.isNotEmpty(mapList)){ |
|
|
|
@@ -681,7 +682,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
map.put((String)m.get( "xTime"),(Long)m.get("xCount")); |
|
|
|
} |
|
|
|
|
|
|
|
double all = allList.size(); |
|
|
|
double all = total; |
|
|
|
Map<String,String> resultMap = new LinkedMap(); |
|
|
|
double rentTotal = 0; |
|
|
|
for (String key : map.keySet()) { |
|
|
|
|