From a885b707a7230ff8c2f9ab5eaf99a0e3b8120d67 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sun, 8 Dec 2024 01:24:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/utils/DateUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index b0bb4ff..c1dfa24 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -233,12 +233,17 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils // 方法三：使用Calendar类计算年龄差距 int ageInYears = currentDate.get(Calendar.YEAR) - birthdayDate.get(Calendar.YEAR); + int ageInMonths = currentDate.get(Calendar.MONTH) - birthdayDate.get(Calendar.MONTH); + if (birthdayDate.get(Calendar.MONTH) > currentDate.get(Calendar.MONTH) || (birthdayDate.get(Calendar.MONTH) == currentDate.get(Calendar.MONTH) && birthdayDate.get(Calendar.DATE) > currentDate.get(Calendar.DATE))) { ageInYears--; } - return ageInYears + "周岁"; + if(ageInMonths<0){ + ageInMonths+=12; + } + return ageInYears + "周岁"+ageInMonths+"月"; }