添加下备注

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java

@@ -294,6 +294,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
 
     @Override
     public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) {
+        // ic_enterprise.AGENCY_PIDS:agency_id的所有上级
+        // 网格不为空时按网格查询， 网格为空时，根据agency_id或者AGENCY_PIDS查看
         return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId);
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -682,6 +682,9 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 */
 	private LambdaQueryWrapper<IcEventEntity> constructIcEventQueryWrapper(String customerId, String staffOrgIds,
 																		   String search, Boolean difficultPoint, String gridId) {
+		//ic_event.grid_pids是网格所有的上级，不包括网格自己
+		//ic_event.agency_id网格的所属组织
+		//所以这staffOrgIds是组织的全路径
 		LambdaQueryWrapper<IcEventEntity> query = new LambdaQueryWrapper<>();
 		query.eq(IcEventEntity::getCustomerId, customerId)
 				.eq(StringUtils.isNotBlank(gridId), IcEventEntity::getGridId, gridId);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -39,7 +39,6 @@ import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
 import com.epmet.dataaggre.enums.MenusEnums;
 import com.epmet.dataaggre.redis.GovCustomerMenuRedis;
 import com.epmet.dataaggre.service.CoverageService;
-import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
 import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -94,9 +93,6 @@ public class CoverageServiceImpl implements CoverageService {
     @Autowired
     private ExecutorService executorService;
 
-    @Autowired
-    private EpmetUserService epmetUserService;
-
     // 1：出租 0：自住  2：闲置 3：未售出
     public static final Integer HOUSE_RENT_FLAG_RENT = 1;
 
@@ -611,11 +607,8 @@ public class CoverageServiceImpl implements CoverageService {
         } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){
             // 企事业单位巡查
             // 最新巡查结果【0:合格 1:不合格】
+            // 左侧用，可以到网格，
             return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId);
-        } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) {
-            // 志愿者
-            String[] parts = categoryKey.split("_");
-            return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]);
         }
 
         return 0;
@@ -778,21 +771,6 @@ public class CoverageServiceImpl implements CoverageService {
                             StringUtils.isNotBlank(dc.getLatitude()) ? dc.getLatitude() : rootAgency.getLatitude(),
                             StringUtils.isNotBlank(dc.getLongitude()) ? dc.getLongitude() : rootAgency.getLongitude()))
                     .collect(Collectors.toList());
-        } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) {
-            // 志愿者
-            String[] parts = categoryKey.split("_");
-            List<IcResiUserEntity> resiEntities = epmetUserService.listVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]);
-
-            return resiEntities.parallelStream().map(re -> {
-                // 使用楼栋的坐标补充居民的坐标信息
-                String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency);
-
-                return new CoverageAnalisisDataListResultDTO(
-                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT),
-                        coordinates[1], coordinates[0]);
-
-            }).collect(Collectors.toList());
         }
         return new ArrayList<>();
     }