|
|
@@ -326,6 +326,13 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
Map<String, Object> queryMap = new HashMap<>(); |
|
|
Map<String, Object> queryMap = new HashMap<>(); |
|
|
queryMap.put("tenantId",tenantId); |
|
|
queryMap.put("tenantId",tenantId); |
|
|
queryMap.put("dateType",dateType); |
|
|
queryMap.put("dateType",dateType); |
|
|
|
|
|
|
|
|
|
|
|
// get all |
|
|
|
|
|
WxShop query = new WxShop(); |
|
|
|
|
|
query.setTenantId(tenantId); |
|
|
|
|
|
List<WxShop> allList = wxShopMapper.findList(query); |
|
|
|
|
|
queryMap.put("allCount",allList.size()); |
|
|
|
|
|
|
|
|
List<Map<String,Object>> mapList = wxShopMapper.rentRateHistory(queryMap); |
|
|
List<Map<String,Object>> mapList = wxShopMapper.rentRateHistory(queryMap); |
|
|
if(CollectionUtils.isNotEmpty(mapList)){ |
|
|
if(CollectionUtils.isNotEmpty(mapList)){ |
|
|
String startTime = (String)mapList.get(0).get("xTime"); |
|
|
String startTime = (String)mapList.get(0).get("xTime"); |
|
|
@@ -333,7 +340,8 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
List<String> days = DateUtils.getTjTimeList(startTime, endTime, 1==dateType.intValue()?"0":"1"); |
|
|
List<String> days = DateUtils.getTjTimeList(startTime, endTime, 1==dateType.intValue()?"0":"1"); |
|
|
Map<String,String> map = getMap(days); |
|
|
Map<String,String> map = getMap(days); |
|
|
for (Map<String,Object> m : mapList) { |
|
|
for (Map<String,Object> 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); |
|
|
return new ResultData(map); |
|
|
} |
|
|
} |
|
|
|