From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
index 426f239..13cd0dd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
@@ -49,7 +49,7 @@
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, year);
- calendar.set(Calendar.MONTH, month);
+ calendar.set(Calendar.MONTH, month-1);
Date currYearFirst = calendar.getTime();
return formatDate(currYearFirst);
}
@@ -63,7 +63,7 @@
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, year);
- calendar.set(Calendar.MONTH, month);
+ calendar.set(Calendar.MONTH, month-1);
calendar.roll(Calendar.DAY_OF_MONTH, -1);
Date currYearLast = calendar.getTime();
@@ -75,6 +75,6 @@
Calendar date = Calendar.getInstance();
int year = date.get(Calendar.YEAR);
int month = date.get(Calendar.MONTH);
- System.out.println(getMonthLast(year,month));
+ System.out.println(getMonthLast(year,2));
}
}
--
Gitblit v1.9.2