elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增接口，查询房屋家庭成员

dev
YUJT 3 years ago
parent
dd5a5323a2
commit
d4f36ec9f7
4 changed files with 301 additions and 199 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserBriefResultDTO.java
  2. 32
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  3. 28
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
  4. 46
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

24
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserBriefResultDTO.java
View File

@ -0,0 +1,24 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2021/11/1 10:47
*/
@Data
public class HomeUserBriefResultDTO implements Serializable {
private static final long serialVersionUID = 7747977114455488862L;
private String id;
private String homeId;
private String name;
private String isParty;
private String gender;
private String yhzgx;
private String mobile;
private String idCard;
private String birthday;
}

32
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
View File

@ -250,6 +250,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 根据ic_resi_user找家属 * 根据ic_resi_user找家属
*
* @param icResiUserId * @param icResiUserId
* @return * @return
*/ */
@ -573,10 +574,10 @@ public class IcResiUserController implements ResultDataResolver {
} }
/** /**
* @LoginUser TokenDto tokenDto,
* 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
* @param formDTO * @param formDTO
* @return * @return
* @LoginUser TokenDto tokenDto,
* 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
*/ */
@PostMapping("demandusers") @PostMapping("demandusers")
public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) { public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
@ -586,6 +587,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 下载ic居民信息导入excel模板 * 下载ic居民信息导入excel模板
*
* @return * @return
*/ */
@PostMapping("import/download-template") @PostMapping("import/download-template")
@ -616,6 +618,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 党员年龄范围统计 * 党员年龄范围统计
*
* @Param formDTO * @Param formDTO
* @Return {@link Result< List< OptionDataResultDTO >>} * @Return {@link Result< List< OptionDataResultDTO >>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -629,6 +632,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 党员年龄列表 * 党员年龄列表
*
* @Param formDTO * @Param formDTO
* @Return {@link Result< PageData< PartyMemberEducationResultDTO>>} * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -642,6 +646,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 党员学历统计 * 党员学历统计
*
* @Param formDTO * @Param formDTO
* @Return {@link Result< List< OptionDataResultDTO>>} * @Return {@link Result< List< OptionDataResultDTO>>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -655,6 +660,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 党员学历列表 * 党员学历列表
*
* @Param formDTO * @Param formDTO
* @Return {@link Result< PageData< PartyMemberEducationResultDTO>>} * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -668,6 +674,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 根据居民id查询居民信息简介 * 根据居民id查询居民信息简介
*
* @param resiUserId * @param resiUserId
* @return * @return
*/ */
@ -680,6 +687,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 获取ic_resi_user * 获取ic_resi_user
*
* @param icResiUserId * @param icResiUserId
* @return * @return
*/ */
@ -693,6 +701,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* 【社区查询】搜索居民们 * 【社区查询】搜索居民们
*
* @param input * @param input
* @return * @return
*/ */
@ -721,9 +730,9 @@ public class IcResiUserController implements ResultDataResolver {
} }
/** /**
* @Description 【社区查询】人员预警右侧列表
* @param formDTO * @param formDTO
* @param tokenDto * @param tokenDto
* @Description 【社区查询】人员预警右侧列表
* @author zxc * @author zxc
* @date 2022/1/17 4:25 下午 * @date 2022/1/17 4:25 下午
*/ */
@ -735,6 +744,7 @@ public class IcResiUserController implements ResultDataResolver {
/** /**
* Desc: 根据房屋IDs查询房屋下是否有存在居民的 * Desc: 根据房屋IDs查询房屋下是否有存在居民的
*
* @param ids * @param ids
* @author zxc * @author zxc
* @date 2022/3/2 10:32 上午 * @date 2022/3/2 10:32 上午
@ -761,4 +771,20 @@ public class IcResiUserController implements ResultDataResolver {
}); });
return new Result(); return new Result();
} }
/**
* 根据房屋主键查询户内家庭成员简信息
*
* @param houseId 房屋主键
* @param loginUser 登录用户
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HomeUserBriefResultDTO>>
* @author work@yujt.net.cn
* @date 2022/4/21/0021 15:00
*/
@PostMapping("listhomeuserbrief/{houseId}")
public Result<List<HomeUserBriefResultDTO>> listHomeUserBrief(@PathVariable("houseId") String houseId, @LoginUser TokenDto loginUser) {
String customerId = loginUser.getCustomerId();
List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
return new Result().ok(r);
}
} }

28
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
View File

@ -68,6 +68,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
List<HomeUserResultDTO> getPeopleByRoom(String homeId); List<HomeUserResultDTO> getPeopleByRoom(String homeId);
PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO); PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO);
/** /**
* 编辑页面，显示居民信息详情 * 编辑页面，显示居民信息详情
* *
@ -79,7 +80,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO); Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);
List<Map<String, Object>> dynamicQuery(String customerId, List<Map<String, Object>> dynamicQuery(String customerId,
String formCode, String formCode,
String resultTableName, String resultTableName,
@ -88,17 +88,17 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
String staffOrgPath); String staffOrgPath);
/** /**
* @Description 查询个人数据
* @param formDTO * @param formDTO
* @Description 查询个人数据
* @author zxc * @author zxc
* @date 2021/11/3 9:21 上午 * @date 2021/11/3 9:21 上午
*/ */
PersonDataResultDTO personData(PersonDataFormDTO formDTO); PersonDataResultDTO personData(PersonDataFormDTO formDTO);
/** /**
* @Description 根据名字搜索
* @param formDTO * @param formDTO
* @param tokenDto * @param tokenDto
* @Description 根据名字搜索
* @author zxc * @author zxc
* @date 2021/11/3 1:42 下午 * @date 2021/11/3 1:42 下午
*/ */
@ -157,6 +157,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* 党员年龄范围统计 * 党员年龄范围统计
*
* @Param formDTO * @Param formDTO
* @Return {@link List< OptionDataResultDTO >} * @Return {@link List< OptionDataResultDTO >}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -166,6 +167,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* 获取年龄范围内党员列表 * 获取年龄范围内党员列表
*
* @Param formDTO * @Param formDTO
* @Return {@link PageData< PartyMemberAgeResultDTO>} * @Return {@link PageData< PartyMemberAgeResultDTO>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -175,6 +177,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* 党员文化程度统计 * 党员文化程度统计
*
* @Param formDTO * @Param formDTO
* @Return {@link List< OptionDataResultDTO>} * @Return {@link List< OptionDataResultDTO>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -184,6 +187,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* 按教育程度获取党员列表 * 按教育程度获取党员列表
*
* @Param formDTO * @Param formDTO
* @Return {@link PageData< PartyMemberEducationResultDTO>} * @Return {@link PageData< PartyMemberEducationResultDTO>}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -195,15 +199,16 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* 获取居民主表记录 * 获取居民主表记录
*
* @param icResiUserId * @param icResiUserId
* @return * @return
*/ */
IcResiUserDTO get(String icResiUserId); IcResiUserDTO get(String icResiUserId);
/** /**
* @Description 【社区查询】人员预警右侧列表
* @param formDTO * @param formDTO
* @param tokenDto * @param tokenDto
* @Description 【社区查询】人员预警右侧列表
* @author zxc * @author zxc
* @date 2022/1/17 4:25 下午 * @date 2022/1/17 4:25 下午
*/ */
@ -211,6 +216,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* Desc: 根据房屋IDs查询房屋下是否有存在居民的 * Desc: 根据房屋IDs查询房屋下是否有存在居民的
*
* @param ids * @param ids
* @author zxc * @author zxc
* @date 2022/3/2 10:32 上午 * @date 2022/3/2 10:32 上午
@ -226,10 +232,12 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
* @Date 2022/3/29 14:27 * @Date 2022/3/29 14:27
*/ */
PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO); PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO);
PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO); PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO);
/** /**
* 居民防疫信息详情 * 居民防疫信息详情
*
* @Param formDTO * @Param formDTO
* @Return {@link EpidemicPreventionResultDTO} * @Return {@link EpidemicPreventionResultDTO}
* @Author zhaoqifeng * @Author zhaoqifeng
@ -239,10 +247,22 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
/** /**
* 居民防疫信息详情:核酸，疫苗，行程 * 居民防疫信息详情:核酸，疫苗，行程
*
* @Param formDTO * @Param formDTO
* @Return {@link EpidemicPreventionInfoDTO} * @Return {@link EpidemicPreventionInfoDTO}
* @Author zhaoqifeng * @Author zhaoqifeng
* @Date 2022/3/29 16:25 * @Date 2022/3/29 16:25
*/ */
EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO); EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO);
/**
* 根据房屋主键查询户内家庭成员简信息
*
* @param houseId 房屋主键
* @param customerId 客户ID
* @return java.util.List<com.epmet.dto.result.HomeUserBriefResultDTO>
* @author work@yujt.net.cn
* @date 2022/4/21/0021 15:02
*/
List<HomeUserBriefResultDTO> listHomeUserBrief(String houseId, String customerId);
} }

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

