From d53b46c3236f5b611fb29d1491a831c5204479ee Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 21 Dec 2021 10:59:02 +0800 Subject: [PATCH] null --- .../dataaggre/dto/govorg/CustomerAgencyDTO.java | 2 +- .../dto/govorg/CustomerDepartmentDTO.java | 2 +- .../dataaggre/dto/govorg/CustomerGridDTO.java | 2 +- .../entity/govorg/CustomerAgencyEntity.java | 2 +- .../entity/govorg/CustomerDepartmentEntity.java | 2 +- .../entity/govorg/CustomerGridEntity.java | 2 +- .../main/java/com/epmet/dto/CustomerAgencyDTO.java | 2 +- .../java/com/epmet/dto/CustomerDepartmentDTO.java | 2 +- .../main/java/com/epmet/dto/CustomerGridDTO.java | 2 +- .../com/epmet/entity/CustomerAgencyEntity.java | 2 +- .../com/epmet/entity/CustomerDepartmentEntity.java | 3 ++- .../java/com/epmet/entity/CustomerGridEntity.java | 2 +- .../resources/db/migration/V0.0.9__alter_org.sql | 14 ++++++++++++++ 13 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.9__alter_org.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 ec3278cf30..70c25c839c 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 @@ -166,7 +166,7 @@ public class CustomerAgencyDTO implements Serializable { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerDepartmentDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerDepartmentDTO.java index d7d582819f..096e24acad 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerDepartmentDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerDepartmentDTO.java @@ -102,7 +102,7 @@ public class CustomerDepartmentDTO implements Serializable { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java index 010ef74978..cacdf2e849 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java @@ -147,7 +147,7 @@ public class CustomerGridDTO implements Serializable { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 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 a21b627eba..171e01198f 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 @@ -117,7 +117,7 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerDepartmentEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerDepartmentEntity.java index cde4e82e51..dc9e882e05 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerDepartmentEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerDepartmentEntity.java @@ -73,7 +73,7 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerGridEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerGridEntity.java index fbed41d129..c58ce50893 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerGridEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerGridEntity.java @@ -93,7 +93,7 @@ public class CustomerGridEntity extends BaseEpmetEntity { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 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 71cd074164..9e378778e5 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 @@ -166,7 +166,7 @@ public class CustomerAgencyDTO implements Serializable { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java index c9d5ecb757..9381a609d0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java @@ -102,7 +102,7 @@ public class CustomerDepartmentDTO implements Serializable { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java index 3cb395847c..a3600b2e0e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java @@ -140,7 +140,7 @@ public class CustomerGridDTO implements Serializable { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 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 98b1f83d68..cde41fbecc 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 @@ -132,7 +132,7 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java index c3ee0a8033..bfce4de96f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java @@ -69,10 +69,11 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity { * 组织编码 */ private String code; + /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java index c87e4456fb..49fe1b4bdb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java @@ -98,7 +98,7 @@ public class CustomerGridEntity extends BaseEpmetEntity { /** * 负责人姓名 */ - private String person; + private String contacts; /** * 联系电话 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.9__alter_org.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.9__alter_org.sql new file mode 100644 index 0000000000..4dcc77cba3 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.9__alter_org.sql @@ -0,0 +1,14 @@ + +ALTER TABLE `customer_agency` +ADD COLUMN `CONTACTS` varchar(64) NULL COMMENT '负责人' AFTER `PARENT_AREA_CODE`, +ADD COLUMN `MOBILE` varchar(32) NULL COMMENT '联系电话' AFTER `PERSON`; + +ALTER TABLE `customer_department` +ADD COLUMN `CODE` varchar(64) NULL COMMENT '编码' AFTER `UPDATED_TIME`, +ADD COLUMN `CONTACTS` varchar(64) NULL COMMENT '负责人' AFTER `CODE`, +ADD COLUMN `MOBILE` varchar(32) NULL COMMENT '联系电话' AFTER `PERSON`; + +ALTER TABLE `customer_grid` +ADD COLUMN `GRID_TYPE` varchar(64) NULL COMMENT '网格类型【字典表sys_dict_data,key:grid_type】' AFTER `PIDS`, +ADD COLUMN `CONTACTS` varchar(64) NULL COMMENT '负责人' AFTER `GRID_TYPE`, +ADD COLUMN `MOBILE` varchar(32) NULL COMMENT '联系电话' AFTER `PERSON`; \ No newline at end of file