From 9a2b5aec1bcc8fa12ddd2dff61400d481ebc71f1 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 13 Jan 2021 14:05:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 3 ++- .../esua/epdc/commons/tools/constant/EpmetConstant.java | 8 ++++++-- .../com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 9da8936b..2c75e71b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -926,7 +926,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO); if(deptCodeResult.getData()!=null){ DeptCodeOption deptCodeOption = deptCodeResult.getData(); diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java index a0372101..33a4519d 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java @@ -175,9 +175,13 @@ public interface EpmetConstant { /** - * 行政地区编码查询 - 锦水街道 + * 行政地区编码查询 - 平阴县 */ - String DEPT_CODE_KCZ = "370124"; + String DEPT_CODE_PY = "370124"; + /** + * 行政地区编码查询 - 省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community + */ + String DEPT_CODE_LEVEL_PY = "district"; /** diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java index 351ec1ec..aaaa9204 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java @@ -17,6 +17,11 @@ public class DeptCodeFormDTO implements Serializable { */ private String rootAreaCode; + /** + * 部门区域级别 + */ + private String rootAreaLevel; + } From 6096432f21530e7acd1f062cb4bb6b414e771af1 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 13 Jan 2021 14:31:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=B7=A1?= =?UTF-8?q?=E6=A3=80bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ModuleCategoryDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml index 09cb807a..82cb89f6 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml @@ -72,8 +72,8 @@ select CONCAT(PIDS,',',ID) from epdc_module_category - where CATEGORY_CODE = #{noticeCategoryCode} - + where CATEGORY_CODE = #{noticeCategoryCode} and DEL_FLAG = '0' limit 1 +