楼洞导入导出

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java

@@ -166,4 +166,5 @@ public class IcBuildingDTO implements Serializable {
      */
     private Integer realPerson;
 
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
@@ -216,4 +217,10 @@ public class ImportGeneralDTO implements Serializable {
      */
     private String floor;
 
+    private String buildingLeaderIdCard;
+
+    private String buildingLeaderType;
+
+    private String buildingLeaderTypeNum;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java

@@ -150,5 +150,9 @@ public class IcBulidingAddFormDTO implements Serializable {
      */
     private Integer realPerson;
 
+    private String buildingLeaderType;
+
+    private String buildingLeaderIdCard;
+
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java

@@ -121,4 +121,16 @@ public class IcBulidingDetailDTO implements Serializable {
      */
     private Integer realPerson;
 
+    /**
+     * 烟台需求：楼长身份证号
+     */
+    private String buildingLeaderIdCard;
+
+    /**
+     * 烟台需求：类型：0楼长；1单元长
+     */
+    private String buildingLeaderType;
+
+    private String buildingLeaderTypeName;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java

@@ -132,4 +132,6 @@ public class IcBuildingEntity extends BaseEpmetEntity {
 	 */
 	private Integer realPerson;
 
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java

@@ -130,4 +130,10 @@ public class IcBuildingExcel  extends ExcelVerifyInfo implements Serializable {
 
     @Excel(name = "楼长电话")
     private String buildingLeaderMobile;
+
+    @Excel(name = "楼长身份证号")
+    private String buildingLeaderIdCard;
+
+    @Excel(name = "楼长类型")
+    private String buildingLeaderType;
 }

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

@@ -44,6 +44,12 @@ public class BuildingInfoModel {
     @ExcelProperty(value = "楼长电话")
     private String buildingLeaderMobile;
 
+    @ExcelProperty(value = "楼长身份证号")
+    private String buildingLeaderIdCard;
+
+    @ExcelProperty(value = "楼长类型")
+    private String buildingLeaderType;
+
     @ExcelProperty(value = "排序")
     private BigDecimal sort;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -123,6 +123,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     private IcBuildingUnitDao icBuildingUnitDao;
     @Autowired
     private IcHouseDao icHouseDao;
+    @Autowired
+    private CommunityBuildingManagerDao communityBuildingManagerDao;
+    @Autowired
+    private IcNeighborHoodDao neighborHoodDao;
+    @Autowired
+    private CustomerAgencyDao customerAgencyDao;
 
     @Override
     public PageData<IcNeighborHoodDTO> page(Map<String, Object> params) {
@@ -625,6 +631,14 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
         if (null != building) {
             info.setBuildingExistStatus(true);
+            if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
+                if (info.getBuildingLeaderType().equals("楼长")){
+                    info.setBuildingLeaderTypeNum("0");
+                }
+                if (info.getBuildingLeaderType().equals("单元长")){
+                    info.setBuildingLeaderTypeNum("1");
+                }
+            }
             if (info.getBuildingUpdateStatus()){
                 if (info.getTotalUnitNum() < building.getTotalUnitNum()){
                     /**
@@ -665,6 +679,60 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                     }
                     icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED);
                 }
+                LambdaQueryWrapper<CommunityBuildingManagerEntity> manager = new LambdaQueryWrapper<CommunityBuildingManagerEntity>().eq(CommunityBuildingManagerEntity::getBuildingId,info.getBuildingId());
+                CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager);
+
+
+                if (StringUtils.isNotBlank(info.getBuildingLeaderTypeNum())&&
+                        StringUtils.isNotBlank(info.getBuildingLeaderIdCard())&&
+                        StringUtils.isNotBlank(info.getBuildingLeaderMobile())&&
+                        StringUtils.isNotBlank(info.getBuildingLeaderName())){
+
+                    if (communityBuildingManagerEntity!=null){
+                        communityBuildingManagerEntity.setIdCard(info.getBuildingLeaderIdCard());
+                        communityBuildingManagerEntity.setPhone(info.getBuildingLeaderMobile());
+                        communityBuildingManagerEntity.setType(info.getBuildingLeaderTypeNum());
+                        communityBuildingManagerEntity.setName(info.getBuildingLeaderName());
+                        communityBuildingManagerDao.updateById(communityBuildingManagerEntity);
+                    }else{
+                        communityBuildingManagerEntity= new CommunityBuildingManagerEntity();
+                        communityBuildingManagerEntity.setIdCard(info.getBuildingLeaderIdCard());
+                        communityBuildingManagerEntity.setPhone(info.getBuildingLeaderMobile());
+                        communityBuildingManagerEntity.setType(info.getBuildingLeaderTypeNum());
+                        communityBuildingManagerEntity.setName(info.getBuildingLeaderName());
+                        communityBuildingManagerEntity.setBuildingId(building.getId());
+                        IcBuildingEntity buildingEntity = icBuildingDao.selectById(building.getId());
+                        if (buildingEntity.getNeighborHoodId()!=null){
+                            communityBuildingManagerEntity.setViliageId(buildingEntity.getNeighborHoodId());
+                            IcNeighborHoodEntity neighborHood =  neighborHoodDao.selectById(buildingEntity.getNeighborHoodId());
+                            communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
+                            communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids());
+
+                            String[] agencyIds = neighborHood.getAgencyPids().split(":");
+                            LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
+                            List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
+                            for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
+                                if (customerAgencyEntity.getLevel().equals("community")){
+                                    communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId());
+                                }
+                                if (customerAgencyEntity.getLevel().equals("street")){
+                                    communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId());
+                                }
+                                if (customerAgencyEntity.getLevel().equals("district")){
+                                    communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId());
+                                }
+                            }
+                        }
+                        communityBuildingManagerDao.insert(communityBuildingManagerEntity);
+
+                    }
+
+                }else{
+                    if (communityBuildingManagerEntity!=null){
+                        communityBuildingManagerDao.deleteById(communityBuildingManagerEntity);
+                    }
+                }
+
             }
             return building.getId();
         }
@@ -680,6 +748,41 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         buildingEntity.setBuildingLeaderName(info.getBuildingLeaderName());
         buildingEntity.setBuildingLeaderMobile(info.getBuildingLeaderMobile());
         icBuildingService.insert(buildingEntity);
+
+        if (StringUtils.isNotBlank(info.getBuildingLeaderTypeNum())&&
+                StringUtils.isNotBlank(info.getBuildingLeaderIdCard())&&
+                StringUtils.isNotBlank(info.getBuildingLeaderMobile())&&
+                StringUtils.isNotBlank(info.getBuildingLeaderName())){
+            CommunityBuildingManagerEntity communityBuildingManagerEntity= new CommunityBuildingManagerEntity();
+            communityBuildingManagerEntity.setIdCard(info.getBuildingLeaderIdCard());
+            communityBuildingManagerEntity.setPhone(info.getBuildingLeaderMobile());
+            communityBuildingManagerEntity.setType(info.getBuildingLeaderTypeNum());
+            communityBuildingManagerEntity.setName(info.getBuildingLeaderName());
+            communityBuildingManagerEntity.setBuildingId(buildingEntity.getId());
+
+            communityBuildingManagerEntity.setViliageId(buildingEntity.getNeighborHoodId());
+            IcNeighborHoodEntity neighborHood =  neighborHoodDao.selectById(buildingEntity.getNeighborHoodId());
+            communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
+            communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids());
+
+            String[] agencyIds = neighborHood.getAgencyPids().split(":");
+            LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
+            List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
+            for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
+                if (customerAgencyEntity.getLevel().equals("community")){
+                    communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId());
+                }
+                if (customerAgencyEntity.getLevel().equals("street")){
+                    communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId());
+                }
+                if (customerAgencyEntity.getLevel().equals("district")){
+                    communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId());
+                }
+            }
+            communityBuildingManagerDao.insert(communityBuildingManagerEntity);
+        }
+
+
         if (null != info.getTotalUnitNum() && info.getTotalUnitNum() > NumConstant.ZERO) {
             //设置楼宇单元
             List<IcBuildingUnitEntity> unitList = new ArrayList<>();

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -54,6 +54,12 @@
             <if test="buildingLeaderMobile != null and buildingLeaderMobile != '' ">
                 BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
             </if>
+        <if test="buildingLeaderIdCard != null and buildingLeaderIdCard != '' ">
+            BUILDING_LEADER_ID_CARD = #{buildingLeaderIdCard},
+        </if>
+        <if test="buildingLeaderTypeNum != null and buildingLeaderTypeNum != '' ">
+            BUILDING_LEADER_TYPE = #{buildingLeaderTypeNum},
+        </if>
             <if test="sort != null">
                 SORT = #{sort},
             </if>
@@ -149,7 +155,9 @@
         c.ORGANIZATION_NAME as agencyName,
         d.GRID_NAME as gridName,
         a.BUILDING_LEADER_NAME AS buildingLeaderName,
-        a.BUILDING_LEADER_MOBILE AS buildingLeaderMobile
+        a.BUILDING_LEADER_MOBILE AS buildingLeaderMobile,
+        a.BUILDING_LEADER_ID_CARD AS buildingLeaderIdCard,
+        if(a.BUILDING_LEADER_TYPE = 0,'楼长',if(a.BUILDING_LEADER_TYPE = 1,'单元长','')) AS buildingLeaderType
         from ic_building a
 
         LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID  and b.DEL_FLAG='0'
@@ -453,6 +461,9 @@
     </select>
     <select id="getBuildingDetail" resultType="com.epmet.dto.result.IcBulidingDetailDTO">
         SELECT
+            b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard,
+            b.BUILDING_LEADER_TYPE as buildingLeaderType,
+            if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长','')) as buildingLeaderTypeName,
             b.ID AS buildingId,
             b.BUILDING_NAME,
             b.NEIGHBOR_HOOD_ID,