积分接口修改

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<UserPointActi
             Map<String, List<ResiPointLogPeriodResultDTO>> sortedMap = Maps.newLinkedHashMap();
             map.entrySet().stream().sorted(Map.Entry.<String, List<ResiPointLogPeriodResultDTO>>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());

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdjustmentLogDao.xml

@@ -29,8 +29,7 @@
          CASE
             ADJUSTMENT_TYPE
             WHEN 'plus' THEN
-            CONCAT( '+', POINT ) ELSE CONCAT( '-', POINT )
+            CONCAT( '+', POINT ) ELSE POINT END AS POINT
-            END AS POINT
         FROM
             point_adjustment_log
         WHERE

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