|
|
|
@@ -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<Object, Object> 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<String,Long> getMap(List<String> days){ |
|
|
|
|