From f59a20537ac46f44b919caedfda90c91a00e9591 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 15 Jul 2019 14:40:35 +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=E6=A5=BC=E5=B1=82=E6=A5=BC?= =?UTF-8?q?=E5=BA=A7=E6=9F=A5=E8=AF=A2=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 19 +++++++++++++++---- .../main/resources/mapper/WxShopMapper.xml | 18 ++++++++++++------ 2 files changed, 27 insertions(+), 10 deletions(-) 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 dd31c7345..48bcfa904 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -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 paramMap) { HashMap 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()); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 5165550af..3646ffe76 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -549,18 +549,24 @@ and w.`tenant_id`= #{tenantId} - - and ms.`create_date` >= #{startdate} - - - and ms.`create_date` <= #{enddate} - and `type`=#{type} and status = #{status} + + and building = #{building} + + + and floor = #{floor} + + + and ms.`create_date` >= #{startdate} + + + and ms.`create_date` <= #{enddate} +