@ -18,6 +18,7 @@
package com.epmet.service.impl; package com.epmet.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.epmet.bean.ResiExportBaseInfoData; import com.epmet.bean.ResiExportBaseInfoData;
@ -66,6 +67,7 @@ import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
@ -486,8 +488,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
@Override @Override
public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) { public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) {
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
@ -703,6 +703,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
/** /**
* desc:动态查询 某表的所有字段值 * desc:动态查询 某表的所有字段值
*
* @param customerId * @param customerId
* @param formCode * @param formCode
* @param resultTableName * @param resultTableName
@ -745,8 +746,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
/** /**
* @Description 查询个人数据
* @param formDTO * @param formDTO
* @Description 查询个人数据
* @author zxc * @author zxc
* @date 2021/11/3 9:21 上午 * @date 2021/11/3 9:21 上午
*/ */
@ -833,9 +834,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
/** /**
* @Description 根据名字搜索
* @param formDTO * @param formDTO
* @param tokenDto * @param tokenDto
* @Description 根据名字搜索
* @author zxc * @author zxc
* @date 2021/11/3 1:42 下午 * @date 2021/11/3 1:42 下午
*/ */
@ -882,7 +883,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
/** /**
* desc:条件导出 * desc:条件导出
* *
*
* @param formItemMap key 表名 value formItem * @param formItemMap key 表名 value formItem
* @param baseTableName * @param baseTableName
* @return * @return
@ -954,6 +954,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
* key:itemId,value: key:columnName,中文 * key:itemId,value: key:columnName,中文
*/ */
private static Map<String, Cache<String, String>> remoteOptionCacheMap = new HashMap<>(); private static Map<String, Cache<String, String>> remoteOptionCacheMap = new HashMap<>();
private void putRemoteValue(Set<FormItemResult> conditionItemSet, String currentStaffAgencyId, Map<String, Object> map, Map<String, Object> originalConditionMap, FormItemResult e, String columnName, String vauleStr) { private void putRemoteValue(Set<FormItemResult> conditionItemSet, String currentStaffAgencyId, Map<String, Object> map, Map<String, Object> originalConditionMap, FormItemResult e, String columnName, String vauleStr) {
try { try {
Map<String, IcResiUserImportServiceImpl.ColumnWrapper> columnWrappers = new HashMap<>(); Map<String, IcResiUserImportServiceImpl.ColumnWrapper> columnWrappers = new HashMap<>();
@ -1173,9 +1174,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
/** /**
* @Description 【社区查询】人员预警右侧列表
* @param formDTO * @param formDTO
* @param tokenDto * @param tokenDto
* @Description 【社区查询】人员预警右侧列表
* @author zxc * @author zxc
* @date 2022/1/17 4:25 下午 * @date 2022/1/17 4:25 下午
*/ */
@ -1231,6 +1232,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
/** /**
* Desc: 根据房屋IDs查询房屋下是否有存在居民的 * Desc: 根据房屋IDs查询房屋下是否有存在居民的
*
* @param ids * @param ids
* @author zxc * @author zxc
* @date 2022/3/2 10:32 上午 * @date 2022/3/2 10:32 上午
@ -1367,9 +1369,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
/** /**
* @Description 居民分类 和 网格名 处理
* @param list * @param list
* @param configList * @param configList
* @Description 居民分类 和 网格名 处理
* @author zxc * @author zxc
* @date 2022/1/18 3:22 下午 * @date 2022/1/18 3:22 下午
*/ */
@ -1402,6 +1404,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
/** /**
* 查询志愿者类别options * 查询志愿者类别options
*
* @param customerId * @param customerId
* @return * @return
*/ */
@ -1544,4 +1547,33 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
return new PageData<>(list, pageInfo.getTotal()); return new PageData<>(list, pageInfo.getTotal());
} }
@Override
public List<HomeUserBriefResultDTO> listHomeUserBrief(String houseId, String customerId) {
LambdaQueryWrapper<IcResiUserEntity> lqw = new LambdaQueryWrapper<>();
lqw.eq(IcResiUserEntity::getCustomerId, customerId)
.eq(IcResiUserEntity::getHomeId, houseId)
.select(
IcResiUserEntity::getId,
IcResiUserEntity::getHomeId,
IcResiUserEntity::getName,
IcResiUserEntity::getIsParty,
IcResiUserEntity::getYhzgx,
IcResiUserEntity::getGender,
IcResiUserEntity::getMobile,
IcResiUserEntity::getIdCard,
IcResiUserEntity::getBirthday
)
.orderByAsc(IcResiUserEntity::getYhzgx);
List<IcResiUserEntity> homeUserList = baseDao.selectList(lqw);
if (CollUtil.isEmpty(homeUserList)) {
return Lists.newArrayList();
}
homeUserList.forEach(
item -> item.setYhzgx(RelationshipEnum.getEnum(item.getYhzgx()).getName())
);
return ConvertUtils.sourceToTarget(homeUserList, HomeUserBriefResultDTO.class);
}
} }

Write Preview
Loading…
Cancel
Save