合并分支

3 years ago · b62a11b905
4 changed files with 299 additions and 199 deletions
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserBriefResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserBriefResultDTO.java
@ -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;
+}
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@ -252,6 +252,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 根据ic_resi_user找家属
+     *
     * @param icResiUserId
     * @return
     */
@ -543,6 +544,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 需求： http://zentao.elinkservice.cn/task-view-4193.html  第11条
+     *
     * @param formDTO
     * @param tokenDto
     * @return 根据分类搜索
@ -592,10 +594,10 @@ public class IcResiUserController implements ResultDataResolver {
    }

    /**
-     * @LoginUser TokenDto tokenDto,
-     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
     * @param formDTO
     * @return
+     * @LoginUser TokenDto tokenDto,
+     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
     */
    @PostMapping("demandusers")
    public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
@ -605,6 +607,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 下载ic居民信息导入excel模板
+     *
     * @return
     */
    @PostMapping("import/download-template")
@ -635,6 +638,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员年龄范围统计
+     *
     * @Param formDTO
     * @Return {@link Result< List<  OptionDataResultDTO >>}
     * @Author zhaoqifeng
@ -648,6 +652,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员年龄列表
+     *
     * @Param formDTO
     * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
     * @Author zhaoqifeng
@ -712,6 +717,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员学历统计
+     *
     * @Param formDTO
     * @Return {@link Result< List< OptionDataResultDTO>>}
     * @Author zhaoqifeng
@ -725,6 +731,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员学历列表
+     *
     * @Param formDTO
     * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
     * @Author zhaoqifeng
@ -795,6 +802,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 根据居民id查询居民信息简介
+     *
     * @param resiUserId
     * @return
     */
@ -807,6 +815,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 获取ic_resi_user
+     *
     * @param icResiUserId
     * @return
     */
@ -820,6 +829,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 【社区查询】搜索居民们
+     *
     * @param input
     * @return
     */
@ -848,9 +858,9 @@ public class IcResiUserController implements ResultDataResolver {
    }

    /**
-     * @Description 【社区查询】人员预警右侧列表
     * @param formDTO
     * @param tokenDto
+     * @Description 【社区查询】人员预警右侧列表
     * @author zxc
     * @date 2022/1/17 4:25 下午
     */
@ -863,6 +873,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * Desc: 根据房屋IDs查询房屋下是否有存在居民的
+     *
     * @param ids
     * @author zxc
     * @date 2022/3/2 10:32 上午
@ -910,4 +921,19 @@ public class IcResiUserController implements ResultDataResolver {
        return new Result<List<UserChartResultDTO>>().ok(icResiUserService.userChartList(formDTO));
    }

+    /**
+     * 根据房屋主键查询户内家庭成员简信息
+     *
+     * @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);
+    }
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@ -68,6 +68,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
    List<HomeUserResultDTO> getPeopleByRoom(String homeId);

    PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO);
+
    /**
     * 编辑页面，显示居民信息详情
     *
@ -79,7 +80,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
    Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);


-
    List<Map<String, Object>> dynamicQuery(String customerId,
                                           String formCode,
                                           String resultTableName,
@ -88,16 +88,16 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                           String staffOrgPath);

    /**
-     * @Description  查询个人数据
     * @param formDTO
+     * @Description 查询个人数据
     * @author zxc
     * @date 2021/11/3 9:21 上午
     */
    PersonDataResultDTO personData(PersonDataFormDTO formDTO);

    /**
-     * @Description  根据名字搜索
     * @param formDTO
+     * @Description 根据名字搜索
     * @author zxc
     * @date 2021/11/3 1:42 下午
     */
@ -156,6 +156,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 党员年龄范围统计
+     *
     * @Param formDTO
     * @Return {@link List<  OptionDataResultDTO >}
     * @Author zhaoqifeng
