emm

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

@@ -72,4 +72,10 @@ public class PersonDataResultDTO implements Serializable {
      */
     @JsonIgnore
     private String idCard;
+
+    /**
+     * 是否是志愿者 1是，0否
+     */
+    @JsonIgnore
+    private String isVolunteer;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -124,4 +124,13 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     @MapKey("HOME_ID")
     Map<String, Map<String, Integer>> getHomeUserCategoryCount(@Param("buildId") String buildId);
+
+    /**
+     * @Description  根据userId查询志愿者
+     * @param userId
+     * @author zxc
+     * @date 2021/11/5 5:44 下午
+     */
+    List<String> selectVolunteerByUserId(@Param("userId")String userId);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -493,6 +493,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             throw new RenException("查询房屋信息失败");
         }
         personData.setHouseInfo(listResult.getData());
+
+        // 志愿者处理
+        if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)){
+            List<String> volunteers = baseDao.selectVolunteerByUserId(formDTO.getUserId());
+            volunteers.forEach(v -> {
+
+            });
+        }
         // TODO
         return personData;
     }

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

@@ -240,4 +240,9 @@
         AND BUILD_ID = #{buildId}
         GROUP BY HOME_ID
     </select>
+
+    <!-- 根据userId查询志愿者 -->
+    <select id="selectVolunteerByUserId" resultType="java.lang.String">
+        SELECT VOLUNTEER_CATEGORY FROM ic_volunteer WHERE DEL_FLAG = '0' AND ic_resi_user = #{userId}
+    </select>
 </mapper>