From e54149303efbc4cf040dc977791cd5484370dbb1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 Jan 2022 16:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8F=98=E6=9B=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerAgencyServiceImpl.java       |  8 +--
 .../service/impl/IcResiUserServiceImpl.java   | 37 +++++-----
 .../impl/IcUserTransferRecordServiceImpl.java | 71 ++++++++++---------
 3 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 372aafa390..7403df24f9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1387,10 +1387,10 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         IcResiUserOrgMsgResultDTO resultDTO = new IcResiUserOrgMsgResultDTO();
         CustomerAgencyDTO agencyDTO = ConvertUtils.sourceToTarget(baseDao.selectById(formDTO.getAgencyId()), CustomerAgencyDTO.class);
         CustomerGridDTO gridDTO = ConvertUtils.sourceToTarget(customerGridDao.selectById(formDTO.getGridId()), CustomerGridDTO.class);
-        IcNeighborHoodDTO neighborHoodDTO = ConvertUtils.sourceToTarget(icNeighborHoodDao.selectById(formDTO.getGridId()), IcNeighborHoodDTO.class);
-        IcBuildingDTO buildingDTO = ConvertUtils.sourceToTarget(icBuildingDao.selectById(formDTO.getGridId()), IcBuildingDTO.class);
-        IcBuildingUnitDTO buildingUnitDTO = ConvertUtils.sourceToTarget(icBuildingUnitDao.selectById(formDTO.getGridId()), IcBuildingUnitDTO.class);
-        IcHouseDTO houseDTO = ConvertUtils.sourceToTarget(icHouseDao.selectById(formDTO.getGridId()), IcHouseDTO.class);
+        IcNeighborHoodDTO neighborHoodDTO = ConvertUtils.sourceToTarget(icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()), IcNeighborHoodDTO.class);
+        IcBuildingDTO buildingDTO = ConvertUtils.sourceToTarget(icBuildingDao.selectById(formDTO.getBuildingId()), IcBuildingDTO.class);
+        IcBuildingUnitDTO buildingUnitDTO = ConvertUtils.sourceToTarget(icBuildingUnitDao.selectById(formDTO.getBuildingUnitId()), IcBuildingUnitDTO.class);
+        IcHouseDTO houseDTO = ConvertUtils.sourceToTarget(icHouseDao.selectById(formDTO.getHouseId()), IcHouseDTO.class);
         resultDTO.setAgencyDTO(agencyDTO);
         resultDTO.setGridDTO(gridDTO);
         resultDTO.setNeighborHoodDTO(neighborHoodDTO);
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 4e02d02cea..988a5c6eb0 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
@@ -354,7 +354,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @Description 居民信息修改--生成变更记录和变更明细
      **/
     private void icUserChangeRecord(TokenDto tokenDto, IcResiUserEntity entity, LinkedHashMap<String, String> map) {
-        Date date = (Date) new java.util.Date();
+        java.util.Date date = new java.util.Date();
         //1.判断维度数据是否修改【网格、小区、楼栋、单元、房间有变化则先走人员调动逻辑】
         if ((map.containsKey("GRID_ID") && !entity.getGridId().equals(map.get("GRID_ID"))) || (map.containsKey("VILLAGE_ID") && !entity.getVillageId().equals(map.get("VILLAGE_ID")))
                 || (map.containsKey("BUILD_ID") && !entity.getBuildId().equals(map.get("BUILD_ID"))) || (map.containsKey("UNIT_ID") && !entity.getUnitId().equals(map.get("UNIT_ID")))
@@ -413,22 +413,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 list.add(categoryEntity);
             }
         }
