From 886e8f69f11e90530847a076262faf7a161880b0 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 26 Jul 2021 17:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E5=8F=8B=E6=9C=B5=E6=9C=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9Eage=E5=92=8Csex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ScreenPublicDataServiceImpl.java | 1 + .../dto/result/EpdcAppVolunteerRankDTO.java | 21 +++++++++++++++++++ .../epdc/volunteer/EpdcVolunteerRankDTO.java | 21 +++++++++++++++++++ .../volunteer/entity/VolunteerRankEntity.java | 16 ++++++++++++++ .../mapper/volunteer/VolunteerRankDao.xml | 3 ++- .../result/EpdcAppVolunteerListResultDTO.java | 8 +++++++ .../epdc/result/EpdcGetVolunteerRankDTO.java | 16 ++++++++++++++ .../resources/mapper/VolunteerInfoDao.xml | 12 ++++++++--- 8 files changed, 94 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index 0d0682a6..d19e483b 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java @@ -107,6 +107,7 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl list = baseDao.pioneerdata(); + log.info(list.toString()); // 将list转换为json格式 PioneerdataDTO result = new PioneerdataDTO(); result.setDataList(list); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java index fdc0f5d9..beee7acf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java @@ -21,6 +21,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 志愿者排名 @@ -47,6 +48,26 @@ public class EpdcAppVolunteerRankDTO implements Serializable { * 用户名 */ private String nickname; + /** + * 年龄 + */ + private Date birthday; + /** + * 年龄 + */ + private Integer age; + /** + * 性别 + */ + private String sex; + /** + * 性别 + */ + private String mobile; + /** + * 性别 + */ + private String identityNo; /** * 是否党员(0-否，1-是) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java index 2205f6b6..c604a964 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java @@ -21,6 +21,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 志愿者排名 @@ -47,6 +48,26 @@ public class EpdcVolunteerRankDTO implements Serializable { * 用户名 */ private String nickname; + /** + * 年龄 + */ + private Date birthday; + /** + * 年龄 + */ + private Integer age; + /** + * 性别 + */ + private String sex; + /** + * 性别 + */ + private String mobile; + /** + * 性别 + */ + private String identityNo; /** * 是否党员(0-否，1-是) 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 41873d93..10c03e10 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 @@ -99,5 +99,21 @@ public class VolunteerRankEntity extends BaseEpdcEntity { * 志愿公益累计积分 */ private Integer volunteerPointsTotal; + /** + * 年龄 + */ + private Date birthday; + /** + * 性别 + */ + private String sex; + /** + * 性别 + */ + private String mobile; + /** + * 性别 + */ + private String identityNo; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml index 5757e5da..1295c502 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml @@ -25,7 +25,8 @@ - select t.id,t.nickname,t.faceImg,t.volunteerSignature,u.PARTY_FLAG from + select t.id,t.nickname,t.faceImg,t.volunteerSignature,u.PARTY_FLAG,t.SEX,t.age from (SELECT v.ID id, v.VOLUNTEER_NICKNAME nickname, v.VOLUNTEER_FACE_IMG faceImg, v.VOLUNTEER_SIGNATURE volunteerSignature, - v.USER_ID + v.USER_ID, + v.sex, + TIMESTAMPDIFF(YEAR, v.birthday, CURDATE()) as age FROM epdc_volunteer_info v LEFT JOIN epdc_volunteer_tag_relation vt ON vt.VOLUNTEER_ID = v.ID