From 2359dd72c88d33db39898392ca683f210488b3df Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 3 Aug 2020 15:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BF=83=E6=A6=9C=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=E8=BD=AC=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/HeartUserInfoDTO.java       | 6 +++---
 .../com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java | 2 +-
 .../src/main/resources/mapper/HeartUserInfoDao.xml          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java
index 8ea2b28322..f84b5ab64c 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java
@@ -55,10 +55,10 @@ public class HeartUserInfoDTO implements Serializable {
 	private Boolean volunteerFlag;
 
     /**
-     * 爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的
+     * 爱心时长(单位：小时)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的
 
      */
-	private Integer kindnessTime;
+	private Double kindnessTime;
 
     /**
      * 实际参与活动个数（签到+1）
@@ -100,4 +100,4 @@ public class HeartUserInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java
index d3d50da078..6fb9a6cadc 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java
@@ -51,7 +51,7 @@ public class ResiLeaderboardResultDTO implements Serializable {
     /**
      * 爱心时长(单位：小时)
      */
-	private Integer kindnessTime;
+	private Double kindnessTime;
 
     /**
      * 参加次数
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml
index 9df9414e17..fdbea79581 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml
@@ -46,7 +46,7 @@
         SELECT
             ui.USER_ID userId,
             ui.VOLUNTEER_FLAG volunteerFlag,
-            ui.KINDNESS_TIME kindnessTime,
+            TRUNCATE(ui.KINDNESS_TIME / 60, 2) kindnessTime,
             ui.PARTICIPATION_NUM participationNum
         FROM heart_user_info ui
         WHERE ui.DEL_FLAG = '0'