From 2f3f773199c1acd56ae2f35051808364a5e3af66 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 21 Jun 2022 17:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B1=85=E6=B0=91=E7=9A=84pi?=
 =?UTF-8?q?ds=20pids=E4=B8=BAagencyId=E7=9A=84pids+agencyId=20=E5=8D=B3?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=BB=84=E7=BB=87=E6=9C=AC=E8=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/IcResiUserService.java  |  6 +++
 .../impl/IcBirthRecordServiceImpl.java        |  5 +++
 .../impl/IcMoveInRecordServiceImpl.java       |  4 ++
 .../impl/IcResiUserImportServiceImpl.java     |  8 +++-
 .../service/impl/IcResiUserServiceImpl.java   | 37 +++++++++++++++++--
 5 files changed, 56 insertions(+), 4 deletions(-)

diff --git 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
index 3ef76601bc..8548ca5b53 100644
--- 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
@@ -436,4 +436,10 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/6/16 15:30
      */
     List<String> getUserId(String icResiUserId);
+
+    /**
+     * desc:设置居民的pids pids为agencyId的pids+agencyId 即包含组织本身 如果pids 为空则pids 为agencyId
+     * @param entity
+     */
+    void setIcResiUserPids(IcResiUserEntity entity);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
index afb5f9bfd4..163d15c563 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
@@ -159,11 +159,13 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
                             } else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) {
                                 extracted(tokenDto, dto, staffInfo, sync, "change");
                                 //更新居民信息
+                                icResiUserService.setIcResiUserPids(userEntity);
                                 icResiUserDao.updateById(userEntity);
                             }
                         } else {
                             //房屋信息一致
                             //更新居民信息
+                            icResiUserService.setIcResiUserPids(userEntity);
                             icResiUserDao.updateById(userEntity);
                         }
                     } else {
@@ -171,6 +173,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
                         //迁入记录
                         extracted(tokenDto, dto, staffInfo, sync, "in");
                         //更新居民信息
+                        icResiUserService.setIcResiUserPids(userEntity);
                         icResiUserDao.updateById(userEntity);
                     }
                 } else {
@@ -178,10 +181,12 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
                     //迁入记录
                     extracted(tokenDto, dto, staffInfo, sync, "in");
                     //更新居民信息
+                    icResiUserService.setIcResiUserPids(userEntity);
                     icResiUserDao.updateById(userEntity);
                 }
             } else {
                 //添加居民信息
+                icResiUserService.setIcResiUserPids(userEntity);
                 icResiUserDao.insert(userEntity);
                 //迁入记录
                 sync.setIcResiUserId(userEntity.getId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
index dcfa02524d..02f9bbd2a6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
@@ -178,6 +178,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 change.setIcUserId(entity.getId());
                 //先加记录，再修改，否则找不到原房屋
                 icUserTransferRecordService.moveResi(change);
+                icResiUserService.setIcResiUserPids(entity);
                 icResiUserService.updateById(entity);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
                 //4-2.本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
@@ -186,6 +187,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 change.setIcUserId(entity.getId());
                 change.setOrigin("in");
                 icUserTransferRecordService.moveResi(change);
+                icResiUserService.setIcResiUserPids(entity);
                 icResiUserService.updateById(entity);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
                 //4-3.非本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
@@ -196,6 +198,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 change.setIcUserId(entity.getId());
                 change.setOrigin("in");
                 icUserTransferRecordService.moveResi(change);
+                icResiUserService.setIcResiUserPids(entity);
                 icResiUserService.updateById(entity);
             } else if (StringUtils.isBlank(resiDTO.getResiAgencyId())) {
                 //4-4.客户下不存在的居民(新数据)【新增居民信息，生成变更记录（新增）、不生成变更明细(因为十八类默认都是否)】
@@ -203,6 +206,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 entity.setPids(staffInfo.getAgencyPIds());
                 //迁入管理-新增的居民，存储03
                 entity.setSubStatus(IcResiUserSubStatusEnum.MOVE_IN.getSubStatus());
+                icResiUserService.setIcResiUserPids(entity);
                 icResiUserService.insert(entity);
                 change.setOrigin("add");
                 change.setIcUserId(entity.getId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 6901fd27b1..cbf86a9b38 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -515,7 +515,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 AgencyInfoCache agencyInfo = getAgencyInfo(gridId);
                 if (agencyInfo != null) {
                     columnAndValues.put("AGENCY_ID", agencyInfo.getId());
-                    columnAndValues.put("PIDS", agencyInfo.getPids());
+                    String agencyPath = agencyInfo.getPids();
+                    if (StringUtils.isBlank(agencyInfo.getPids())){
+                        agencyPath = agencyInfo.getId();
+                    }else if (!agencyPath.contains(agencyInfo.getId())){
+                        agencyPath = agencyInfo.getPids()+StrConstant.COLON +agencyInfo.getId();
+                    }
+                    columnAndValues.put("PIDS", agencyPath);
                 } else {
                     String msg = String.format("【居民信息导入】根据网格查询组织失败，网格ID:%s", gridId);
                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
diff --git 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
index a7d1183196..a7c8708bd5 100644
--- 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
@@ -21,6 +21,7 @@ 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.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.bean.ResiExportBaseInfoData;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
@@ -56,12 +57,12 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.*;
-import com.epmet.dto.result.demand.OptionDTO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -204,7 +205,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         //1.先往主表新增数据
         //主表Id
-        String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");
+        String resiUserId = IdWorker.getIdStr();
         String name = "";
         LinkedHashMap<String, String> map = new LinkedHashMap<>();
         com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO();
@@ -231,6 +232,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (!map.containsKey("AGENCY_ID")) {
                     throw new RenException("新增居民信息--入参AGENCY_ID为空");
                 }
+                if (!map.containsKey(UserConstant.GRID_ID)) {
+                    throw new RenException("新增居民信息--入参GRID_ID为空");
+                }
                 //2021.11.25 新增需求 客户下身份证号唯一  start
                 if (map.containsKey("ID_CARD")) {
                     IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(map.get("ID_CARD"), tokenDto.getCustomerId());
@@ -257,7 +261,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 String agencyId = map.get("AGENCY_ID");
                 Result<CustomerAgencyDTO> result = govOrgOpenFeignClient.getAgencyById(agencyId);
                 if (result.success() && null != result.getData()) {
-                    map.put("pids", result.getData().getPids());
+                    //pids拼上 agencyId
+                    String pids = result.getData().getPids();
+                    if (StringUtils.isBlank(pids)) {
+                        pids = agencyId;
+                    } else  if (!pids.contains(agencyId)){
+                        pids = pids + StrConstant.COLON + agencyId;
+                    }
+                    map.put("pids", pids);
                 } else {
                     throw new RenException(String.format("新增居民信息-根据agencyId查询组织信息失败，agencyId->%s", agencyId));
                 }
@@ -1999,6 +2010,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
             entity.setIsTenant(NumConstant.ONE_STR);
             entity.setIsFloating(NumConstant.ONE_STR);
+            //pids 改为 拼接上自身
+            this.setIcResiUserPids(entity);
             insert(entity);
             resiUserId = entity.getId();
             // 变更记录表和变更记录明细表新增数据
@@ -2350,6 +2363,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         dto.setHomeId(user.getHomeId());
 
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        this.setIcResiUserPids(entity);
         insert(entity);
 
         return new Result().ok("新增成功");
@@ -2381,6 +2395,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
 
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        this.setIcResiUserPids(entity);
         entity.setId(dto.getIcResiUserId());
         updateById(entity);
         return new Result().ok("修改成功");
@@ -2427,6 +2442,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
 
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        this.setIcResiUserPids(entity);
         insert(entity);
 
         return new Result().ok("新增成功");
@@ -2631,4 +2647,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public List<String> getAllUserIds(String idCard, String customerId) {
         return baseDao.getAllUserIds(idCard, customerId);
     }
+
+    /**
+     * desc:设置居民的pids pids为agencyId的pids+agencyId 即包含组织本身 如果pids 为空则pids 为agencyId
+     * @param entity
+     */
+    @Override
+    public void setIcResiUserPids(IcResiUserEntity entity) {
+        String agencyPath = entity.getPids();
+        if (StringUtils.isBlank(agencyPath)) {
+            agencyPath = entity.getAgencyId();
+        } else if (!agencyPath.contains(entity.getAgencyId())) {
+            agencyPath = agencyPath + StrConstant.COLON + entity.getAgencyId();
+        }
+        entity.setPids(agencyPath);
+    }
 }