wangbo 4 years ago
parent
commit
a57ae83095
1 changed files with 7 additions and 0 deletions
  1. 7 0
      sms_water/src/main/java/com/huaxu/controller/SceneController.java

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

@@ -225,6 +225,9 @@ public class SceneController {
             @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
+
+        LocalDate localDate = LocalDate.now();
+
         LoginUser loginUser = UserUtil.getCurrentUser();
         SceneEntity sceneEntity = new SceneEntity();
         sceneEntity.setTenantId(loginUser.getTenantId());
@@ -238,6 +241,10 @@ public class SceneController {
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);
                 days =getDaysOfMonth(startDate);
+                if(localDate.getYear() == Integer.parseInt(startDate.substring(0,4))&&
+                localDate.getMonthValue() == Integer.parseInt(startDate.substring(5,7))){
+                    days = localDate.getDayOfMonth();
+                }
                 break;
             case 1:
                 days =LocalDate.of(Integer.parseInt(startDate),1,1).lengthOfYear();