小区统计修改

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

@@ -212,14 +212,14 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
         List<FactUserHouseResultDTO> addList = new ArrayList<>();
 
         neiList.forEach(item -> {
-            String gridId = item.getGridId();
+            String gridId = item.getGridId() == null ? "" : item.getGridId();
             String neighborHoodsId = item.getNeighbourhoodsId();
             FactUserHouseResultDTO dto = new FactUserHouseResultDTO();
             dto.setCustomerId(formDTO.getCustomerId());
             dto.setDateId(dateId);
             dto.setGridId(gridId);
-            dto.setPid(item.getPid());
-            dto.setPids(item.getPids());
+            dto.setPid(item.getPid() == null ? "" : item.getPid());
+            dto.setPids(item.getPids() == null ? "" : item.getPids());
             dto.setNeighbourhoodsCount(item.getNeighbourhoodsCount());
             dto.setNeighbourhoodsId(item.getNeighbourhoodsId());
             dto.setNeighborHoodName(item.getNeighborHoodName());

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactNeighborhoodUserHouseDailyDao.xml

@@ -72,9 +72,6 @@
         <if test="level == 'grid'">
             AND d.GRID_ID = #{agencyId}
         </if>
-        <if test="level == 'community'">
-            AND d.PID = #{agencyId}
-        </if>
         <if test="dateId != null and dateId != ''">
             AND d.DATE_ID = #{dateId}
         </if>