|
|
|
@@ -312,7 +312,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
|
|
|
|
//首页商铺出租数据 |
|
|
|
if (chart.equals(EnumChart.INDEX_SHOP_RENT.getCode())) { |
|
|
|
return getIndexShopRentData(tenantId); |
|
|
|
return getIndexShopRentData(paramsMap); |
|
|
|
} |
|
|
|
|
|
|
|
//首页商铺出租数据 |
|
|
|
@@ -2430,14 +2430,25 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
|
|
|
|
/** |
|
|
|
* 首页商铺出租数据 |
|
|
|
* @param tenantId |
|
|
|
* @param paramMap |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private ResultData getIndexShopRentData(String tenantId) { |
|
|
|
private ResultData getIndexShopRentData(Map<String, String> paramMap) { |
|
|
|
HashMap<String, Object> datamap = new HashMap<>(); |
|
|
|
WxShop query = new WxShop(); |
|
|
|
query.setTenantId(tenantId); |
|
|
|
String tenantId = paramMap.get("tenantId"); |
|
|
|
String building = paramMap.get("building"); |
|
|
|
String floor = paramMap.get("floor"); |
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(tenantId)) { |
|
|
|
query.setTenantId(tenantId); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(building)) { |
|
|
|
query.setBuilding(Long.valueOf(building)); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(floor)) { |
|
|
|
query.setFloor(Long.valueOf(floor)); |
|
|
|
} |
|
|
|
query.setType(null); |
|
|
|
Long total = wxShopMapper.getCountByWxShop(query); |
|
|
|
query.setType(EnumRentShopType.SHOP.getCode()); |
|
|
|
|