From 4444fcd6252468431d187e06793fbb4e97061f7b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 20 Feb 2021 13:29:55 +0800
Subject: [PATCH] add /data/report/screen/agency/addstreetcomm api v1

---
 .../java/com/epmet/dto/form/AddAreaCodeDictFormDTO.java  | 4 ++++
 .../java/com/epmet/service/impl/AreaCodeServiceImpl.java | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AddAreaCodeDictFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AddAreaCodeDictFormDTO.java
index 6730c0a920..d97379ec72 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AddAreaCodeDictFormDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AddAreaCodeDictFormDTO.java
@@ -25,4 +25,8 @@ public class AddAreaCodeDictFormDTO implements Serializable {
     @NotBlank(message = "name不能为空")
     private String name;
 
+    /**
+     * 传入此列时，代表修改名称
+     */
+    private String code;
 }
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
index 29c3d27b30..ce6bbb266f 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
@@ -569,6 +569,15 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      **/
     @Override
     public AddAreaCodeDictResultDTO addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) {
+        if (StringUtils.isNotBlank(formDTO.getCode())) {
+            AreaCodeChildDTO areaCodeChildDTO = childDao.selectByCode(formDTO.getCode().trim());
+            if (null == areaCodeChildDTO) {
+                throw new RenException("code不存在");
+            }
+            areaCodeChildDTO.setName(formDTO.getName().trim());
+            areaCodeChildService.update(areaCodeChildDTO);
+            return new AddAreaCodeDictResultDTO(areaCodeChildDTO.getCode());
+        }
         AreaCodeChildDTO parent = childDao.selectByCode(formDTO.getParentAreaCode().trim());
         if (null == parent) {
             throw new RenException("parentAreaCode不存在");