Merge branch 'yantai_zhengwu_master' into dev

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

@@ -47,9 +47,6 @@ public class BuildingInfoModel {
     @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/BuildingServiceImpl.java

@@ -121,6 +121,7 @@ public class BuildingServiceImpl implements BuildingService {
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setCustomerId(customerId);
         IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
+        entity.setBuildingLeaderType("0");
         icBuildingDao.insert(entity);
 
 
@@ -735,6 +736,7 @@ public class BuildingServiceImpl implements BuildingService {
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setId(formDTO.getBuildingId());
         icBuildingDTO.setCustomerId(customerId);
+        icBuildingDTO.setBuildingLeaderType("0");
         icBuildingService.update(icBuildingDTO);
 
 

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

@@ -629,14 +629,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     private String getBuildingId(String customerId, ImportGeneralDTO info) {
         //根据小区ID和楼栋名获取楼栋信息
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
-        if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
+/*        if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
             if (info.getBuildingLeaderType().equals("楼长")){
                 info.setBuildingLeaderTypeNum("0");
             }
             if (info.getBuildingLeaderType().equals("单元长")){
                 info.setBuildingLeaderTypeNum("1");
             }
-        }
+        }*/
+        info.setBuildingLeaderTypeNum("0");
         if (null != building) {
             info.setBuildingExistStatus(true);
 

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

@@ -33,6 +33,7 @@
             (
                 case when m.type='0' then '楼长'
                 when m.type='1' then '单元长'
+                when m.type='0,1' or m.type='1,0' then '楼长,单元长'
                 else '-'
                 end
             )as typeName,