From dcffd347f5ab47d3d158afddb86249fe8bc7e3e7 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期三, 12 七月 2023 13:56:56 +0800
Subject: [PATCH] 扭矩配置导入导出分页列表接口bug修复
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
index 25776c5..18aca87 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
@@ -5,6 +5,7 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.regex.Pattern;
@@ -635,6 +636,25 @@
return list;
}
+ /**
+ * 鑾峰彇start/end鐨勬墍鏈夋棩鏈熷瓧绗︿覆 鏍煎紡yyyyMMdd
+ * @param start
+ * @param end
+ * @return
+ */
+ public static List<String> getDatesStringList2(Date start, Date end) {
+ List<String> list = new ArrayList<>();
+ int i = getDays(start, end);
+ for(int j = 0; j <= i; j++) {
+ if(j == 0) {
+ list.add(format(start, STRDATE));
+ } else {
+ list.add(format(plusTime(start, j), STRDATE));
+ }
+ }
+ return list;
+ }
+
public static List<String> getMonthBetween(Date start, Date end){
List<String> list = new ArrayList<>();
Calendar min = Calendar.getInstance();
@@ -658,6 +678,21 @@
*/
public static Date getShortDate(String dateStr) {
SimpleDateFormat sdf = new SimpleDateFormat(STR_DATE);
+ Date startTime = null;
+ try {
+ startTime = sdf.parse(dateStr);
+ } catch (ParseException e) {
+ }
+ return startTime == null ? removeTime(new Date()) : startTime;
+ }
+
+ /**
+ * 鑾峰彇dateStr鐨勬棩鏈熸牸寮弝yyyMMdd
+ * @param dateStr
+ * @return
+ */
+ public static Date getShortDate2(String dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat(STRDATE);
Date startTime = null;
try {
startTime = sdf.parse(dateStr);
@@ -938,4 +973,14 @@
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sd.format(date);
}
+
+ /**
+ *
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public static List<Date> getWeekDays(LocalDate startDate, LocalDate endDate) {
+ return null;
+ }
}
--
Gitblit v1.9.3