修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -74,6 +74,7 @@ public class WorkOrderStatisticsController {
         } else if (statsType == 2) {
             startDate = String.format("%s-01", startDate);
             endDate = String.format("%s-01", endDate);
+            endDate = subMonth(endDate,1);
         }
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
@@ -192,6 +193,7 @@ public class WorkOrderStatisticsController {
                 maintainerCount = userCenterClient.findMaintainerCount(endDate);
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         workOrderManageDto.setStartDate(startDate);
@@ -247,6 +249,7 @@ public class WorkOrderStatisticsController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         workOrderManageDto.setStartDate(startDate);
@@ -280,6 +283,7 @@ public class WorkOrderStatisticsController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         workOrderManageDto.setStartDate(startDate);
@@ -327,6 +331,7 @@ public class WorkOrderStatisticsController {
         } else if (statsType == 2) {
             startDate = String.format("%s-01", startDate);
             endDate = String.format("%s-01", endDate);
+            endDate = subMonth(endDate,1);
         }
         workOrderManageDto.setStartDate(startDate);
         workOrderManageDto.setEndDate(endDate);

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -254,6 +254,7 @@ public class SceneController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 days = differentDaysByMillisecond(startDate,endDate);
                 break;
         }
@@ -324,6 +325,7 @@ public class SceneController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         List<Map<String,Object>> list = new ArrayList<>();
@@ -370,6 +372,7 @@ public class SceneController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         List<Map<String,Object>> list = sceneService.selectAlarmLable(sceneEntity,startDate,endDate,sort);