shishi

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java

@@ -26,7 +26,8 @@ public interface IcEnterprisePatrolRecordDao extends BaseDao<IcEnterprisePatrolR
      */
     Integer countEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
                                   @Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
-                                  @Param("categoryKey") String categoryKey,@Param("latestResult")String latestResult);
+                                  @Param("categoryKey") String categoryKey,@Param("latestResult")String latestResult,
+                                  @Param("gridId")String gridId);
 
     /**
      * 企事业单位巡查列表

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java

@@ -24,7 +24,7 @@ public interface IcResiService {
     List<IcResiUserEntity> listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,
                                                                  Integer pageNo, Integer pageSize, Boolean isPage);
 
-    Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search);
+    Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId);
 
     /**
      * 使用特殊人群类别查询居民列表

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

@@ -40,7 +40,7 @@ public class IcResiServiceImpl implements IcResiService {
             PageHelper.startPage(pageNo, pageSize);
         }
 
-        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search, null);
         query.orderByAsc(IcResiUserEntity::getCreatedTime);
         return resiUserDao.selectList(query);
     }
@@ -55,8 +55,8 @@ public class IcResiServiceImpl implements IcResiService {
      * @return
      */
     @Override
-    public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
+    public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, String gridId) {
-        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search,gridId);
         return resiUserDao.selectCount(query);
     }
 
@@ -69,11 +69,12 @@ public class IcResiServiceImpl implements IcResiService {
      * @param search
      * @return
      */
-    LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
+    LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId) {
         LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcResiUserEntity::getCustomerId, customerId);
         query.eq(IcResiUserEntity::getStatus, "0"); // 只查询0 正常的居民。
         query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids));
+        query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId);
         if ("resi_xfry".equals(categoryKey)) {
             // 信访人员
             query.eq(IcResiUserEntity::getIsXfry, true);

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

@@ -112,7 +112,7 @@ public interface GovOrgCoverageService {
 
     Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
 
-    Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult);
+    Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId);
 
     List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
                                                          String search, String categoryKey, Boolean isPage, Integer pageNo,

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

@@ -293,8 +293,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
     }
 
     @Override
-    public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult) {
+    public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) {
-        return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult);
+        return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId);
     }
 
     @Override

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

@@ -4,7 +4,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.entity.govproject.IcEventEntity;
@@ -111,7 +110,7 @@ public interface GovProjectService {
 	 * @param isDifficultPoint 是否是难点堵点
 	 * @return
 	 */
-	Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint);
+	Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint,String gridId);
 
 	/**
 	 * 搜索事件

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

@@ -28,7 +28,6 @@ import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
 import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
@@ -653,15 +652,15 @@ public class GovProjectServiceImpl implements GovProjectService {
 	}
 
 	@Override
-	public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint) {
+	public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, String gridId) {
-		LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
+		LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint,gridId);
 		return icEventDao.selectCount(query);
 	}
 
 	@Override
 	public List<IcEventEntity> searchIcEventEntities(String customerId, String staffOrgIds, String search,
 													 Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize) {
-		LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
+		LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint,null);
 		if (isPage) {
 			PageHelper.startPage(pageNo, pageSize);
 		}
@@ -682,9 +681,10 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 * @return
 	 */
 	private LambdaQueryWrapper<IcEventEntity> constructIcEventQueryWrapper(String customerId, String staffOrgIds,
-																		   String search, Boolean difficultPoint) {
+																		   String search, Boolean difficultPoint, String gridId) {
 		LambdaQueryWrapper<IcEventEntity> query = new LambdaQueryWrapper<>();
-		query.eq(IcEventEntity::getCustomerId, customerId);
+		query.eq(IcEventEntity::getCustomerId, customerId)
+				.eq(StringUtils.isNotBlank(gridId), IcEventEntity::getGridId, gridId);
 		query.likeRight(IcEventEntity::getGridPids, staffOrgIds);
 		if (StringUtils.isNotBlank(search)) {
 			query.like(IcEventEntity::getName, search);

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

@@ -157,7 +157,7 @@ public class CoverageServiceImpl implements CoverageService {
             for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) {
 
                 Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, agencyPath, e.getPlaceType(),
-                        e.getCategoryKey(), search);
+                        e.getCategoryKey(), search,null);
                 lastTotalCount = totalCount;
                 totalCount += tempCount;
 
@@ -560,18 +560,18 @@ public class CoverageServiceImpl implements CoverageService {
      * @return
      */
     public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType,
-                                   String categoryKey, String search) {
+                                   String categoryKey, String search,String gridId) {
 
         if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) {
             // 使用分类查询居民信息
             return icResiService.countResisByCategories4Coverage(customerId, agencyId,
-                    staffOrgIds, categoryKey, search);
+                    staffOrgIds, categoryKey, search,gridId);
         } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) {
             // 特殊人群
             return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
         } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {
             // 难点痛点
-            return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true);
+            return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true,gridId);
         } else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) {
             // 城市资源管理
             return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey);
@@ -589,7 +589,7 @@ public class CoverageServiceImpl implements CoverageService {
             return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey);
         } else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) {
             // 企事业单位巡查
-            return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null);
+            return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null,null);
         } else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) {
             // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
             return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT);
@@ -602,7 +602,7 @@ 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 );
+            return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId);
         }
 
         return 0;
@@ -1068,10 +1068,24 @@ public class CoverageServiceImpl implements CoverageService {
         if(CollectionUtils.isNotEmpty(list)){
             resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class);
             for(DataListLeftSubTotalResDTO orgRes:resultList){
-
+                String gridId=StrConstant.EPMETY_STR;
-
+                String agencyId=StrConstant.EPMETY_STR;
-
+                String orgIdPath=StrConstant.EPMETY_STR;
-
+                if(OrgConstant.AGENCY.equals(orgRes.getOrgType())){
+                    agencyId=orgRes.getOrgId();
+                    AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(orgRes.getOrgId());
+                    if (StringUtils.isNotBlank(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache)) {
+                        orgIdPath = agencyInfoCache.getPids().concat(":").concat(agencyId);
+                    } else {
+                        orgIdPath = agencyId;
+                    }
+                }else{
+                    gridId=orgRes.getOrgId();
+                    GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(orgRes.getOrgId());
+                    orgIdPath=gridInfoCache.getPids().concat(":").concat(gridId);
+                }
+                int count = doDataListCount(formDTO.getCustomerId(), agencyId, orgIdPath, formDTO.getPlaceType(), formDTO.getCategoryKey(), null, gridId);
+                orgRes.setTotal(count);
             }
         }
         return resultList;

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml

@@ -17,6 +17,9 @@
           <if test='null != latestResult and "" != latestResult'>
             and e.LATEST_RESULT = #{latestResult}
           </if>
+        <if test='null != gridId and "" != gridId'>
+            and e.GRID_ID = #{gridId}
+        </if>
     </select>
 
     <!--企事业单位巡查列表-->