From 837e320c0f4d7cf3028d130c8916a96c872d833b Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Tue, 28 Jun 2022 15:19:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E3=80=91=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95=E4=BD=8D=E5=B7=A1?=
 =?UTF-8?q?=E6=9F=A5=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=B7=A1=E6=9F=A5=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=B1=95=E7=A4=BA=E4=BC=81=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/service/impl/CoverageServiceImpl.java    | 2 +-
 .../resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
index fcba049932..01a3464762 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
+++ b/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());
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml
index f84d232363..6aa433eb09 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml
+++ b/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>
\ No newline at end of file