| @@ -21,11 +21,14 @@ public class BaseEntity implements Serializable { | |||||
| @Transient | @Transient | ||||
| private String sortOrder; | private String sortOrder; | ||||
| //back | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | |||||
| public String sortColumns; | |||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| if(StringUtils.isNotBlank(sortColumns)){ | |||||
| return sortColumns; | |||||
| } | |||||
| String result = null; | String result = null; | ||||
| try { | try { | ||||
| //扫描子类SortColumn注解的属性,替换sortColumn | //扫描子类SortColumn注解的属性,替换sortColumn | ||||
| @@ -28,10 +28,6 @@ public class WxMerchant extends BaseEntity { | |||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -1,7 +1,6 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import com.iformall.common.SortColumn; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -373,7 +372,7 @@ public class WxShop extends BaseEntity { | |||||
| sb.append(","); | sb.append(","); | ||||
| sb.append(fields[k].toString()); | sb.append(fields[k].toString()); | ||||
| } | } | ||||
| this.sortColumns=sb.toString(); | |||||
| sortColumns=sb.toString(); | |||||
| } | } | ||||
| public void setSortColumns(String sortColumns) | public void setSortColumns(String sortColumns) | ||||
| @@ -18,10 +18,8 @@ import com.iformall.service.WxShopService; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.BeanUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.util.*; | import java.util.*; | ||||