Merge branch 'dev_patrol_stats' into develop

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

@@ -277,8 +277,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         resultList.forEach(re -> {
             String totalTime = "0分钟";
             if (re.getTimeNum() > NumConstant.ZERO) {
-                int hour = re.getTimeNum() / 3600;
+                int num = re.getTimeNum() / 60;
-                int minute = re.getTimeNum() % 3600;
+                int hour = num / 60;
+                int minute = num % 60;
                 totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
             }
             re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
@@ -314,8 +315,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         //personal2.setValue(resultDTO.getTimeNum() / 60 + "分钟");
         String totalTime = "0分钟";
         if (resultDTO.getTimeNum() > NumConstant.ZERO) {
-            int hour = resultDTO.getTimeNum() / 3600;
+            int num = resultDTO.getTimeNum() / 60;
-            int minute = resultDTO.getTimeNum() % 3600;
+            int hour = num / 60;
+            int minute = num % 60;
             totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
         }
         personal2.setValue(totalTime == "" ? "0分钟" : totalTime);