-        //变更记录
-        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-        changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
-        changeRecordEntity.setOperatorId(tokenDto.getUserId());
-        changeRecordEntity.setIcUserId(entity.getId());
-        changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
-        changeRecordEntity.setIcUserName(map.containsKey("NAME") ? map.get("NAME") : entity.getName());
-        changeRecordEntity.setType("category");
-        changeRecordEntity.setTypeName("类别");
-        changeRecordEntity.setBeforeChangeName(beforeChangeName.toString());
-        changeRecordEntity.setAfterChangeName(afterChangeName.toString());
-        changeRecordEntity.setChangeTime(date);
-        icUserChangeRecordService.insert(changeRecordEntity);
-
-        list.forEach(l -> l.setIcUserChangeRecordId(changeRecordEntity.getId()));
-        icUserChangeDetailedService.insertBatch(list);
+        //居民信息修改中有类别修改的才会生成变更记录和变更明细
+        if (list.size() > NumConstant.ZERO) {
+            //变更记录
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
+            changeRecordEntity.setOperatorId(tokenDto.getUserId());
+            changeRecordEntity.setIcUserId(entity.getId());
+            changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
+            changeRecordEntity.setIcUserName(map.containsKey("NAME") ? map.get("NAME") : entity.getName());
+            changeRecordEntity.setType("category");
+            changeRecordEntity.setTypeName("类别");
+            changeRecordEntity.setBeforeChangeName(beforeChangeName.toString());
+            changeRecordEntity.setAfterChangeName(afterChangeName.toString());
+            changeRecordEntity.setChangeTime(date);
+            icUserChangeRecordService.insert(changeRecordEntity);
+
+            list.forEach(l -> l.setIcUserChangeRecordId(changeRecordEntity.getId()));
+            icUserChangeDetailedService.insertBatch(list);
+        }
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index e2616d2842..1d994dd30c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -98,22 +98,24 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         }
 
         //3.查询人员调动后的组织、网格、小区、楼栋、单元、房屋信息
-        IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO();
-        orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId());
-        orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId());
-        orgMsgFormDTO2.setGridId(formDTO.getNewGridId());
-        orgMsgFormDTO2.setNeighborHoodId(formDTO.getNewNeighborHoodId());
-        orgMsgFormDTO2.setBuildingId(formDTO.getNewBuildingId());
-        orgMsgFormDTO2.setBuildingUnitId(formDTO.getNewBuildingUnitId());
-        orgMsgFormDTO2.setHouseId(formDTO.getNewHouseId());
-        Result<IcResiUserOrgMsgResultDTO> result2 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO2);
-        if (!result2.success() || null == result2.getData().getAgencyDTO() || null == result2.getData().getGridDTO() || null == result2.getData().getNeighborHoodDTO()
-                || null == result2.getData().getBuildingDTO() || null == result2.getData().getBuildingUnitDTO() || null == result2.getData().getHouseDTO()) {
-            log.warn("查找被调动人调动后的组织、网格、小区、楼栋、单元、房屋信息失败");
-            throw new RenException("9000", "获取被调动人基础信息失败");
+        Result<IcResiUserOrgMsgResultDTO> result2 = new Result<>();
+        if("in".equals(formDTO.getType())){
+            IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO();
+            orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId());
+            orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId());
+            orgMsgFormDTO2.setGridId(formDTO.getNewGridId());
+            orgMsgFormDTO2.setNeighborHoodId(formDTO.getNewNeighborHoodId());
+            orgMsgFormDTO2.setBuildingId(formDTO.getNewBuildingId());
+            orgMsgFormDTO2.setBuildingUnitId(formDTO.getNewBuildingUnitId());
+            orgMsgFormDTO2.setHouseId(formDTO.getNewHouseId());
+            result2 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO2);
+            if (!result2.success() || null == result2.getData().getAgencyDTO() || null == result2.getData().getGridDTO() || null == result2.getData().getNeighborHoodDTO()
+                    || null == result2.getData().getBuildingDTO() || null == result2.getData().getBuildingUnitDTO() || null == result2.getData().getHouseDTO()) {
+                log.warn("查找被调动人调动后的组织、网格、小区、楼栋、单元、房屋信息失败");
+                throw new RenException("9000", "获取被调动人基础信息失败");
+            }
         }
 
-
         //4.修改被调动人所属各维度信息或人员状态信息
         if (formDTO.getIdEdit()) {
             IcResiUserEntity userEntity = new IcResiUserEntity();
@@ -156,10 +158,12 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                 .append(result1.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result1.getData().getBuildingDTO().getBuildingName()).append("-")
                 .append(result1.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result1.getData().getHouseDTO().getHouseName());
         changeRecordEntity.setBeforeChangeName(beforeName.toString());
-        StringBuffer afterName = new StringBuffer();
-        afterName.append(result2.getData().getAgencyDTO().getOrganizationName()).append("-").append(result2.getData().getGridDTO().getGridName()).append("-")
-                .append(result2.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result2.getData().getBuildingDTO().getBuildingName()).append("-")
-                .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getHouseName());
+        StringBuffer afterName = new StringBuffer("-");
+        if ("in".equals(formDTO.getType())) {
+            afterName.append(result2.getData().getAgencyDTO().getOrganizationName()).append("-").append(result2.getData().getGridDTO().getGridName()).append("-")
+                    .append(result2.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result2.getData().getBuildingDTO().getBuildingName()).append("-")
+                    .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getHouseName());
+        }
         changeRecordEntity.setAfterChangeName(afterName.toString());
         changeRecordEntity.setChangeTime(formDTO.getTransferTime());
         changeRecordEntity.setRemark(formDTO.getRemark());
