agencydetail 新增返参areaName

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java

@@ -91,4 +91,9 @@ public class AgencysResultDTO implements Serializable {
      * open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参
      */
     private String areaCodeSwitch;
+
+    /**
+     * 组织区划的名称
+     */
+    private String areaName;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java

@@ -26,6 +26,15 @@ public interface CustomerAgencyConstant {
 	 * 机关级别-市级
 	 */
 	String CITY_LEVEL = "city";
+
+	// 社区级：community，
+	String COMMUNITY_LEVEL="community";
+
+	// 乡（镇、街道）级:street,
+	String STREET_LEVEL="street";
+
+	// 区县级: district,
+	String DISTRICT="district";
 	/**
 	 * 市级名称不能为空
 	 */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -243,6 +244,28 @@ public class AgencyServiceImpl implements AgencyService {
         parentList = customerAgencyDao.selectPAgencyById(listStr);
         agencysResultDTO.setParentList(parentList);
         agencysResultDTO.setAreaCodeSwitch(customerOrgParameterService.getAreaCodeSwitch(entity.getCustomerId()));
+        //查询组织区划的名称
+        if (null != entity && StringUtils.isNotBlank(entity.getAreaCode())) {
+            switch (entity.getLevel()) {
+                case CustomerAgencyConstant.PROVINCE_LEVEL:
+                    agencysResultDTO.setAgencyName(entity.getProvince());
+                    break;
+                case CustomerAgencyConstant.CITY_LEVEL:
+                    agencysResultDTO.setAgencyName(entity.getCity());
+                    break;
+                case CustomerAgencyConstant.DISTRICT:
+                    agencysResultDTO.setAgencyName(entity.getDistrict());
+                    break;
+                case CustomerAgencyConstant.STREET_LEVEL:
+                    agencysResultDTO.setAgencyName(entity.getStreet());
+                    break;
+                case CustomerAgencyConstant.COMMUNITY_LEVEL:
+                    agencysResultDTO.setAgencyName(entity.getCommunity());
+                    break;
+                default:
+                    agencysResultDTO.setAgencyName(StrConstant.EPMETY_STR);
+            }
+        }
         return new Result<AgencysResultDTO>().ok(agencysResultDTO);
     }