Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage

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

@@ -368,7 +368,7 @@ public class CoverageServiceImpl implements CoverageService {
                     customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
 
             return list.stream()
-                    .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey,
+                    .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getEnterpriseId(), categoryKey,
                             isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude()))
                     .collect(Collectors.toList());
 

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

@@ -7,19 +7,16 @@
     <select id="countEnterprisePatrol" resultType="java.lang.Integer">
         select count(1)
         from ic_enterprise e
-                 inner join ic_enterprise_patrol_record r on (e.ID = r.ENTERPRISE_ID)
         where e.CUSTOMER_ID = #{customerId}
           and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
           and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
           and e.PLACE_TYPE = #{categoryKey}
           and e.DEL_FLAG = '0'
-          and r.DEL_FLAG = '0'
     </select>
 
     <!--企事业单位巡查列表-->
     <select id="listEnterprisePatrol" resultType="com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO">
         select e.id enterpriseId,
-                r.id patrolId,
                e.customer_id,
                e.grid_id,
                e.agency_id,
@@ -32,12 +29,10 @@
                e.mobile,
                e.source_type
         from ic_enterprise e
-                 inner join ic_enterprise_patrol_record r on (e.ID = r.ENTERPRISE_ID)
         where e.CUSTOMER_ID = #{customerId}
           and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
           and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
           and e.PLACE_TYPE = #{categoryKey}
           and e.DEL_FLAG = '0'
-          and r.DEL_FLAG = '0'
     </select>
 </mapper>