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 cda95313e..fe4d513dc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -33,6 +33,14 @@ public class BaseEntity implements Serializable { if(StringUtils.isNotBlank(sortColumn)) { Field[] fields = this.getClass().getDeclaredFields(); + //扫描注解,优先解析注解 + for (Field field : fields) { + SortColumn sortColumnField = field.getAnnotation(SortColumn.class); + if (sortColumnField != null && field.getName().equals(sortColumn)) { + return sortColumnField.column() + " "+sortOrder; + } + } + //判断是否合法 boolean find = false; for (Field field : fields){ @@ -42,17 +50,9 @@ public class BaseEntity implements Serializable { } } // if(!find) { -// return null; +// return sortColumn; // } - //扫描注解,优先解析注解 - for (Field field : fields) { - SortColumn sortColumnField = field.getAnnotation(SortColumn.class); - if (sortColumnField != null && field.getName().equals(sortColumn)) { - return sortColumnField.column() + " "+sortOrder; - } - } - //默认驼峰解析 return underscoreName(sortColumn) +" "+sortOrder; } 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 8e4a38c5e..5bce4e772 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -320,7 +320,7 @@ public class WxChartServiceImpl implements WxChartDataService { * @return */ private ResultData getRentRateHistory(String tenantId) { - HashMap datamap = new HashMap<>(); + Map datamap = new LinkedHashMap<>(); datamap.put("2018/10","10%"); datamap.put("2018/11","20%"); datamap.put("2018/12","10%"); @@ -660,8 +660,9 @@ public class WxChartServiceImpl implements WxChartDataService { List timeList = new ArrayList<>(); List valList = new ArrayList<>(); for (String date : days) { - Object o = weekCarCollect.get(date); - timeList.add(date.substring(5, date.length()).replace("-", "/")); + String newdate = date.substring(5, date.length()).replace("-", "/"); + Object o = weekCarCollect.get(newdate); + timeList.add(newdate); if (o == null) { valList.add(0L); } else { diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index e056fdb10..8b5567dcc 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -535,7 +535,8 @@