From 5112c82c8b4581dad45bcc7c98396224bd497abc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 18 Oct 2021 15:57:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?sql=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/user/UserDao.xml                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index bc20519148..4715f23c2a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -1029,9 +1029,8 @@
             LEFT JOIN staff_patrol_detail d ON m.ID = d.STAFF_PATROL_REC_ID
         WHERE
             1 =1
-
             <if test="patrolId != null and patrolId != ''">
-                AND  ID = #{patrolId}
+                AND  m.ID = #{patrolId}
             </if>
             and m.CUSTOMER_ID = #{customerId}
             AND m.DEL_FLAG = '0'

From 7ef6da082bc7f70ab5d68dc8c2e67584b6ffc740 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 18 Oct 2021 15:58:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/service/impl/UserPatrolRecordServiceImpl.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java
index 446f1f89ca..0a5312e602 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java
@@ -24,7 +24,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
-import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.UserPatrolRecordDao;
@@ -114,12 +113,6 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             if (effectRow == NumConstant.ZERO) {
                 baseDao.insert(recordEntity);
             }
-            //todo 过滤掉巡查结束时间之后的轨迹
-            Result<List<MidPatrolDetailResult>> detailResult = dataStatisticalOpenFeignClient.getPatrolDetailList(midPatrolFormDTO);
-            if (detailResult == null || !detailResult.success()) {
-                log.error("获取巡查记录明细失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
-                return;
-            }
             UserPatrolDetailEntity detailEntity = buildDetailEntity(o);
             //先删除再新增
             userPatrolDetailService.deleteByPatrolId(recordEntity.getId());