|
|
|
@@ -451,6 +451,20 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
queryMap.put("tenantId",tenantId); |
|
|
|
queryMap.put("dateType",dateType); |
|
|
|
|
|
|
|
String building = paramsMap.get("building"); |
|
|
|
String floor = paramsMap.get("floor"); |
|
|
|
String business = paramsMap.get("business"); |
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(building)) { |
|
|
|
queryMap.put("building", building); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(floor)) { |
|
|
|
queryMap.put("floor", building); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(business)) { |
|
|
|
queryMap.put("business", building); |
|
|
|
} |
|
|
|
|
|
|
|
// get all |
|
|
|
WxShop query = new WxShop(); |
|
|
|
query.setTenantId(tenantId); |
|
|
|
@@ -2439,6 +2453,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
String tenantId = paramMap.get("tenantId"); |
|
|
|
String building = paramMap.get("building"); |
|
|
|
String floor = paramMap.get("floor"); |
|
|
|
String business = paramMap.get("business"); |
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(tenantId)) { |
|
|
|
query.setTenantId(tenantId); |
|
|
|
@@ -2449,6 +2464,9 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
if (StringUtils.isNotEmpty(floor)) { |
|
|
|
query.setFloor(Long.valueOf(floor)); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(business)) { |
|
|
|
query.setBusiness(Long.valueOf(business)); |
|
|
|
} |
|
|
|
query.setType(null); |
|
|
|
Long total = wxShopMapper.getCountByWxShop(query); |
|
|
|
query.setType(EnumRentShopType.SHOP.getCode()); |
|
|
|
|