From cfce2fd8846fb8b7cc7de430643d7eb813ab23ad Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 17 Mar 2022 14:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83=E5=AD=97=E6=AE=B5=20integer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/CustomerGridDTO.java      | 2 +-
 .../main/java/com/epmet/entity/CustomerGridEntity.java    | 2 +-
 .../com/epmet/service/impl/CustomerGridServiceImpl.java   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
index 78fecfca6d..0acd914fa6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
@@ -154,5 +154,5 @@ public class CustomerGridDTO implements Serializable {
     /**
      * 弃用：1；正常使用：0
      */
-    private Boolean abandonFlag;
+    private Integer abandonFlag;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
index 379d916654..70f73c89da 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
@@ -113,5 +113,5 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	/**
 	 * 弃用：1；正常使用：0
 	 */
-	private Boolean abandonFlag;
+	private Integer abandonFlag;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 3b9e0be490..bd30ca06ac 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -1015,7 +1015,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             });
             //更新工作人员组织关系
             String customerId = staffList.get(NumConstant.ZERO).getCustomerId();
-            updateGridStaff2Agency(customerId,gridId, staffList, updateList);
+            dealBizDataForAbandon(customerId,gridId, staffList, updateList);
             //清空工作人员缓存
             staffList.forEach(staff->CustomerStaffRedis.delStaffInfoFormCache(customerId,staff.getStaffId()));
 
@@ -1026,7 +1026,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     }
     @Transactional
-    public void updateGridStaff2Agency(String customerId, String gridId, List<StaffOrgRelationDTO> staffList, List<StaffOrgRelationEntity> updateList) {
+    public void dealBizDataForAbandon(String customerId, String gridId, List<StaffOrgRelationDTO> staffList, List<StaffOrgRelationEntity> updateList) {
         //1.删除工作人员与网格的关系
         LambdaQueryWrapper<CustomerStaffGridEntity> updateWrapper = new LambdaQueryWrapper<>();
         updateWrapper.eq(CustomerStaffGridEntity::getGridId,gridId);
@@ -1037,7 +1037,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         });
         //网格对应的人数减少
         long reduceCount = NumConstant.ZERO - staffList.stream().map(StaffOrgRelationDTO::getStaffId).distinct().count();
-        log.debug("updateGridStaff2Agency gridId:{} reduceCount:{}",gridId, reduceCount);
+        log.debug("dealBizDataForAbandon gridId:{} reduceCount:{}",gridId, reduceCount);
         customerGridDao.updateTotalUser(gridId, reduceCount);
         //删除正在审核中的徽章认证
         Result<Integer> badgeResult = epmetUserFeignClient.deleteBadgeCertificateAuditing(customerId,gridId);
@@ -1047,7 +1047,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
         //处理成功，隐藏网格
         LambdaUpdateWrapper<CustomerGridEntity> updateGrid=new LambdaUpdateWrapper<>();
-        updateGrid.set(CustomerGridEntity::getAbandonFlag,true);
+        updateGrid.set(CustomerGridEntity::getAbandonFlag,NumConstant.ZERO);
         updateGrid.eq(CustomerGridEntity::getId,gridId);
         baseDao.update(null,updateGrid);
     }