Merge branch 'bugfix/teamB_shuangshi' into master_yantai

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

@@ -16,7 +16,7 @@ public class BuildingListResultDTO implements Serializable {
     private static final long serialVersionUID = -1423424057500044373L;
     private String id;
     private String name;
-    private Integer unitCoun = 0;
+    private Integer unitCount = 0;
     private Integer houseCount = 0;
     private Integer personCount = 0;
     private Integer differHouseCount = 0;

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

@@ -58,11 +58,9 @@ public class HouseInformationServiceImpl implements HouseInformationService {
      */
     @Override
     public CommunityCountResultDTO getCommunityCount(HouseInformationFormDTO formDTO) {
-        //获取工作人员所属组织
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         if (StringUtils.isEmpty(formDTO.getCommunityId())) {
             //获取工作人员所属组织
-//            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
             if (null == staffInfo) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
             }
@@ -70,13 +68,8 @@ public class HouseInformationServiceImpl implements HouseInformationService {
         }
         String orgName;
         CustomerAgencyEntity agency = customerAgencyDao.selectById(formDTO.getCommunityId());
-        if (null == agency) {
-            agency = customerAgencyDao.selectById(staffInfo.getAgencyId());
         if (null == agency) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社区不存在", "社区不存在");
-            } else {
-                formDTO.setCommunityId(staffInfo.getAgencyId());
-            }
         }
         CustomerAgencyEntity parentAgency = customerAgencyDao.selectById(agency.getPid());
         if (null == parentAgency) {
@@ -128,35 +121,6 @@ public class HouseInformationServiceImpl implements HouseInformationService {
                 }
                 item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount());
             });
-
-        } else {
-            return deleteAfetrEmergency(formDTO);
-        }
-        return new PageData<>(list, pageInfo.getTotal());
-    }
-
-    private PageData<GridCountListResultDTO> deleteAfetrEmergency(HouseInformationFormDTO formDTO) {
-        //获取工作人员所属组织
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        formDTO.setCommunityId(staffInfo.getAgencyId());
-        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-        List<GridCountListResultDTO> list = icNeighborHoodDao.getGridList(formDTO);
-        PageInfo<GridCountListResultDTO> pageInfo = new PageInfo<>(list);
-        if (CollectionUtils.isNotEmpty(list)) {
-            //获取录入人口数
-            IcUserCountFormDTO countFormDTO = new IcUserCountFormDTO();
-            countFormDTO.setOrgType(NumConstant.ZERO_STR);
-            countFormDTO.setOrgId(formDTO.getCommunityId());
-            countFormDTO.setType(NumConstant.ONE_STR);
-            Map<String, Integer> map = getMapResult(countFormDTO);
-
-            list.forEach(item -> {
-                if (map.containsKey(item.getId())) {
-                    item.setPersonCount(map.get(item.getId()));
-                }
-                item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount());
-            });
-
         }
         return new PageData<>(list, pageInfo.getTotal());
     }

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

@@ -530,7 +530,8 @@
             SELECT
                     a.ID,
                     a.BUILDING_NAME AS name,
-                    IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitCount,
+                    IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitRealCount,
+                    IFNULL(c.unitCount, 0) AS unitCount,
                     SUM( IFNULL( a.TOTAL_HOUSE_NUM, 0 ) ) AS houseRealCount,
                     SUM( IFNULL( a.REAL_PERSON, 0 ) ) AS personRealCount,
                     IFNULL(b.houseCount, 0) AS houseCount,
@@ -541,6 +542,10 @@
                     FROM ic_house WHERE DEL_FLAG = '0'
                     AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
                     GROUP BY BUILDING_ID ) b ON a.ID = b.BUILDING_ID
+                    LEFT JOIN ( SELECT BUILDING_ID, COUNT( ID ) AS unitCount
+                    FROM ic_building_unit
+                    WHERE DEL_FLAG = '0'
+                    GROUP BY BUILDING_ID ) c ON a.ID = c.BUILDING_ID
             WHERE
                     a.DEL_FLAG = '0'
                     AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId}
@@ -578,7 +583,8 @@
             a.ID AS buildingId,
             a.TYPE AS buildingType,
             CONCAT(NEIGHBOR_HOOD_NAME,' ',BUILDING_NAME) AS buildingName,
-            IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitCount,
+            IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitRealCount,
+            IFNULL( d.unitCount, 0 ) AS unitCount,
             SUM( IFNULL( a.TOTAL_HOUSE_NUM, 0 ) ) AS houseRealCount,
             SUM( IFNULL( a.REAL_PERSON, 0 ) ) AS personRealCount,
             IFNULL( b.houseCount, 0 ) AS houseCount,
@@ -590,6 +596,11 @@
             WHERE DEL_FLAG = '0'
             AND BUILDING_ID = #{buildingId}
             GROUP BY BUILDING_ID ) b ON a.ID = b.BUILDING_ID
+            LEFT JOIN ( SELECT BUILDING_ID, COUNT( ID ) AS unitCount
+            FROM ic_building_unit
+            WHERE DEL_FLAG = '0'
+            AND BUILDING_ID = #{buildingId}
+            GROUP BY BUILDING_ID ) d ON a.ID = d.BUILDING_ID
             INNER JOIN ic_neighbor_hood c ON a.NEIGHBOR_HOOD_ID = c.ID
         WHERE
             a.DEL_FLAG = '0'