From cdd66c6848a2cf755e751de1279325df9fdd9fe5 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 1 Jul 2020 16:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF-=20?=
 =?UTF-8?q?=E5=88=9D=E5=BF=83=E4=BA=92=E5=8A=A9-=E5=88=9D=E5=BF=83?=
 =?UTF-8?q?=E6=A6=9C=20=20=E3=80=91-=E3=80=90=E6=B7=BB=E5=8A=A0=E7=88=B1?=
 =?UTF-8?q?=E5=BF=83=E7=A7=AF=E5=88=86=E3=80=91-=EF=BC=88=E9=AD=8F?=
 =?UTF-8?q?=E5=87=AF=EF=BC=89-2020/07/01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/volunteer/entity/VolunteerRankEntity.java | 7 +++++--
 .../esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java | 6 +++++-
 .../src/main/resources/mapper/VolunteerInfoDao.xml         | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java
index 26201329d..278854d59 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java
@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.modules.volunteer.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -88,5 +87,9 @@ public class VolunteerRankEntity extends BaseEpdcEntity {
      * 是否显示(0-不显示，1-显示)
      */
 	private String showFlag;
+	/**
+	 * 新增 志愿者积分
+	 */
+	private String integral;
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java
index 5de780bd1..22195aae4 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java
@@ -118,5 +118,9 @@ public class EpdcGetVolunteerRankDTO implements Serializable {
      * 删除标志
      */
 	private String delFlag;
+    /**
+     * 新增 志愿者积分
+     */
+    private String integral;
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 508e0971b..0de47559f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -180,7 +180,8 @@
                 eu.NICKNAME,
                 eu.PARTY_FLAG,
                 vi.KINDNESS_TIME,
-                vi.PARTICIPATION_NUM
+                vi.PARTICIPATION_NUM,
+                eu.POINTS INTEGRAL
             from epdc_volunteer_info vi
             left join epdc_user eu on eu.id = vi.USER_ID
             WHERE vi.DEL_FLAG = '0'  AND vi.AUDIT_STATUS = '1'