diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java
index e84bcb965..b32303ca1 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java
@@ -144,7 +144,7 @@ public class WxCUserDataController extends BaseController {
wxCUserBasicInfoDto.setTenantId(getTenantId());
wxCUserBasicInfoDto.setStartTime(null);
wxCUserBasicInfoDto.setEndTime(null);
- long importCount = wxCUserBasicInfoService.findCountByFilter(wxCUserBasicInfoDto);
+ long importCount = wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto);
map.put("importCount", importCount);
map.put("allHistoryUserCount", growCount+importCount);
diff --git a/mallinkService/src/main/java/com/iformall/common/SortColumn.java b/mallinkService/src/main/java/com/iformall/common/SortColumn.java
new file mode 100644
index 000000000..fd680ac83
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/common/SortColumn.java
@@ -0,0 +1,16 @@
+package com.iformall.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author luozukai
+ * 排序注解
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SortColumn {
+ String column();
+}
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
new file mode 100644
index 000000000..b822f979a
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
@@ -0,0 +1,78 @@
+package com.iformall.domain.po;
+
+import com.iformall.common.SortColumn;
+import org.apache.commons.lang3.StringUtils;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+
+/**
+ * @author luozukai
+ * @date 2019/4/24 14:32
+ */
+public class BaseEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+ @Transient
+ private String sortColumn;
+ @Transient
+ private String sortOrder;
+
+ public String getSortColumn() {
+ try {
+ //扫描子类SortColumn注解的属性,替换sortColumn
+ 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)) {
+ sortColumn = sortColumnField.column();
+ return sortColumn;
+ }
+ }
+
+ //默认驼峰解析
+ this.setSortColumn(underscoreName(sortColumn));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return sortColumn;
+ }
+
+ /**
+ * 转换为下划线
+ *
+ * @param camelCaseName
+ * @return
+ */
+ public static String underscoreName(String camelCaseName) {
+ StringBuilder result = new StringBuilder();
+ if (camelCaseName != null && camelCaseName.length() > 0) {
+ result.append(camelCaseName.substring(0, 1).toLowerCase());
+ for (int i = 1; i < camelCaseName.length(); i++) {
+ char ch = camelCaseName.charAt(i);
+ if (Character.isUpperCase(ch)) {
+ result.append("_");
+ result.append(Character.toLowerCase(ch));
+ } else {
+ result.append(ch);
+ }
+ }
+ }
+ return result.toString();
+ }
+
+ public void setSortColumn(String sortColumn) {
+ this.sortColumn = sortColumn;
+ }
+
+ public String getSortOrder() {
+ return sortOrder;
+ }
+
+ public void setSortOrder(String sortOrder) {
+ this.sortOrder = sortOrder;
+ }
+}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
index c7d1f0a95..2fb1ad1d6 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
@@ -10,9 +10,7 @@ import java.util.List;
import java.util.Map;
@Table(name = "wx_merchant")
-public class WxMerchant implements Serializable {
- private static final long serialVersionUID = 1L;
-
+public class WxMerchant extends BaseEntity {
@Id
protected Long id;
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
index 0ea75c3b8..ed6fe823f 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
@@ -1,6 +1,7 @@
package com.iformall.domain.po;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.iformall.common.SortColumn;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -11,9 +12,7 @@ import java.util.Date;
import java.util.List;
@Table(name = "wx_shop")
-public class WxShop implements Serializable {
- private static final long serialVersionUID = 1L;
-
+public class WxShop extends BaseEntity {
@Id
protected Long id;
@@ -58,6 +57,7 @@ public class WxShop implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "点位类型", name = "pointType")
@Excel(name="类型",width = 20,orderNum = "1",
replace = {"商铺_null", "固定点位_1", "临时促销点位_2", "宣传点位_3","ATM点位_4","仓库点位_5","其他点位_6"})
+ @SortColumn(column="point_type")
private Integer pointType;
/*商铺编号**/
@io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber")
diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
index d70f650ed..0a400ba40 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
@@ -227,6 +227,9 @@
and tenant_id =#{tenantId}
+
+ and create_date like '%00:00:00'
+
@@ -367,9 +370,6 @@
and cu.phone in (${phones})
-
- and create_date like '%00:00:00'
-
and cu.poins >= #{levelStartScore}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml
index 31bd24945..d8e84843a 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml
@@ -83,8 +83,15 @@
#{idItem}
-
- order by ${sortColumns}
+
+
+ order by ${sortColumn} ${sortOrder}
+
+
+ order by ${sortColumns}
+
+
+