From 1bad842a459bc23a9d45253169d3b417866b912f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 16 三月 2023 01:57:52 +0800
Subject: [PATCH] 优化保养转单功能
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 8932162..860c5cc 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -35,6 +35,8 @@
public static final String DATE_FORMATE_STRING_L = "MMdd";
public static final String DATE_FORMATE_STRING_M = "yyyyMM";
public static final String DATE_FORMATE_STRING_N = "HHmmss";
+ public static final String DATE_FORMATE_STRING_O = "yyyyMMddHHmm";
+
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -52,6 +54,7 @@
formats.put("MMdd", new SimpleDateFormat("MMdd"));
formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
formats.put("HHmmss", new SimpleDateFormat("HHmmss"));
+ formats.put("yyyyMMddHHmm", new SimpleDateFormat("yyyyMMddHHmm"));
}
@@ -477,6 +480,15 @@
}
+ public static String getAddHoursStringA(Date date, int hours) {
+ SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_A);
+ Calendar c = Calendar.getInstance();
+ c.setTime(date);
+ c.add(Calendar.HOUR_OF_DAY, hours);
+ return sf.format(c.getTime());
+ }
+
+
public static String getAddMonthStringA(Date date, int month) {
SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_A);
Calendar c = Calendar.getInstance();
@@ -666,4 +678,17 @@
resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).add(preRresMonth).doubleValue();
return resMonth;
}
+
+ /**
+ * 閫氳繃鏃堕棿绉掓绉掓暟鍒ゆ柇涓や釜鏃堕棿鐨勯棿闅�
+ * @param date1
+ * @param date2
+ * @return
+ */
+ public static int differentDaysUp(Date date1,Date date2)
+ {
+ double days = ((date2.getTime() - date1.getTime()) / (1000*3600*24*1.00));
+ return new Double(Math.ceil(days)).intValue();
+ }
+
}
--
Gitblit v1.8.0