查询用户新增字段

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java

@@ -56,4 +56,14 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 是否录入身份证号，true ,false
      * */
     private Boolean completeIdNum;
+
+    /**
+     * 是否是志愿者：0否1是
+     */
+    private  String volunteerFlag;
+
+    /**
+     * 类别【字典表】
+     */
+    private String volunteerCategory;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java

@@ -56,4 +56,14 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 今日已获得积分，用于积分任务列表显示
      * */
     private Integer todayObtainedPoint;
+
+    /**
+     * 是否是志愿者：0否1是
+     */
+    private  String volunteerFlag;
+
+    /**
+     * 类别【字典表】
+     */
+    private String volunteerCategory;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java

@@ -42,4 +42,14 @@ public class MyselfMsgResultDTO implements Serializable {
      * 身份证号
      * */
     private String idNum;
+
+    /**
+     * 是否是志愿者：0否1是
+     */
+    private  String volunteerFlag;
+
+    /**
+     * 类别【字典表】
+     */
+    private String volunteerCategory;
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

@@ -35,7 +35,9 @@
             IFNULL(resi.ID,"") AS resiId,
             IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName,
             IFNULL(relation.GRID_ID,"") AS gridId,
-            IFNULL(resi.id_num,'')AS idNum
+            IFNULL(resi.id_num,'')AS idNum,
+            IF(iv.id is null,'0','1') as volunteerFlag,
+            iv.VOLUNTEER_CATEGORY
             FROM
             USER user
             LEFT JOIN
@@ -46,6 +48,8 @@
             REGISTER_RELATION relation ON user.ID = relation.USER_ID
             AND relation.DEL_FLAG = '0'
             AND relation.FIRST_REGISTER = '1'
+            LEFT JOIN ic_resi_user ru on ru.ID_CARD=wechat.ID_NUM and ru.DEL_FLAG=0
+			LEFT JOIN ic_volunteer iv ON iv.IC_RESI_USER=ru.id and iv.DEL_FLAG=0
             WHERE
             user.ID = #{userId}
             AND