From 5e9a88d9f624e5136879c4983f074cf5457ceee5 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 15 Oct 2021 18:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/dto/form/PageFormDTO.java   |  5 ++++
 .../main/resources/mapper/user/UserDao.xml    | 24 ++++++++++++-------
 .../impl/UserPatrolRecordServiceImpl.java     |  2 ++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java
index 4820f4d50b..c699557bac 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java
@@ -30,6 +30,11 @@ public class PageFormDTO {
      */
     private Integer offset;
 
+    /**
+     * 是否分页 默认分页
+     */
+    private boolean isPage = true;
+
     public Integer getOffset() {
         return (pageNo-1)*pageSize;
     }
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 6778c0305c..30abc86c9c 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
@@ -1011,12 +1011,15 @@
         FROM staff_patrol_record
         WHERE
             1=1
-        <if test="patrolId != null and patrolId != ''">
-            AND  ID = #{patrolId}
-        </if>
+            <if test="patrolId != null and patrolId != ''">
+                AND  ID = #{patrolId}
+            </if>
             and CUSTOMER_ID = #{customerId}
             AND DEL_FLAG = '0'
-            LIMIT  #{offset},#{pageSize}
+            <if test="isPage != null and isPage">
+                LIMIT #{offset},#{pageSize}
+            </if>
+            order by created_time
     </select>
     <select id="getPatrolDetailList" resultType="com.epmet.dto.user.result.MidPatrolDetailResult">
         select
@@ -1024,12 +1027,17 @@
         from staff_patrol_detail
         WHERE
             1=1
-        <if test="patrolId != null and patrolId != ''">
-            AND  staff_patrol_rec_id = #{patrolId}
-        </if>
+            <if test="patrolId != null and patrolId != ''">
+                AND  staff_patrol_rec_id = #{patrolId}
+            </if>
             and CUSTOMER_ID = #{customerId}
             AND DEL_FLAG = '0'
-            LIMIT #{offset},#{pageSize}
+            <if test="isPage != null and isPage">
+                LIMIT #{offset},#{pageSize}
+            </if>
+
+            order by created_time
+
     </select>
 
 </mapper>
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 fdf0c2bc18..3eaf06633c 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
@@ -118,6 +118,8 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
         if (effectRow == 0) {
             baseDao.insert(recordEntity);
         }
+        midPatrolFormDTO.setPage(false);
+        //todo 过滤掉巡查结束时间之后的轨迹
         Result<List<MidPatrolDetailResult>> detailResult = dataStatisticalOpenFeignClient.getPatrolDetailList(midPatrolFormDTO);
         if (detailResult == null || !detailResult.success()) {
             log.error("获取巡查记录明细失败，param:{}", JSON.toJSONString(midPatrolFormDTO));