From 9e89b20d4cd55c18dc9eab8ea3df6aaeb66cc846 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 31 Jul 2020 11:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/UserPointActionLogServiceImpl.java | 2 +- .../src/main/resources/mapper/PointAdjustmentLogDao.xml | 5 ++--- .../src/main/resources/mapper/UserPointActionLogDao.xml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index fd06cf41e0..83200db0ff 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -134,7 +134,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl> sortedMap = Maps.newLinkedHashMap(); map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); - map.entrySet().forEach(e -> { + sortedMap.entrySet().forEach(e -> { ResiPointLogListResultDTO o = new ResiPointLogListResultDTO(); o.setDate(e.getKey()); o.setDailyList(e.getValue()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdjustmentLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdjustmentLogDao.xml index 00eb03fc91..8e32e81668 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdjustmentLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdjustmentLogDao.xml @@ -26,11 +26,10 @@ operator_name AS staffNickname, adjust_reason AS reason, DATE_FORMAT( created_time, '%Y-%m-%d %H:%i:%s' ) AS date, - CASE + CASE ADJUSTMENT_TYPE WHEN 'plus' THEN - CONCAT( '+', POINT ) ELSE CONCAT( '-', POINT ) - END AS POINT + CONCAT( '+', POINT ) ELSE POINT END AS POINT FROM point_adjustment_log WHERE diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index bd81ab9aff..b8baa6c47f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -27,7 +27,7 @@ SELECT EVENT_NAME AS TITLE, EVENT_STATEMENT AS REMARK, - CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT) WHEN 'minus' THEN concat('-',POINT) END AS point, + CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT) ELSE POINT END AS point, DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') AS DATE, DATE_FORMAT(CREATED_TIME,'%H:%i') AS TIME FROM