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 BaseServiceImplCustomerStaffRedis.delStaffInfoFormCache(customerId,staff.getStaffId())); @@ -1026,7 +1026,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl staffList, List updateList) { + public void dealBizDataForAbandon(String customerId, String gridId, List staffList, List updateList) { //1.删除工作人员与网格的关系 LambdaQueryWrapper updateWrapper = new LambdaQueryWrapper<>(); updateWrapper.eq(CustomerStaffGridEntity::getGridId,gridId); @@ -1037,7 +1037,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl badgeResult = epmetUserFeignClient.deleteBadgeCertificateAuditing(customerId,gridId); @@ -1047,7 +1047,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl updateGrid=new LambdaUpdateWrapper<>(); - updateGrid.set(CustomerGridEntity::getAbandonFlag,true); + updateGrid.set(CustomerGridEntity::getAbandonFlag,NumConstant.ZERO); updateGrid.eq(CustomerGridEntity::getId,gridId); baseDao.update(null,updateGrid); }