diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java index a1baff300a..fff25b16f4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java @@ -73,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java index 6a454c446b..1422ac76ad 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java @@ -73,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java index 7e36b065b9..a10cbd4ad8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java @@ -1,8 +1,9 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -76,6 +77,16 @@ public class IcCityManagementDTO implements Serializable { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + /** * 删除标识 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java index 64045ddd17..d516ccf863 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java @@ -76,6 +76,16 @@ public class IcPublicServiceDTO implements Serializable { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + /** * 删除标识 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java index ab73efa810..ff0aac0dc2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java @@ -62,6 +62,16 @@ public class IcCityManagementAddEditFormDTO implements Serializable { @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + private String customerId; private String userId; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java index fb9cbf6b26..226bb921f1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java @@ -62,6 +62,16 @@ public class IcPublicServiceAddEditFormDTO implements Serializable { @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + private String customerId; private String userId; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java index 6c40cb030c..ee36eb853d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java @@ -65,4 +65,14 @@ public class IcCityManagementListResultDTO implements Serializable { */ private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java index 859b36faca..3fcae16a22 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java @@ -65,4 +65,14 @@ public class IcPublicServiceListResultDTO implements Serializable { */ private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java index 8a90c40380..170449ea1a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java @@ -1,13 +1,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; - /** * 城市管理图层 * @@ -76,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java index 5c0e35ec89..30b8513f4b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java @@ -1,13 +1,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; - /** * 公共服务图层 * @@ -76,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index ffda552a3f..bdd6f5b587 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -38,6 +38,14 @@ public class IcCityManagementExcel { @NotBlank(message = "地址为必填项") private String address; + @ExcelProperty(value = "联系人") + @ColumnWidth(20) + private String principal; + + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String mobile; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index 3b9762b677..872b2fd61b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -38,6 +38,14 @@ public class IcPublicServiceExcel { @NotBlank(message = "地址为必填项") private String address; + @ExcelProperty(value = "联系人") + @ColumnWidth(20) + private String principal; + + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String mobile; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 5d08ce792c..df763d3c79 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -95,6 +95,8 @@ public class IcCityManagementExcelImportListener implements ReadListener