Merge remote-tracking branch 'origin/lingshan_master' into dev

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java

@@ -12,5 +12,6 @@ public class IcResiUserResultDTO {
     private String icResiUserId;
     private String name;
     private String mobile;
+    private String homeId;
 }
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java

@@ -2,20 +2,22 @@ package com.epmet.dataaggre.dto.epmetuser.result;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description 灵山大屏-党员中共新户联户群众列表
  * @Author yzm
  * @Date 2023/5/19 9:10
  */
 @Data
-public class LingShanLianHuResiUserResultDTO {
+public class LingShanLianHuResiUserResultDTO extends IcResiUserResultDTO{
     /**
      * 与入参一致
      * 党员中心户房屋id,
      */
     private String partyCenterHouseId;
+    /**
+     * 房主姓名
+     */
+    private String partyCenterHouseOwnerName;
     // 关联的房屋信息
     private String neighborHoodId;
     private String neighborHoodName;
@@ -25,8 +27,9 @@ public class LingShanLianHuResiUserResultDTO {
     private String unitName;
     private String doorName;
     private String houseId;
-    // 每个房屋里住的居民
+
-    private List<IcResiUserResultDTO> resiList;
+    // // 每个房屋里住的居民
+    // private List<IcResiUserResultDTO> resiList;
 
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -576,6 +577,7 @@ public class GovOrgController {
      * @param formDTO
      * @return
      */
+    @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
     @PostMapping("lianHuResi")
     public Result<PageData<LingShanLianHuResiUserResultDTO>> lianHuResi(@RequestBody LingShanLianHuResiUserFormDTO formDTO) {
         return new Result<PageData<LingShanLianHuResiUserResultDTO>>().ok(govOrgService.lianHuResi(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPartyCenterHouseId()));

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -271,8 +271,8 @@ public interface EpmetUserService {
 
     /**
      * 根据房屋id,查询居民信息
-     * @param houseId
+     * @param houseIds
      * @return
      */
-    List<IcResiUserResultDTO> listIcResiUserByHouseId(String houseId);
+    PageData<IcResiUserResultDTO> listIcResiUserByHouseId(Integer pageNo,Integer pageSize,List<String> houseIds);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -1199,23 +1199,30 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve
     /**
      * 根据房屋id,查询居民信息
      *
-     * @param houseId
+     * @param pageNo
+     * @param pageSize
+     * @param houseIds
      * @return
      */
     @Override
-    public List<IcResiUserResultDTO> listIcResiUserByHouseId(String houseId) {
+    public PageData<IcResiUserResultDTO> listIcResiUserByHouseId(Integer pageNo,Integer pageSize,List<String> houseIds) {
         LambdaQueryWrapper<IcResiUserEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IcResiUserEntity::getHomeId, houseId)
+        queryWrapper.in(IcResiUserEntity::getHomeId, houseIds)
                 .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR);
+        PageHelper.startPage(pageNo, pageSize);
         List<IcResiUserEntity> list = icResiUserDao.selectList(queryWrapper);
+        PageInfo pageInfo = new PageInfo<>(list);
+
         List<IcResiUserResultDTO> resultList = new ArrayList<>();
         for (IcResiUserEntity entity : list) {
             IcResiUserResultDTO resultDTO = new IcResiUserResultDTO();
             resultDTO.setIcResiUserId(entity.getId());
             resultDTO.setName(entity.getName());
             resultDTO.setMobile(entity.getMobile());
+            resultDTO.setHomeId(entity.getHomeId());
             resultList.add(resultDTO);
         }
-        return resultList;
+        pageInfo.setList(resultList);
+        return new PageData<>(resultList, pageInfo.getTotal(),pageSize);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -48,6 +48,7 @@ import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 import com.epmet.dataaggre.entity.govorg.CustomerStaffGridEntity;
+import com.epmet.dataaggre.entity.govorg.IcHouseEntity;
 import com.epmet.dataaggre.excel.GridLivelyDetailExcel;
 import com.epmet.dataaggre.excel.GridLivelyExcel;
 import com.epmet.dataaggre.service.commonservice.AreaCodeService;
@@ -1580,18 +1581,36 @@ public class GovOrgServiceImpl implements GovOrgService {
      * @return
      */
     public PageData<LingShanLianHuResiUserResultDTO> lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId) {
-        // 先查询关联的房屋id
+        IcHouseEntity partyHouseInfo=houseDao.selectById(partyCenterHouseId);
-        PageHelper.startPage(pageNo, pageSize);
         List<LingShanLianHuResiUserResultDTO> houseList = houseDao.selectListLianHuHouse(partyCenterHouseId);
         if (CollectionUtils.isEmpty(houseList)) {
             return new PageData<>();
         }
-        houseList.forEach(lianHuHouse -> {
+        List<String> houseIds = houseList.stream().map(o -> o.getHouseId()).collect(Collectors.toList());
-            List<IcResiUserResultDTO> resiList = epmetUserService.listIcResiUserByHouseId(lianHuHouse.getHouseId());
+        // 先查询关联的房屋id
-            lianHuHouse.setResiList(resiList);
+        PageData<IcResiUserResultDTO> resiPage = epmetUserService.listIcResiUserByHouseId(pageNo, pageSize, houseIds);
+        if (CollectionUtils.isEmpty(resiPage.getList())) {
+            return new PageData<>();
+        }
+        Map<String,LingShanLianHuResiUserResultDTO> lianHouseMap=houseList.stream().collect(Collectors.toMap(LingShanLianHuResiUserResultDTO :: getHouseId, v -> v, (v1, v2) -> v1));
+        List<LingShanLianHuResiUserResultDTO> resList=new ArrayList();
+        resiPage.getList().forEach(dto->{
+            LingShanLianHuResiUserResultDTO resultDTO=ConvertUtils.sourceToTarget(dto,LingShanLianHuResiUserResultDTO.class);
+
+            LingShanLianHuResiUserResultDTO houseInfo = lianHouseMap.get(dto.getHomeId());
+            resultDTO.setPartyCenterHouseId(houseInfo.getPartyCenterHouseId());
+            resultDTO.setNeighborHoodId(houseInfo.getNeighborHoodId());
+            resultDTO.setNeighborHoodName(houseInfo.getNeighborHoodName());
+            resultDTO.setBuildingId(houseInfo.getBuildingId());
+            resultDTO.setBuildingName(houseInfo.getBuildingName());
+            resultDTO.setBuildingUnitId(houseInfo.getBuildingUnitId());
+            resultDTO.setUnitName(houseInfo.getUnitName());
+            resultDTO.setDoorName(houseInfo.getDoorName());
+            resultDTO.setHouseId(houseInfo.getHouseId());
+            resultDTO.setPartyCenterHouseId(partyHouseInfo.getOwnerName());
+            resList.add(resultDTO);
         });
-        PageInfo<LingShanLianHuResiUserResultDTO> pageInfo = new PageInfo<>(houseList);
+        return new PageData<>(resList, resiPage.getTotal(),pageSize);
-        return new PageData<>(houseList, pageInfo.getTotal());
     }
 
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml

@@ -49,7 +49,8 @@
             ib.BUILDING_NAME,
             l.BUILDING_UNIT_ID,
             u.UNIT_NAME,
-            ih.DOOR_NAME
+            ih.DOOR_NAME,
+            ih.OWNER_NAME as ownerName
         FROM
             lingshan_party_center_house_lianhu l
                 INNER JOIN ic_house ih ON ( l.HOUSE_ID = ih.ID )

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

@@ -38,6 +38,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
      * 手机号
      */
     private String mobile;
+    private String realMobile;
 
     /**
      * 性别
@@ -48,6 +49,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
      * 身份证号
      */
     private String idCard;
+    private String realIdCard;
 
     /**
      * 出生日期

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

@@ -1742,6 +1742,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         r.setRhzk(resiEntity.getRhzk());
         r.setGzdw(resiEntity.getGzdw());
         // 因灵山项目添加一下几列 start
+        r.setRealIdCard(resiEntity.getIdCard());
+        r.setRealMobile(resiEntity.getMobile());
         r.setMz(resiEntity.getMz());
         Result<List<OptionResultDTO>> mzRes=epmetAdminOpenFeignClient.getNationOption();
         if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){