智友朵朵返回age和sex

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<ScreenPublicDat
     @Override
     public Result pioneerdata() {
         List<PioneerdataResultDTO> list = baseDao.pioneerdata();
+        log.info(list.toString());
         // 将list转换为json格式
         PioneerdataDTO result = new PioneerdataDTO();
         result.setDataList(list);

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-是)

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-是)

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;
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml

@@ -25,7 +25,8 @@
 
     <select id="leaderboard" resultType="com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO">
         select substr(NICKNAME,locate('-',NICKNAME)+1) as NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT,
-        VOLUNTEER_DEPT_ID as volunteerDeptId,VOLUNTEER_POINTS as volunteerPoints,VOLUNTEER_POINTS_TOTAL as volunteerPointsTotal
+        VOLUNTEER_DEPT_ID as volunteerDeptId,VOLUNTEER_POINTS as volunteerPoints,VOLUNTEER_POINTS_TOTAL as volunteerPointsTotal,
+        TIMESTAMPDIFF(YEAR, birthday, CURDATE()) as age,sex
         from epdc_volunteer_rank
         where DEL_FLAG = '0' and SHOW_FLAG = '1'
         <if test='type != "" and type != null and type=="0"'>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java

@@ -23,6 +23,14 @@ public class EpdcAppVolunteerListResultDTO implements Serializable {
      * 用户昵称
      */
     private String nickname;
+    /**
+     * 性别
+     */
+    private String sex;
+    /**
+     * 年龄
+     */
+    private Integer age;
 
     /**
      * 头像

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java

@@ -131,5 +131,21 @@ public class EpdcGetVolunteerRankDTO implements Serializable {
      * 志愿公益累计积分
      */
     private Integer volunteerPointsTotal;
+    /**
+     * 年龄
+     */
+    private Date birthday;
+    /**
+     * 性别
+     */
+    private String sex;
+    /**
+     * 性别
+     */
+    private String mobile;
+    /**
+     * 性别
+     */
+    private String identityNo;
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -202,7 +202,11 @@
                 vi.PARTICIPATION_NUM,
                 vi.VOLUNTEER_DEPT_ID,
                 vi.VOLUNTEER_POINTS,
-                vi.VOLUNTEER_POINTS_TOTAL
+                vi.VOLUNTEER_POINTS_TOTAL,
+                vi.SEX,
+                vi.BIRTHDAY,
+                vi.MOBILE,
+                vi.IDENTITY_NO
             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 IN ('0', '1')
@@ -229,13 +233,15 @@
     </update>
 
     <select id="selectListVolunteer" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO">
-        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