From d8be8c10a4a5dfd00f628a09b017f580c04b9568 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 11 Sep 2020 16:37:10 +0800
Subject: [PATCH] =?UTF-8?q?screen=5Fkc=5Fvolunteer=5Fheat=5Frank=5Fgrid=5F?=
 =?UTF-8?q?daily=20=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=90?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E3=80=81=E5=BF=97=E6=84=BF=E8=80=85id?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screencoll/form/KcVolunteerHeartRankFormDTO.java   | 10 ++++++++++
 .../ScreenKcVolunteerHeatRankGridDailyEntity.java      |  9 +++++++++
 .../screen/ScreenKcVolunteerHeatRankGridDailyDao.xml   |  6 ++++++
 3 files changed, 25 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java
index 2509051e3d..d25d044750 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java
@@ -49,4 +49,14 @@ public class KcVolunteerHeartRankFormDTO implements Serializable {
      * 爱心时长 单位分钟
      */
     private Integer heartTime;
+
+    /**
+     * 积分09-11新增
+     */
+    private Integer points;
+
+    /**
+     * 志愿者id 09-11新增
+     */
+    private String volunteerId;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
index 73e7d8da06..a681c2bca0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
@@ -83,4 +83,13 @@ public class ScreenKcVolunteerHeatRankGridDailyEntity extends BaseEpmetEntity {
      */
 	private Integer heartTime;
 
+	/**
+	 * 积分09-11新增
+	 */
+	private Integer points;
+
+	/**
+	 * 志愿者id 09-11新增
+	 */
+	private String volunteerId;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml
index 8edba81c44..dffc71ae0c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml
@@ -14,6 +14,8 @@
         <result property="userId" column="USER_ID"/>
         <result property="userName" column="USER_NAME"/>
         <result property="heartTime" column="HEART_TIME"/>
+        <result property="points" column="POINTS"/>
+        <result property="volunteerId" column="VOLUNTEER_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -42,6 +44,8 @@
         USER_ID,
         USER_NAME,
         HEART_TIME,
+        POINTS,
+        VOLUNTEER_ID,
 
         DEL_FLAG,
         REVISION,
@@ -62,6 +66,8 @@
             #{item.userId},
             #{item.userName},
             #{item.heartTime},
+            #{item.points},
+            #{item.volunteerId},
             0,
             0,
             'APP_USER',