diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index 831545362..4c9e9f119 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -4,7 +4,6 @@ import com.iformall.common.SortColumn; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; @@ -25,7 +24,7 @@ public class BaseEntity implements Serializable { public String sortColumns; public String getSortColumns() { - if(StringUtils.isNotBlank(sortColumns)){ + if(StringUtils.isBlank(sortColumn)){ return sortColumns; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java index 49444ac10..490e1b008 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java @@ -59,6 +59,8 @@ public enum EnumChart { INDEX_BILL_RECE_RATE(50, "费用收缴数据"), INDEX_COUPON_SCENE(51, "场景发券"), INDEX_SALE_DATA(52, "营销数据"), + + RENT_RATE_HISTORY(53, "商铺出租率走势"), ; public static EnumChart getEnum(Integer code) { 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 f5c20e9c9..71bfa399d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -305,6 +305,11 @@ public class WxChartServiceImpl implements WxChartDataService { return getSaleDataHistory(tenantId, startdate, enddate); } + //商铺出租率走势 + if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { + return getRentRateHistory(tenantId); + } + return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); @@ -2251,6 +2256,23 @@ public class WxChartServiceImpl implements WxChartDataService { return map; } + public static Map getDateMap2(Date begin, Date end) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Map map = new LinkedHashMap<>(); + map.put(format.format(begin), "0"); + Calendar calBegin = Calendar.getInstance(); + calBegin.setTime(begin); + Calendar calEnd = Calendar.getInstance(); + calEnd.setTime(end); + calEnd.add(Calendar.DAY_OF_MONTH, -1); + end = calEnd.getTime(); + while (calBegin.getTime().before(end)) { + calBegin.add(Calendar.DAY_OF_MONTH, 1); + map.put(format.format(calBegin.getTime()), "0%"); + } + return map; + } + /** * 首页商铺出租数据 * @param tenantId @@ -2296,6 +2318,22 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + /** + * 首页商铺出租率走势 + * @param tenantId + * @return + */ + private ResultData getRentRateHistory(String tenantId) { + HashMap datamap = new HashMap<>(); + try { + Map m = getDateMap2(new SimpleDateFormat("yyyy-MM-dd").parse("2019-05-01"),new SimpleDateFormat("yyyy-MM-dd").parse("2019-05-30")); + }catch (Exception e){ + e.printStackTrace(); + } + + return new ResultData(datamap); + } + /** * 费用收缴数据 * @param tenantId