From acc11659d16dfe41c745825f52f9da92e27ec889 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 15 Jul 2019 16:03:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E6=A6=82=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8C=89=E4=B8=9A=E6=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=9B=BE=E8=A1=A8=E5=8F=8A=E5=BA=97=E9=93=BA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 18 ++++++++++++++++++ .../src/main/resources/mapper/WxShopMapper.xml | 11 +++++++++++ 2 files changed, 29 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 48bcfa904..6a1454dbb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index e72b750d9..56444c8a1 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -442,6 +442,11 @@ and s.`point_type` = #{pointType} + + + and s.business = #{business} + + and s.id in @@ -560,6 +565,9 @@ and `create_date` <= #{enddate} + + and business = #{business} +