From 0037e0124c0dc59e7fed5b52467a6d50aeb4409a Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Fri, 22 Jan 2021 17:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java    | 5 +++++
 .../com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java | 6 ++++++
 .../java/com/elink/esua/epdc/entity/PointsLogsEntity.java   | 5 +++++
 .../elink/esua/epdc/service/impl/PointsLogsServiceImpl.java | 1 +
 .../src/main/resources/mapper/PointsLogsDao.xml             | 3 ++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
index 2acda01c..b00d3394 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
@@ -181,4 +181,9 @@ public class PointsLogsDTO implements Serializable {
      */
     private String remark;
 
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java
index 612d3a08..4c949b7a 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java
@@ -137,4 +137,10 @@ public class PointsLogsResultDTO implements Serializable {
 	 */
 	private String remark;
 
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
+
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java
index a9975b22..79a3e6a2 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java
@@ -147,4 +147,9 @@ public class PointsLogsEntity extends BaseEpdcEntity {
      */
     private String remark;
 
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
 }
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 43ddddca..a428d9fe 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
@@ -495,6 +495,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         pointsLogsEntity.setReferenceId(formDto.getUserId());
         pointsLogsEntity.setLavePoints(userDto.getPoints());
         pointsLogsEntity.setRemark(formDto.getRemark());
+        pointsLogsEntity.setRealName(userDto.getRealName());
 
         // 赋值积分所属部门
         Result<Long> userGridIdByUserId = usersFeignClient.getUserGridIdByUserId(formDto.getUserId());
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 873904ea..7af40e9a 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
@@ -303,7 +303,8 @@
             OPERATION_TIME,
             OPERATION_TYPE,
             POINTS,
-            REMARK
+            REMARK,
+            REAL_NAME
         FROM
             epdc_points_logs
         WHERE