From 72b44903c7d09fa2480b94597b141415a2534639 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 18 一月 2022 13:24:57 +0800
Subject: [PATCH] Merge branch 'master' into yibin
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index 4e2cf8a..32e88b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -26,6 +26,7 @@
public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
public static SimpleDateFormat format_yyymmdd = new SimpleDateFormat("yyyyMMdd");
public static SimpleDateFormat format_yyyy = new SimpleDateFormat("yyyy");
+ public static SimpleDateFormat format_yyyyMMddHHmmss = new SimpleDateFormat("yyyyMMddHHmmss");
private static DateTimeFormatter format_ymdhmssss = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
private static DateTimeFormatter format_ymds = DateTimeFormatter.ofPattern("yyyyMMdd");
private static DateTimeFormatter format_yms = DateTimeFormatter.ofPattern("yyyyMM");
@@ -818,6 +819,26 @@
}
/**
+ * 计算剩余天数，不足一天按一天算
+ * @param expireDate
+ * @return
+ */
+ public static int retrieveRemainingDays(Date expireDate) {
+ Date nowDate = new Date();
+ Calendar startDate = Calendar.getInstance();
+ startDate.setTime(nowDate);
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(expireDate);
+ Calendar date = (Calendar) startDate.clone();
+ int daysBetween = 0;
+ while (date.before(endDate)) {
+ date.add(Calendar.DAY_OF_MONTH, 1);
+ daysBetween++;
+ }
+ return daysBetween;
+ }
+
+ /**
* 获取当前月第一天
*
* @return
--
Gitblit v1.7.1