导入小区物业关联

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;
+
 }

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;
 	/**
 	 * 烟台需求：物业联系人姓名

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;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -185,6 +185,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                         disposePropertyNames.forEach(name -> {
                             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);
                         });
                     }

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;
 

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