wangbo il y a 3 ans
Parent
commit
40225d7a5e

+ 2 - 2
operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -201,7 +201,7 @@ public class WorkOrderStatisticsController {
                 maintainerCount = userCenterClient.findMaintainerCount(String.format("%s-12",startDate));
                 startDate = String.format("%s-01-01", startDate);
                 if(isCurrentYear(startDate)==true){
-                    endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getDayOfMonth()+2);
+                    endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getMonthValue()+1);
                 }
                 else {
                     endDate = subYear(startDate, 1);
@@ -317,7 +317,7 @@ public class WorkOrderStatisticsController {
             case 1:
                 startDate = String.format("%s-01-01", startDate);
                 if(isCurrentYear(startDate)==true){
-                    endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getDayOfMonth()+2);
+                    endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getMonthValue()+1);
                 }
                 else {
                     endDate = subYear(startDate, 1);

+ 1 - 1
sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -339,7 +339,7 @@ public class SceneController {
             case 1:
                 startDate = String.format("%s-01-01", startDate);
                 if(isCurrentYear(startDate)==true){
-                    endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getDayOfMonth()+2);
+                    endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getMonthValue()+1);
                 }
                 else {
                     endDate = subYear(startDate, 1);