| @@ -33,6 +33,14 @@ public class BaseEntity implements Serializable { | |||||
| if(StringUtils.isNotBlank(sortColumn)) { | if(StringUtils.isNotBlank(sortColumn)) { | ||||
| Field[] fields = this.getClass().getDeclaredFields(); | 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; | boolean find = false; | ||||
| for (Field field : fields){ | for (Field field : fields){ | ||||
| @@ -42,17 +50,9 @@ public class BaseEntity implements Serializable { | |||||
| } | } | ||||
| } | } | ||||
| // if(!find) { | // 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; | return underscoreName(sortColumn) +" "+sortOrder; | ||||
| } | } | ||||
| @@ -320,7 +320,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| private ResultData getRentRateHistory(String tenantId) { | private ResultData getRentRateHistory(String tenantId) { | ||||
| HashMap<String, Object> datamap = new HashMap<>(); | |||||
| Map<String, Object> datamap = new LinkedHashMap<>(); | |||||
| datamap.put("2018/10","10%"); | datamap.put("2018/10","10%"); | ||||
| datamap.put("2018/11","20%"); | datamap.put("2018/11","20%"); | ||||
| datamap.put("2018/12","10%"); | datamap.put("2018/12","10%"); | ||||
| @@ -660,8 +660,9 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| List<String> timeList = new ArrayList<>(); | List<String> timeList = new ArrayList<>(); | ||||
| List<Object> valList = new ArrayList<>(); | List<Object> valList = new ArrayList<>(); | ||||
| for (String date : days) { | 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) { | if (o == null) { | ||||
| valList.add(0L); | valList.add(0L); | ||||
| } else { | } else { | ||||
| @@ -535,7 +535,8 @@ | |||||
| </select> | </select> | ||||
| <select id="findCountData" parameterType="com.iformall.domain.po.WxCoupon" resultMap="statisMap"> | <select id="findCountData" parameterType="com.iformall.domain.po.WxCoupon" resultMap="statisMap"> | ||||
| select res.*, round(sum_payment/sale_amount*100,2) paymentRate from ( | |||||
| select la.* from( | |||||
| select res.*, IFNULL(round(sum_payment/sale_amount*100,2),0) as payment_rate from ( | |||||
| select c.*, | select c.*, | ||||
| (select count(wco.id) from wx_coupon wc | (select count(wco.id) from wx_coupon wc | ||||
| left join wx_coupon_order wco on wc.id = wco.coupon_id | left join wx_coupon_order wco on wc.id = wco.coupon_id | ||||
| @@ -563,14 +564,15 @@ | |||||
| from wx_coupon c where c.type = 100 | from wx_coupon c where c.type = 100 | ||||
| ) res | ) res | ||||
| ) la | |||||
| <if test="title != null and title !=''"> | <if test="title != null and title !=''"> | ||||
| and res.title like concat('%', #{title},'%') | |||||
| and la.title like concat('%', #{title},'%') | |||||
| </if> | </if> | ||||
| <if test="id != null"> | <if test="id != null"> | ||||
| and res.id = #{id} | |||||
| and la.id = #{id} | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| <if test=" null == sortColumns"> order by res.status asc,res.create_date desc </if> | |||||
| <if test=" null == sortColumns"> order by la.status asc,la.create_date desc </if> | |||||
| </select> | </select> | ||||