From 51eb62d84513c815488fc7f670dcf98059bc9a96 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 11 Nov 2021 14:11:02 +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

---
 .../resources/mapper/ActivePointLogDao.xml    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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 104dfaae5..f42e667ab 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
@@ -139,31 +139,32 @@
 
     <select id="exportTotal" resultType="com.elink.esua.epdc.dto.result.ActivePointTotalResultDTO">
         select
-        USER_NAME,
-        DEPT_NAME,
-        sum(POINTS) as POINTS,
-        OPERATION_DESC
-        from epdc_active_point_log
-        where DEL_FLAG = '0'
+        user.real_name USER_NAME,
+        pl.DEPT_NAME,
+        sum(pl.POINTS) as POINTS,
+        pl.OPERATION_DESC
+        from epdc_active_point_log pl
+        left join esua_epdc_user.epdc_user user on user.ID = pl.USER_ID and user.DEL_FLAG = '0'
+        where pl.DEL_FLAG = '0'
         <if test="operationType != null and operationType != ''">
-            and OPERATION_TYPE = #{operationType}
+            and pl.OPERATION_TYPE = #{operationType}
         </if>
         <if test="userName != null and userName != ''">
-            and USER_NAME like '%' #{userName} '%'
+            and pl.USER_NAME like '%' #{userName} '%'
         </if>
         <if test="deptId != null and deptId != ''">
-            and FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+            and FIND_IN_SET( #{deptId}, pl.ALL_DEPT_IDS )
         </if>
         <if test="mobile != null and mobile != ''">
-            and MOBILE like '%' #{mobile} '%'
+            and pl.MOBILE like '%' #{mobile} '%'
         </if>
         <if test="operationDesc != null and operationDesc != ''">
-            and OPERATION_DESC like '%' #{operationDesc} '%'
+            and pl.OPERATION_DESC like '%' #{operationDesc} '%'
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND DATE_FORMAT( OPERATION_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT( pl.OPERATION_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
-        group by USER_NAME,OPERATION_DESC
+        group by pl.USER_ID,pl.DEPT_ID,pl.OPERATION_DESC
     </select>
 </mapper>