From 93aa44cb28cfd5a0f1c74e2b366216e142c542cc Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 22 Oct 2021 16:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ActivePointLogController.java  | 11 +++++++
 .../esua/epdc/dao/ActivePointLogDao.java      |  9 ++++++
 .../epdc/service/ActivePointLogService.java   |  7 +++++
 .../impl/ActivePointLogServiceImpl.java       | 13 +++++++++
 .../resources/mapper/ActivePointLogDao.xml    | 29 +++++++++++++++++++
 5 files changed, 69 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
index 2193d40b3..4d81bbeff 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
@@ -120,4 +120,15 @@ public class ActivePointLogController {
     public Result<String> getIsSignIn(@RequestBody PointLogFormDTO pointLogFormDTO) {
         return new Result<String>().ok(activePointLogService.getIsSignIn(pointLogFormDTO));
     }
+
+    /**
+     * 获取积分总数
+     * @param params
+     * @return
+     */
+    @GetMapping("getTotal")
+    public Result<Integer> getTotal(@RequestParam Map<String, Object> params) {
+        Integer total = activePointLogService.getTotal(params);
+        return new Result<Integer>().ok(total);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
index bc1f92cdc..c28a3daf5 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
@@ -73,4 +73,13 @@ public interface ActivePointLogDao extends BaseDao<ActivePointLogEntity> {
      * @date 2021/9/29 16:31
      */
     Integer selectIsSignIn(PointLogFormDTO pointLogFormDTO);
+
+    /**
+     * 获取积分总数
+     *
+     * @param params
+     * @return
+     */
+    Integer getTotal(Map<String, Object> params);
+
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java
index 6ccd38785..04555f434 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java
@@ -118,4 +118,11 @@ public interface ActivePointLogService extends BaseService<ActivePointLogEntity>
      * @date 2021/9/29 16:30
      */
     String getIsSignIn(PointLogFormDTO pointLogFormDTO);
+
+    /**
+     * 获取积分总数
+     * @param params
+     * @return
+     */
+    Integer getTotal(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/ActivePointLogServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
index 63dfeac6d..f5def3d74 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
@@ -216,4 +216,17 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl<ActivePointLogDao
             return "0";
         }
     }
+
+
+    /**
+     * 获取积分总数
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Integer getTotal(Map<String, Object> params) {
+        Integer total = baseDao.getTotal(params);
+        return total;
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
index 9df63e45e..c1ab36683 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
@@ -56,6 +56,12 @@
         <if test="deptId != null and deptId != ''">
             and FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
         </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like '%' #{mobile} '%'
+        </if>
+        <if test="operationDesc != null and operationDesc != ''">
+            and OPERATION_DESC like '%' #{operationDesc} '%'
+        </if>
         order by UPDATED_TIME desc
     </select>
 
@@ -102,5 +108,28 @@
         AND lg.DEL_FLAG = '0'
         AND DATE_FORMAT(lg.CREATED_TIME, '%Y%m%d') =DATE_FORMAT(NOW(), '%Y%m%d')
     </select>
+
+
+    <select id="getTotal" resultType="java.lang.Integer">
+        select
+        sum(POINTS) total
+        from epdc_active_point_log
+        where DEL_FLAG = '0'
+        <if test="operationType != null and operationType != ''">
+            and OPERATION_TYPE = #{operationType}
+        </if>
+        <if test="userName != null and userName != ''">
+            and USER_NAME like '%' #{userName} '%'
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like '%' #{mobile} '%'
+        </if>
+        <if test="operationDesc != null and operationDesc != ''">
+            and OPERATION_DESC like '%' #{operationDesc} '%'
+        </if>
+    </select>
 </mapper>