From 1ad912b68f9f0e183a31063f7241d28e0a11c283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 21 Jul 2020 14:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=80=BB=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/PointsLogsController.java  | 12 +++++++++++-
 .../com/elink/esua/epdc/dao/PointsLogsDao.java | 17 ++++++++++++++++-
 .../esua/epdc/service/PointsLogsService.java   | 17 ++++++++++++++++-
 .../service/impl/PointsLogsServiceImpl.java    |  5 +++++
 .../main/resources/mapper/PointsLogsDao.xml    | 18 ++++++++++++++++++
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java
index 4bd12266..7a8dd2db 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java
@@ -137,5 +137,15 @@ public class PointsLogsController {
         return new Result<PageData<PointsStatisticsListResultDTO>>().ok(list);
     }
 
-
+    /***
+     * 积分总览
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO>>
+     * @author qushutong
+     * @date 2020/7/21 9:22
+     */
+    @GetMapping("/point/pointsOverview")
+    public Result<PointsStatisticsListResultDTO> pointsOverview(@RequestParam Map<String, Object> params) {
+        return new Result<PointsStatisticsListResultDTO>().ok(pointsLogsService.getPointsOverview(params));
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
index 4e8eda35..d9387f35 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
@@ -126,6 +126,21 @@ public interface PointsLogsDao extends BaseDao<PointsLogsEntity> {
      */
     int selectCountPointsRanking(EpdcAppPointsRankingFormDTO formDto);
 
-
+    /***
+     * 积分分类统计
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO>
+     * @author qushutong
+     * @date 2020/7/21 10:37
+     */
     List<PointsStatisticsListResultDTO> selectPointsList(Map<String, Object> params);
+
+    /***
+     * 积分总览
+     * @param params
+     * @return com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO
+     * @author qushutong
+     * @date 2020/7/21 10:37
+     */
+    PointsStatisticsListResultDTO selectPointsOverview(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
index b4d1e37b..9e506aaa 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
@@ -173,6 +173,21 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
      **/
     Result confirmUserAdjustPoint(EpdcAdjustUserPointsDTO formDto);
 
-
+    /***
+     * 积分分类统计
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO>
+     * @author qushutong
+     * @date 2020/7/21 10:36
+     */
     PageData<PointsStatisticsListResultDTO> listPagePoint(Map<String, Object> params);
+
+    /***
+     * 积分总览
+     * @param params
+     * @return com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO
+     * @author qushutong
+     * @date 2020/7/21 10:36
+     */
+    PointsStatisticsListResultDTO getPointsOverview(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
index d96d3c56..4f81f6d0 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
@@ -334,4 +334,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         List<PointsStatisticsListResultDTO> list = baseDao.selectPointsList(params);
         return new PageData(list, page.getTotal());
     }
+
+    @Override
+    public PointsStatisticsListResultDTO getPointsOverview(Map<String, Object> params) {
+        return baseDao.selectPointsOverview(params);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
index 0cd78bf4..d5398e2e 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
@@ -205,4 +205,22 @@
             lg.RULE_CODE
         ORDER BY allPoints DESC
     </select>
+
+    <select id="selectPointsOverview" resultType="com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO">
+        SELECT
+            SUM(
+                IF( lg.OPERATION_TYPE = '1', lg.POINTS, 0 )
+            ) allPoints,
+            SUM(
+                IF( lg.OPERATION_TYPE = '0', lg.POINTS, 0 )
+            ) residuePoints
+        FROM
+            epdc_points_logs lg
+        WHERE
+            lg.DEL_FLAG = '0'
+        <if test="startTime!= null and startTime !=''">
+            and lg.OPERATION_TIME between #{startTime} AND #{endTime}
+        </if>
+        ORDER BY lg.OPERATION_TYPE DESC
+    </select>
 </mapper>