From 7fad7b92c1764526ffafceaff304716ea3c1ac65 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 2 Sep 2019 14:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxCouponSend.java | 3 --- .../iformall/service/impl/WxCouponSendServiceImpl.java | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 08e79c378..cb1b82335 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -66,9 +66,6 @@ public class WxCouponSend extends BaseEntity { @JsonIgnore public static final String SORT_REMAIN = "merchantRemain" ; - @JsonIgnore - public static final String SORT_CREATE_DATE = "createDate" ; - @Id protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 596cd233a..612b96d66 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -75,11 +75,12 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { String sortStr = null; if (Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_LNVENTORY) || Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_SEND) || - Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)|| - Objects.equals(record.getSortColumn(), WxCouponSend.SORT_CREATE_DATE)) { - sortStr = record.getSortColumn() + " " + record.getSortOrder(); + Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)) { + sortStr = record.getSortColumn() + " " + record.getSortOrder(); + } else if (Objects.equals(record.getSortColumn(), "createDate")) { + sortStr = "create_date" + " " + record.getSortOrder(); + } record.setSortColumn(null); - } record.setSortCol(sortStr); pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVoByValidType(record)); for (WxCouponSendVo cs : pageInfo.getList()) {