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+"月"; }