修改：

1.网格员工作统计，巡查时长单位改为h

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java

@@ -22,7 +22,7 @@ public class GridMemberDataAnalysisResultDTO {
 
     // 巡查
     private int patrolTimes;
-    private int totalTime;
+    private double totalTime;
     private int patrolRoutineWorkTimes;
 
 }

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 int totalTime;
+    private double totalTime;
 
     @ExcelProperty(value = {"例行工作次数"})
     private int patrolRoutineWorkTimes;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

@@ -21,6 +21,8 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -143,7 +145,11 @@ public class AggreGridServiceImpl implements AggreGridService {
                     GridMemberDataAnalysisResultDTO data = gridAndData.get(d.getGridId());
                     if (data != null) {
                         data.setPatrolTimes(d.getPatrolTimes());
-                        data.setTotalTime(d.getTotalTime());
+
+                        // 巡查时长，转为h为单位
+                        double f = ((double)d.getTotalTime()) / 3600;
+                        BigDecimal h = new BigDecimal(f).setScale(2, RoundingMode.HALF_UP);
+                        data.setTotalTime(h.doubleValue());
                         data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes());
                     }
                 }