From 1988f3b7b848f8c5683eeb9ccac1349d9a48d050 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 22 Jul 2019 15:03:31 +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][=E5=87=BA=E7=A7=9F=E7=8E=87=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxChartServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 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 be5dc09f1..d09964f82 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -25,11 +25,11 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.LinkedMap; import org.apache.commons.lang3.StringUtils; -import org.flowable.common.engine.impl.calendar.BusinessCalendar; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.NumberFormat; @@ -676,7 +676,17 @@ public class WxChartServiceImpl implements WxChartDataService { } return new ResultData(resultMap); } - return new ResultData(new HashMap<>()); + Map result = new HashMap<>(); + if (dateType == 1) { + //出租率-日 + String systemTime = DateUtils.getSystemTime("yyyy/MM/dd"); + result.put(systemTime, "0%"); + } else { + //出租率-月 + String systemTime = DateUtils.getSystemTime("yyyy/MM"); + result.put(systemTime, "0%"); + } + return new ResultData(result); } public Map getMap(List days){