From aa7f2c617168faebbb59e53b225dbde59c24675c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 29 Mar 2022 17:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/excel/PointsLogsExcel.java  | 9 +++++++++
 .../src/main/resources/mapper/PointsLogsDao.xml          | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java
index 2d001a0..e9257bc 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java
@@ -31,6 +31,15 @@ import java.util.Date;
 @Data
 public class PointsLogsExcel {
 
+    @Excel(name = "姓名")
+    private String realName;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "部门名称")
+    private String grid;
+
     @Excel(name = "操作描述")
     private String operationDesc;
 
diff --git a/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml b/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml
index acef416..a392cf6 100644
--- a/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml
+++ b/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml
@@ -135,9 +135,13 @@
         l.OPERATION_TIME operationTime,
         l.POINTS points,
         l.OPERATION_TYPE operationType,
-        l.LAVE_POINTS lavePoints
+        l.LAVE_POINTS lavePoints,
+        l.REAL_NAME,
+        l.GRID,
+        u.MOBILE
         FROM
         epdc_points_logs l
+        left join esua_epdc_user.epdc_user u on u.ID = l.USER_ID and u.DEL_FLAG = 0
         LEFT JOIN epdc_points_behavior b ON l.BEHAVIOR_CODE = b.BEHAVIOR_CODE AND b.DEL_FLAG = 0
         WHERE l.DEL_FLAG = 0
         AND l.BEHAVIOR_CODE = 'points_exchange'