diff --git a/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java b/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java index 55b5463..6480720 100644 --- a/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java +++ b/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java @@ -14,6 +14,8 @@ public class CompanyStoreDO { /** * 零售公司 */ + private String orgId; + private String companyName; /** diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java index 65ebf32..fb7c971 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -464,6 +464,10 @@ public class RetailCompanyService { List list1 = new ArrayList<>(); list.stream().parallel().forEach(li -> { + QueryWrapper wrapperx = new QueryWrapper<>(); + wrapperx.eq("id",li.getOrgId()).eq("level",2).last("limit 1"); + PrivilageOrganizational privilageOrganizational = retailCompanyMapper.selectOne(wrapperx); + StoreOrganizationalVO storeOrganizationalVO = new StoreOrganizationalVO(); long count = 0; //查询所有的客户 @@ -487,7 +491,7 @@ public class RetailCompanyService { storeOrganizationalVO.setAllCustomer((int) count); storeOrganizationalVO.setEffectiveCustomer((int) countAble); storeOrganizationalVO.setDelCustomer((int) allAge); - storeOrganizationalVO.setCompanyName(li.getCompanyName()); + storeOrganizationalVO.setCompanyName(privilageOrganizational.getName()); storeOrganizationalVO.setDelRate(check(allAge, count)); list1.add(storeOrganizationalVO); }); diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml index a21103e..629c4ba 100644 --- a/src/main/resources/mapper/PoiStoreDOMapper.xml +++ b/src/main/resources/mapper/PoiStoreDOMapper.xml @@ -16,13 +16,15 @@ where t1.id = #{shopId} - select t3.entity_id as shopId,t1.name as companyName + select t3.entity_id as shopId,t1.parent_id as orgId from privilage_organizational t1, privilage_organizational_domain t2, privilage_domain_entity t3