From 88bf55f93c80c85ef4fba3e31ca4a14371020d87 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 24 Jul 2019 17:40:08 +0800 Subject: [PATCH] =?UTF-8?q?[po][=E4=BF=AE=E6=94=B9]:po=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxDateAmountRecordController.java | 5 ++--- .../src/main/java/com/iformall/domain/po/BaseEntity.java | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java index b8bd114bc..fa79ea086 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java @@ -2,10 +2,10 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxDateAmountRecord; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.AmountRecordVo; -import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumDateAmtType; import com.iformall.service.WxDateAmountRecordService; import io.swagger.annotations.Api; @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -60,7 +59,7 @@ public class WxDateAmountRecordController extends BaseController { temp.setTenantId(u.getTenantId()); temp.setMerchantId(u.getMerchantId()); temp.setType(dateAmtType); - temp.setSortColumns(WxDateAmountRecord.Field.Date_DESC); + temp.setSortColumns(BaseEntity.SortField.Date_DESC); SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); 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 6dd92bcfc..da397ce36 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -91,7 +91,6 @@ public class BaseEntity implements Serializable { return result.toString(); } - public void setSortColumns(SortField... fields) { if (fields == null || fields.length == 0) { @@ -156,6 +155,9 @@ public class BaseEntity implements Serializable { UsedPower_ASC("`usedPower` ASC"), UsedPower_DESC("`usedPower` DESC"), + + Date_ASC("`date` ASC"), + Date_DESC("`date` DESC"), ; private String value;