@ -165,6 +166,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 获取年龄范围内党员列表
+     *
     * @Param formDTO
     * @Return {@link PageData< PartyMemberAgeResultDTO>}
     * @Author zhaoqifeng
@ -174,6 +176,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 党员文化程度统计
+     *
     * @Param formDTO
     * @Return {@link List< OptionDataResultDTO>}
     * @Author zhaoqifeng
@ -183,6 +186,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 按教育程度获取党员列表
+     *
     * @Param formDTO
     * @Return {@link PageData< PartyMemberEducationResultDTO>}
     * @Author zhaoqifeng
@ -194,15 +198,16 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 获取居民主表记录
+     *
     * @param icResiUserId
     * @return
     */
    IcResiUserDTO get(String icResiUserId);

    /**
-     * @Description 【社区查询】人员预警右侧列表
     * @param formDTO
     * @param tokenDto
+     * @Description 【社区查询】人员预警右侧列表
     * @author zxc
     * @date 2022/1/17 4:25 下午
     */
@ -210,6 +215,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * Desc: 根据房屋IDs查询房屋下是否有存在居民的
+     *
     * @param ids
     * @author zxc
     * @date 2022/3/2 10:32 上午
@ -225,10 +231,12 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     * @Date 2022/3/29 14:27
     */
    PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO);
+
    PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO);

    /**
     * 居民防疫信息详情
+     *
     * @Param formDTO
     * @Return {@link EpidemicPreventionResultDTO}
     * @Author zhaoqifeng
@ -238,6 +246,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 居民防疫信息详情:核酸，疫苗，行程
+     *
     * @Param formDTO
     * @Return {@link EpidemicPreventionInfoDTO}
     * @Author zhaoqifeng
@ -256,4 +265,15 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     * @Description 【人房】居民总数列表数据
     **/
    List<UserChartResultDTO> userChartList(UserChartFormDTO 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);
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@ -18,6 +18,7 @@
 package com.epmet.service.impl;

 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.QueryWrapper;
 import com.epmet.bean.ResiExportBaseInfoData;
@ -66,6 +67,7 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@ -516,8 +518,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }


-
-
    @Override
    public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) {
        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
@ -733,6 +733,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi

    /**
     * desc:动态查询 某表的所有字段值
+     *
     * @param customerId
     * @param formCode
     * @param resultTableName
@ -775,8 +776,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description  查询个人数据
     * @param formDTO
+     * @Description 查询个人数据
     * @author zxc
     * @date 2021/11/3 9:21 上午
     */
@ -863,7 +864,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description  根据名字搜索
     * @param formDTO
     * @author zxc
     * @date 2021/11/3 1:42 下午
@ -911,7 +911,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    /**
     * desc:条件导出
     *
-     *
     * @param formItemMap   key 表名 value formItem
     * @param baseTableName
     * @return
@ -983,6 +982,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     * key:itemId,value: key:columnName,中文
     */
    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) {
        try {
            Map<String, IcResiUserImportServiceImpl.ColumnWrapper> columnWrappers = new HashMap<>();
@ -1199,9 +1199,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description 【社区查询】人员预警右侧列表
     * @param formDTO
     * @param tokenDto
+     * @Description 【社区查询】人员预警右侧列表
     * @author zxc
     * @date 2022/1/17 4:25 下午
     */
@ -1257,6 +1257,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi

    /**
     * Desc: 根据房屋IDs查询房屋下是否有存在居民的
+     *
     * @param ids
     * @author zxc
     * @date 2022/3/2 10:32 上午
@ -1403,9 +1404,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description  居民分类 和 网格名 处理
     * @param list
     * @param configList
+     * @Description 居民分类 和 网格名 处理
     * @author zxc
     * @date 2022/1/18 3:22 下午
     */
@ -1438,6 +1439,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi

    /**
     * 查询志愿者类别options
+     *
     * @param customerId
     * @return
     */
@ -1653,4 +1655,32 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
        return userList;
    }

+    @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);
+    }
 }