From f2786fcdb780e8f205ade4535f88f84cc7c50408 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 11:09:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=8F=E5=8C=BA=E7=89=A9?= =?UTF-8?q?=E4=B8=9A=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 5 +++++ .../entity/IcPropertyManagementEntity.java | 3 +++ .../com/epmet/excel/IcNeighborHoodExcel.java | 6 ++++++ .../model/ImportNeighborHoodInfoListener.java | 7 +++++++ .../epmet/model/NeighborHoodInfoModel.java | 6 ++++++ .../main/resources/excel/neighbor_export.xlsx | Bin 11704 -> 11817 bytes .../resources/excel/neighbor_template.xlsx | Bin 11817 -> 11856 bytes .../resources/mapper/IcNeighborHoodDao.xml | 2 ++ 8 files changed, 29 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 1c25e75f50..d617ad39dd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -223,4 +223,9 @@ public class ImportGeneralDTO implements Serializable { private String buildingLeaderTypeNum; + + private String propertyUserName; + + private String propertyUserMobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java index c0ea9df16d..81a75f86ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java @@ -17,6 +17,8 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; @@ -39,6 +41,7 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity { * 物业名称 */ private String name; + @TableField(fill = FieldFill.INSERT) private String customerId; /** * 烟台需求:物业联系人姓名 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java index 227ed90e4a..0406b33490 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java @@ -124,6 +124,12 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable @Excel(name = "关联物业") private String propertyName; + @Excel(name = "物业联系人") + private String propertyUserName; + + @Excel(name = "联系电话") + private String propertyUserMobile; + @Excel(name = "详细地址") @NotBlank(message = "不能为空") private String address; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index 5bacafb1fe..f4fe33adb2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -185,6 +185,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener { IcPropertyManagementEntity e = new IcPropertyManagementEntity(); e.setName(name); + for (ImportGeneralDTO importGeneralDTO : notExistList) { + if (importGeneralDTO.getPropertyName().equals(name)){ + e.setContactMobile(importGeneralDTO.getPropertyUserMobile()); + e.setContactName(importGeneralDTO.getPropertyUserName()); + break; + } + } propertyManagementEntities.add(e); }); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java index b1f33f409b..374f367a2e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java @@ -36,6 +36,12 @@ public class NeighborHoodInfoModel { @ExcelProperty(value = "关联物业") private String propertyName; + @ExcelProperty(value = "物业联系人") + private String propertyUserName; + + @ExcelProperty(value = "联系电话") + private String propertyUserMobile; + @ExcelProperty(value = "详细地址") private String address; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx index 2d89d9255729ab7c6c41c736ad33386460df8c27..91a9637774b3ec0d1524f1b61864c5f699114f2a 100644 GIT binary patch delta 5473 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 Qz;a{=FAt6z=idSU0?&yr%K!iX delta 5340 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 delta 5700 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 7f51133503..574d29a6ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -197,6 +197,8 @@ a.ADDRESS as address, a.REMARK as remark, e.NAME as propertyName, + e.CONTACT_NAME as propertyUserName, + e.CONTACT_MOBILE as propertyUserMobile, b.ORGANIZATION_NAME as agencyName, c.GRID_NAME as gridName from ic_neighbor_hood a