From 6eefa5ccd1492177a28016f5eb8095b52b3b2f2c Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 13 May 2019 14:02:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E7=A7=9F=E7=8E=87=E8=B5=B0=E5=8A=BF?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxChartServiceImpl.java | 10 +++++++++- .../src/main/resources/mapper/WxShopMapper.xml | 6 +++--- 2 files changed, 12 insertions(+), 4 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 4b530b132..0343ef61d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -326,6 +326,13 @@ public class WxChartServiceImpl implements WxChartDataService { Map queryMap = new HashMap<>(); queryMap.put("tenantId",tenantId); queryMap.put("dateType",dateType); + + // get all + WxShop query = new WxShop(); + query.setTenantId(tenantId); + List allList = wxShopMapper.findList(query); + queryMap.put("allCount",allList.size()); + List> mapList = wxShopMapper.rentRateHistory(queryMap); if(CollectionUtils.isNotEmpty(mapList)){ String startTime = (String)mapList.get(0).get("xTime"); @@ -333,7 +340,8 @@ public class WxChartServiceImpl implements WxChartDataService { List days = DateUtils.getTjTimeList(startTime, endTime, 1==dateType.intValue()?"0":"1"); Map map = getMap(days); for (Map m : mapList) { - map.put((String)m.get("xTime"),m.get("rate")+"%"); + String r = m.get("rate").toString(); + map.put((String)m.get("xTime"),"0.00".equals(r)?"0":r +"%"); } return new ResultData(map); } diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index bee09966b..4735a8b07 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -566,12 +566,12 @@