From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 deddc1a..88163a6 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
@@ -2,6 +2,7 @@
import lombok.extern.slf4j.Slf4j;
+import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
@@ -617,6 +618,32 @@
return newTime;
}
+ public static boolean isValidDate(String str) {
+ boolean convertSuccess=true;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+ try {
+ format.setLenient(false);
+ format.parse(str);
+ } catch (ParseException e) {
+ convertSuccess=false;
+ }
+ return convertSuccess;
+ }
+
+ public static Date toValidDate(String str) {
+ Date date = null;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+ try {
+ format.setLenient(false);
+ date = format.parse(str);
+ } catch (ParseException e) {
+ log.error("党员导入日期格式错误");
+ date = new Date();
+ }
+ return date;
+ }
+
+
/**
* 将日期对象格式化成yyyy-MM-dd格式的字符串
*
@@ -719,12 +746,10 @@
-
public static void main(String[]args)throws Exception{
// Date date= new Date();
// Date after = new Date();
// System.out.println(calTimeDifference(date,after));
- System.out.println(getYearMonthStart(2021,2));
}
}
--
Gitblit v1.7.1