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 @@ + + @@ -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',