From 4f0f60c63bd8042f237411cb8f1a1f17c172055c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 15 Jun 2021 15:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmetuser/impl/EpmetUserServiceImpl.java  | 28 ++++++++++---------
 .../mapper/epmetuser/StaffPatrolRecordDao.xml |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 6e6ef6f957..c89906eb0d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -113,7 +113,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime()));
         List<StaffListResultDTO> staffPatrolList = staffPatrolRecordDao.selectPatrolList(formDTO);
 
-        //5.封装数据并做分页处理
+        //5.封装数据
         result.forEach(re -> {
             staffPatrolList.forEach(st -> {
                 if (re.getGridId().equals(st.getGridId()) && re.getStaffId().equals(st.getStaffId())) {
@@ -123,18 +123,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                 }
             });
         });
-        int num = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-        int size = num + formDTO.getPageSize();
-        if (num > result.size()) {
-            return resultList;
-        }
-        resultList = result.subList(num, (size > result.size() ? result.size() : size));
-
-        //6.赋值网格名称
-        resultList.forEach(re -> list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName())));
-
-        //7.按条件排序并返回
-        Collections.sort(resultList, new Comparator<StaffListResultDTO>() {
+        //6.按条件排序
+        Collections.sort(result, new Comparator<StaffListResultDTO>() {
             @Override
             public int compare(StaffListResultDTO o1, StaffListResultDTO o2) {
                 if ("latestPatrolledTime".equals(formDTO.getSortCode())) {
@@ -145,6 +135,18 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             }
         });
 
+        //7.按分页抽取数据
+        int num = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        int size = num + formDTO.getPageSize();
+        if (num > result.size()) {
+            return resultList;
+        }
+        resultList = result.subList(num, (size > result.size() ? result.size() : size));
+
+        //8.赋值网格名称
+        resultList.forEach(re -> list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName())));
+
+
         return resultList;
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
index 22034f1d13..662ce08625 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
@@ -32,7 +32,7 @@
             AND spr.patrol_start_time <![CDATA[ >= ]]> #{patrolStartTime}
         </if>
         <if test='staffName != "" and staffName != null'>
-            AND cs.real_name LIKE CONCAT('%',#{staffName},'%')
+            AND cs.real_name = #{staffName}
         </if>
         <foreach collection="gridIds" item="gridId" open="AND( " separator=" OR " close=")">
             spr.GRID  = #{gridId}