修改

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

@@ -190,7 +190,12 @@ public class WorkOrderStatisticsController {
             case 0:
                 maintainerCount = userCenterClient.findMaintainerCount(startDate);
                 startDate = String.format("%s-01", startDate);
-                endDate = subMonth(startDate, 1);
+                if(isCurrentMonth(endDate)==true){
+                    endDate = String.format("%s-%s", startDate.substring(0,7),localDate.getDayOfMonth()+1);
+                }
+                else {
+                    endDate = subMonth(startDate, 1);
+                }
                 break;
             case 1:
                 maintainerCount = userCenterClient.findMaintainerCount(String.format("%s-12",startDate));
@@ -254,7 +259,12 @@ public class WorkOrderStatisticsController {
         switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
-                endDate = subMonth(startDate, 1);
+                if(isCurrentMonth(endDate)==true){
+                    endDate = String.format("%s-%s", startDate.substring(0,7),localDate.getDayOfMonth()+1);
+                }
+                else {
+                    endDate = subMonth(startDate, 1);
+                }
                 break;
             case 1:
                 startDate = String.format("%s-01-01", startDate);
@@ -292,7 +302,12 @@ public class WorkOrderStatisticsController {
         switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
-                endDate = subMonth(startDate, 1);
+                if(isCurrentMonth(endDate)==true){
+                    endDate = String.format("%s-%s", startDate.substring(0,7),localDate.getDayOfMonth()+1);
+                }
+                else {
+                    endDate = subMonth(startDate, 1);
+                }
                 break;
             case 1:
                 startDate = String.format("%s-01-01", startDate);

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

@@ -248,7 +248,14 @@ public class SceneController {
                 }
                 break;
             case 1:
-                days =LocalDate.of(Integer.parseInt(startDate),1,1).lengthOfYear();
+                int year = Integer.parseInt(startDate);
+                if(year == localDate.getYear()){
+                    days = differentDaysByMillisecond(String.format("%s-%s-%s",startDate,1,1),
+                            String.format("%s-%s-%s",localDate.getYear(),localDate.getMonthValue(),localDate.getDayOfMonth()));
+                }
+                else {
+                    days = LocalDate.of(year, 1, 1).lengthOfYear();
+                }
                 startDate = String.format("%s-01-01", startDate);
                 endDate = subYear(startDate, 1);
                 break;
@@ -322,7 +329,12 @@ public class SceneController {
         switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
-                endDate = subMonth(startDate, 1);
+                if(isCurrentMonth(endDate)==true){
+                    endDate = String.format("%s-%s", startDate.substring(0,7),localDate.getDayOfMonth()+1);
+                }
+                else {
+                    endDate = subMonth(startDate, 1);
+                }
                 break;
             case 1:
                 startDate = String.format("%s-01-01", startDate);