From 20aa12201dd9aa103720568015be44b9ab3f28bc Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 7 Jan 2022 10:07:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StaffPatrolRecordServiceImpl.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index 6e0e2d5580..9ddd74e7aa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -491,6 +491,11 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		//2.查询网格信息并赋值
 		Map<String, CustomerGridDTO> map = new HashMap<>();
 		for (PcworkRecordListResultDTO.StaffPatrol r : result.getList()) {
+			//秒变小时分钟
+			Integer minutes = r.getTotalTimeNum() / 60;
+			String patrolDuration = (minutes / 60 > 0 ? minutes / 60 + "小时" : "") + (minutes % 60 > 0 ? minutes % 60 + "分钟" : "0分钟");
+			r.setTotalTime(patrolDuration);
+
 			if (map.containsKey(r.getGridId())) {
 				r.setGridName(map.get(r.getGridId()).getGridName());
 				continue;
@@ -512,12 +517,6 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 				r.setGridName(resultGrid.getData().getGridName());
 				map.put(r.getGridId(), resultGrid.getData());
 			}
-
-			//秒变小时分钟
-			Integer minutes = r.getTotalTimeNum() / 60;
-			String patrolDuration = (minutes / 60 > 0 ? minutes / 60 + "小时" : "") + (minutes % 60 > 0 ? minutes % 60 + "分钟" : "0分钟");
-			r.setTotalTime(patrolDuration);
-
 		}
 		//3.封装数据并返回
 		resultDTO.setTotal((int)result.getTotal());