diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java
new file mode 100644
index 0000000000..3eaaf991df
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 组织信息
+ *
+ * @author sun
+ */
+@Data
+public class AgencyAreaResultDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 客户名称
+ */
+ private String customerName;
+
+ /**
+ * 上级组织机构ID
+ */
+ private String pid;
+
+ /**
+ * 所有上级组织机构ID(以英文:隔开)
+ */
+ private String pids;
+
+ /**
+ * 所有上级名称,以-连接
+ */
+ private String allParentName;
+
+ /**
+ * 组织名称
+ */
+ private String organizationName;
+
+ /**
+ * 机关级别(社区级:community,
+ 乡(镇、街道)级:street,
+ 区县级: district,
+ 市级: city
+ 省级:province) 机关级别(社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province)
+ */
+ private String level;
+
+ /**
+ * 地区编码
+ */
+ private String areaCode;
+
+ /**
+ * 总人数
+ */
+ private Integer totalUser;
+
+ /**
+ * 省
+ */
+ private String province;
+
+ /**
+ * 【城市】名称
+ */
+ private String city;
+
+ /**
+ * 【区县】名称
+ */
+ private String district;
+
+ /**
+ * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+ */
+ private String parentAreaCode;
+
+ /**
+ * 街道
+ */
+ private String street;
+
+ /**
+ * 【社区】名称0409
+ */
+ private String community;
+
+ /**
+ * 组织编码
+ */
+ private String code;
+
+ /**
+ * 负责人姓名
+ */
+ private String contacts;
+
+ /**
+ * 联系电话
+ */
+ private String mobile;
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
index 3a8ff71dfc..a7aec4fa28 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
@@ -47,6 +47,5 @@ public class AgencyResultDTO implements Serializable {
private String longitude;
//维度【没值则取跟客户的值】
private String latitude;
- //地区编码
- private String areaCode;
+
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index ce081bb714..03a803a9b8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -510,14 +510,14 @@ public class AgencyController {
* 获取区域编码下级的所有客户信息
*
* @param areaCode
- * @return com.epmet.commons.tools.utils.Result>
+ * @return com.epmet.commons.tools.utils.Result>
* @author zhy
* @date 2022/7/7 10:12
*/
@GetMapping("/areasubagency/{areaCode}")
- public Result> getAreaSubAgency(@LoginUser TokenDto tokenDto, @PathVariable String areaCode) {
- List dto = agencyService.getAreaSubAgency(tokenDto, areaCode);
- return new Result>().ok(dto);
+ public Result> getAreaSubAgency(@LoginUser TokenDto tokenDto, @PathVariable String areaCode) {
+ List dto = agencyService.getAreaSubAgency(tokenDto, areaCode);
+ return new Result>().ok(dto);
}
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 9c0d58e102..ee3915ffa2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -358,11 +358,11 @@ public interface CustomerAgencyDao extends BaseDao {
* 获取区域编码下级的所有客户信息
*
* @param areaCode
- * @return com.epmet.commons.tools.utils.Result>
+ * @return com.epmet.commons.tools.utils.Result>
* @author zhy
* @date 2022/7/7 10:12
*/
- List getAreaSubAgency(@Param("areaCode") String areaCode);
+ List getAreaSubAgency(@Param("areaCode") String areaCode);
CustomerAgencyEntity getAreaRootAgency(@Param("customerId") String customerId);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index 7843ed299a..40c0d4ef61 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -183,10 +183,10 @@ public interface AgencyService {
* 获取区域编码下级的所有客户信息
*
* @param areaCode
- * @return com.epmet.commons.tools.utils.Result>
+ * @return com.epmet.commons.tools.utils.Result>
* @author zhy
* @date 2022/7/7 10:12
*/
- List getAreaSubAgency(TokenDto tokenDto, String areaCode);
+ List getAreaSubAgency(TokenDto tokenDto, String areaCode);
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index cb8652d4dc..29d62f96e5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -43,6 +43,7 @@ import com.epmet.dao.CustomerDepartmentDao;
import com.epmet.dao.CustomerGridDao;
import com.epmet.dao.IcBuildingDao;
import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDTO;
import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
@@ -50,8 +51,8 @@ import com.epmet.entity.CustomerAgencyEntity;
import com.epmet.entity.CustomerDepartmentEntity;
import com.epmet.entity.CustomerGridEntity;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.CustomerAgencyRedis;
import com.epmet.service.AgencyService;
import com.epmet.service.CustomerAgencyService;
@@ -99,7 +100,7 @@ public class AgencyServiceImpl implements AgencyService {
@Autowired
private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
@Autowired
- private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+ private OperCrmFeignClient operCrmFeignClient;
@Autowired
private IcBuildingDao icBuildingDao;
@Autowired
@@ -903,12 +904,23 @@ public class AgencyServiceImpl implements AgencyService {
}
@Override
- public List getAreaSubAgency(TokenDto tokenDto, String areaCode) {
+ public List getAreaSubAgency(TokenDto tokenDto, String areaCode) {
if (NumConstant.ZERO_STR.equals(areaCode)) {
CustomerAgencyEntity root = customerAgencyDao.getAreaRootAgency(tokenDto.getCustomerId());
areaCode = root.getAreaCode();
}
- return customerAgencyDao.getAreaSubAgency(areaCode);
+
+ List list = customerAgencyDao.getAreaSubAgency(areaCode);
+ list.forEach(item -> {
+ CustomerDTO customerDTO = new CustomerDTO();
+ customerDTO.setId(item.getCustomerId());
+ Result customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
+ if (customerResult.success() && null != customerResult.getData()) {
+ item.setCustomerName(customerResult.getData().getCustomerName());
+ }
+ });
+
+ return list;
}
private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 7d53a55fe3..4ff4afb921 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -930,10 +930,8 @@
limit 1
-
+
SELECT
- ac.ID AS agencyId,
- ac.ORGANIZATION_NAME AS agencyName,
ac.*
FROM
customer_agency ac