Merge branch 'dev_routine_work' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java

@@ -47,8 +47,8 @@ public class GridMemberDataAnalysisExcelExportBean {
     @ExcelProperty(value = {"巡查次数"})
     private int patrolTimes;
 
-    @ExcelProperty(value = {"巡查时长(小时)"})
+    @ExcelProperty(value = {"巡查时长"})
-    private double totalTime;
+    private String totalTime;
 
     @ExcelProperty(value = {"例行工作次数"})
     private int patrolRoutineWorkTimes;

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());