From b85427676fedd373e955f24627764b8e5a29c816 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 三月 2024 17:10:28 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/util/DateUtil.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/DateUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/DateUtil.java
index b890d08..bc2fb8c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/DateUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/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) {
@@ -241,7 +241,7 @@
/**
* 得到n天之后的日期
*/
- public static String getAfterDayDate2(Date date,String days) {
+ public static String getAfterDayDate2(Date date, String days) {
int daysInt = Integer.parseInt(days);
Calendar canlendar = Calendar.getInstance(); // java.util包
@@ -304,6 +304,7 @@
Calendar cal = Calendar.getInstance();
return cal;
}
+
/**
* 毫秒转日期时间
*
@@ -350,6 +351,7 @@
/**
* 计算年龄
+ *
* @param birthDate
* @return
*/
@@ -373,9 +375,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