@@ -186,35 +190,36 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         recordEntity.setIcUserName(resiUserDTO.getName());
         recordEntity.setOperatorName(null == staffInfoCache ? "" : staffInfoCache.getRealName());
         recordEntity.setOldCustomerId(formDTO.getCustomerId());
-        if ("in".equals(formDTO.getType())) {
-            recordEntity.setNewCustomerId(resiUserDTO.getCustomerId());
-        }
         recordEntity.setOldAgencyId(resiUserDTO.getAgencyId());
-        recordEntity.setNewAgencyId(formDTO.getNewAgencyId());
         recordEntity.setOldAgencyName(result1.getAgencyDTO().getOrganizationName());
-        recordEntity.setNewAgencyName(result2.getAgencyDTO().getOrganizationName());
         recordEntity.setOldGridId(resiUserDTO.getGridId());
-        recordEntity.setNewGridId(formDTO.getNewGridId());
         recordEntity.setOldGridName(result1.getGridDTO().getGridName());
-        recordEntity.setNewGridName(result2.getGridDTO().getGridName());
         recordEntity.setOldNeighborHoodId(resiUserDTO.getVillageId());
-        recordEntity.setNewNeighborHoodId(formDTO.getNewNeighborHoodId());
         recordEntity.setOldNeighborHoodName(result1.getNeighborHoodDTO().getNeighborHoodName());
-        recordEntity.setNewNeighborHoodName(result2.getNeighborHoodDTO().getNeighborHoodName());
         recordEntity.setOldBuildingId(resiUserDTO.getBuildId());
-        recordEntity.setNewBuildingId(formDTO.getNewBuildingId());
         recordEntity.setOldBuildingName(result1.getBuildingDTO().getBuildingName());
-        recordEntity.setNewBuildingName(result2.getBuildingDTO().getBuildingName());
         recordEntity.setOldBuildingUnitId(resiUserDTO.getUnitId());
-        recordEntity.setNewBuildingUnitId(formDTO.getNewBuildingUnitId());
         recordEntity.setOldBuildingUnitName(result1.getBuildingUnitDTO().getUnitName());
-        recordEntity.setNewBuildingUnitName(result2.getBuildingUnitDTO().getUnitName());
         recordEntity.setOldHouseId(resiUserDTO.getHomeId());
-        recordEntity.setNewHouseId(formDTO.getNewHouseId());
         recordEntity.setOldHouseName(result1.getHouseDTO().getHouseName());
-        recordEntity.setNewHouseName(result2.getHouseDTO().getHouseName());
         recordEntity.setTransferTime(formDTO.getTransferTime());
         recordEntity.setRemark(formDTO.getRemark());
+        if ("in".equals(formDTO.getType())) {
+            recordEntity.setNewCustomerId(resiUserDTO.getCustomerId());
+            recordEntity.setNewAgencyId(formDTO.getNewAgencyId());
+            recordEntity.setNewAgencyName(result2.getAgencyDTO().getOrganizationName());
+            recordEntity.setNewGridId(formDTO.getNewGridId());
+            recordEntity.setNewGridName(result2.getGridDTO().getGridName());
+            recordEntity.setNewNeighborHoodId(formDTO.getNewNeighborHoodId());
+            recordEntity.setNewNeighborHoodName(result2.getNeighborHoodDTO().getNeighborHoodName());
+            recordEntity.setNewBuildingId(formDTO.getNewBuildingId());
+            recordEntity.setNewBuildingName(result2.getBuildingDTO().getBuildingName());
+            recordEntity.setNewBuildingUnitId(formDTO.getNewBuildingUnitId());
+            recordEntity.setNewBuildingUnitName(result2.getBuildingUnitDTO().getUnitName());
+            recordEntity.setNewHouseId(formDTO.getNewHouseId());
+            recordEntity.setNewHouseName(result2.getHouseDTO().getHouseName());
+        }
+
         return recordEntity;
     }