From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/util/DateUtil.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/DateUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/DateUtil.java
index 38365c2..154735c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/DateUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/DateUtil.java
@@ -150,7 +150,7 @@
*/
public static Date parse(String date, String pattern) {
try {
- if(Objects.nonNull(date)) {
+ if (Objects.nonNull(date)) {
return DateUtils.parseDate(date, pattern);
}
} catch (ParseException e) {
@@ -286,6 +286,7 @@
Calendar cal = Calendar.getInstance();
return cal;
}
+
/**
* 毫秒转日期时间
*
@@ -332,6 +333,7 @@
/**
* 计算年龄
+ *
* @param birthDate
* @return
*/
@@ -355,9 +357,13 @@
// 粗计算年龄
int age = yearNow - yearBirth;
// 当前月份小于出生月份年龄减一
- if (monthNow < monthBirth) { age--; }
+ if (monthNow < monthBirth) {
+ age--;
+ }
// 当前月份等于出生月份，日小于生日年龄减一
- else if (monthNow == monthBirth && dayNow < dayBirth) { age--; }
+ else if (monthNow == monthBirth && dayNow < dayBirth) {
+ age--;
+ }
// 返回年龄值
return age;
}
--
Gitblit v1.7.1