From 017bf883dc1f0cdc2a02896a2414097f3c1478d7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 14 Apr 2021 18:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87V2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/AddAgencyV2FormDTO.java    | 52 ++++++++++---------
 .../epmet/service/impl/AgencyServiceImpl.java | 16 +++++-
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
index c426bc6d41..e5b775c067 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
@@ -59,28 +59,32 @@ public class AddAgencyV2FormDTO implements Serializable {
     @NotBlank(message = "请选择组织区划", groups = AreaCodeGroup.class)
     private String areaCode;
 
-    /**
-     * 省份
-     */
-    private String province;
-
-    /**
-     * 城市
-     */
-    private String city;
-
-    /**
-     * 区县
-     */
-    private String district;
-
-    /**
-     * 街道
-     */
-    private String street;
-
-    /**
-     * 社区
-     */
-    private String community;
+    // /**
+    //  * 省份
+    //  */
+    // private String province;
+    //
+    // /**
+    //  * 城市
+    //  */
+    // private String city;
+    //
+    // /**
+    //  * 区县
+    //  */
+    // private String district;
+    //
+    // /**
+    //  * 街道
+    //  */
+    // private String street;
+    //
+    // /**
+    //  * 社区
+    //  */
+    // private String community;
+
+    //区域编码名称
+    @NotBlank(message = "请选择组织区划", groups = AreaCodeGroup.class)
+    private String areaName;
 }
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 2a5bcbb838..6202cc038c 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
@@ -459,7 +459,7 @@ public class AgencyServiceImpl implements AgencyService {
         customerAgencyDao.insert(insertEntity);
         //3:返回新组织Id
         resultDTO.setAgencyId(insertEntity.getId());
-        resultDTO.setAreaCode(StrConstant.EPMETY_STR);
+        resultDTO.setAreaCode(insertEntity.getAreaCode());
         return resultDTO;
     }
 
@@ -482,15 +482,29 @@ public class AgencyServiceImpl implements AgencyService {
         {
             case CustomerAgencyConstant.PROVINCE_LEVEL:
                 insertEntity.setLevel(CustomerAgencyConstant.CITY_LEVEL);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(formDTO.getAreaName());
                 break;
             case CustomerAgencyConstant.CITY_LEVEL:
                 insertEntity.setLevel(CustomerAgencyConstant.DISTRICT);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(parent.getCity());
+                insertEntity.setDistrict(formDTO.getAreaName());
                 break;
             case CustomerAgencyConstant.DISTRICT:
                 insertEntity.setLevel(CustomerAgencyConstant.STREET_LEVEL);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(parent.getCity());
+                insertEntity.setDistrict(parent.getDistrict());
+                insertEntity.setStreet(formDTO.getAreaName());
                 break;
             case CustomerAgencyConstant.STREET_LEVEL:
                 insertEntity.setLevel(CustomerAgencyConstant.COMMUNITY_LEVEL);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(parent.getCity());
+                insertEntity.setDistrict(parent.getDistrict());
+                insertEntity.setStreet(parent.getStreet());
+                insertEntity.setCommunity(formDTO.getAreaName());
                 break;
             default:
                 log.info("parent.getLevel()="+parent.getLevel());