From 19651b73de0da44ac5fe7119ee1aaa7b9ce8adf7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 5 Feb 2021 09:58:39 +0800
Subject: [PATCH] =?UTF-8?q?customer=5Fagency=E8=A1=A8=E6=96=B0=E5=A2=9EPAR?=
 =?UTF-8?q?ENT=5FAREA=5FCODE=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java  | 4 ++++
 .../dataaggre/entity/govorg/CustomerAgencyEntity.java      | 4 ++++
 .../src/main/java/com/epmet/dto/CustomerAgencyDTO.java     | 7 ++++++-
 .../main/java/com/epmet/entity/CustomerAgencyEntity.java   | 7 ++++---
 .../V0.0.3__customer_agency_addparentareacode.sql          | 1 +
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.3__customer_agency_addparentareacode.sql

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java
index c3a6f3d697..4b98fb899f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java
@@ -128,4 +128,8 @@ public class CustomerAgencyDTO implements Serializable {
      */
     private String district;
 
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java
index 1f7dc21bea..79f226ca2f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java
@@ -94,4 +94,8 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String district;
 
+	/**
+	 * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+	 */
+	private String parentAreaCode;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java
index f7380580b4..ea30dbd600 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -127,4 +128,8 @@ public class CustomerAgencyDTO implements Serializable {
      */
     private String district;
 
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
index 6a669609eb..5306281a03 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 机关单位信息表
  *
@@ -97,4 +94,8 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String district;
 
+	/**
+	 * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+	 */
+	private String parentAreaCode;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.3__customer_agency_addparentareacode.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.3__customer_agency_addparentareacode.sql
new file mode 100644
index 0000000000..743c77ffba
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.3__customer_agency_addparentareacode.sql
@@ -0,0 +1 @@
+alter table customer_agency add column `PARENT_AREA_CODE` varchar(30) DEFAULT NULL COMMENT '当前组织的上级行政地区编码add0204;举例平阴县370124对应的是济南市3701';
\ No newline at end of file