From 8904f9e6005e7e1f3cc06f415fdcde0033c32332 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 20:33:53 +0800
Subject: [PATCH] art: 技术状态鉴定工单-生成逻辑优化

---
 lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
index 1810ee0..c702b27 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
@@ -203,9 +203,6 @@
     public static String date2Str(SimpleDateFormat dateSdf) {
         synchronized (dateSdf) {
             Date date = getDate();
-            if (null == date) {
-                return null;
-            }
             return dateSdf.format(date);
         }
     }
@@ -691,6 +688,7 @@
         calendar.setTime(getDate());
         return calendar.get(Calendar.YEAR);
     }
+
     public static String getDayStr(Date date) {
         Calendar calendar = getCalendar();
         calendar.setTime(date);// 鎶婂綋鍓嶆椂闂磋祴缁欐棩鍘�
@@ -698,15 +696,16 @@
         String dayStr = day < 10 ? "0" + day : day + "";
         return dayStr;
     }
+
     /**
      * 灏嗗瓧绗︿覆杞垚鏃堕棿
      * @param str
      * @return
      */
-    public static Date parseDatetime(String str){
+    public static Date parseDatetime(String str) {
         try {
             return datetimeFormat.get().parse(str);
-        }catch (Exception e){
+        } catch (Exception e) {
         }
         return null;
     }
@@ -714,7 +713,7 @@
     /**
      * 鑾峰彇鎸囧畾鏃堕棿涔嬪悗鐨勫嚑骞� qsw
      */
-    public static Date getYearAfter(Date data,int number) {
+    public static Date getYearAfter(Date data, int number) {
         Calendar c = Calendar.getInstance();
         c.setTime(data);
         c.add(Calendar.YEAR, number);
@@ -727,7 +726,7 @@
     /**
      * 鑾峰彇鎸囧畾鏃堕棿涔嬪悗鐨勫嚑澶� qsw
      */
-    public static Date getDayAfter(Date data,int number) {
+    public static Date getDayAfter(Date data, int number) {
         Calendar c = Calendar.getInstance();
         c.setTime(data);
         c.add(Calendar.DAY_OF_MONTH, number);
@@ -740,7 +739,7 @@
     /**
      * 鑾峰彇鎸囧畾鏃堕棿涔嬪悗鐨勫嚑鍒嗛挓 qsw
      */
-    public static Date getMinAfter(Date data,int number) {
+    public static Date getMinAfter(Date data, int number) {
         Calendar c = Calendar.getInstance();
         c.setTime(data);
         c.add(Calendar.MINUTE, number);
@@ -751,7 +750,7 @@
     /**
      * 鑾峰彇鎸囧畾鏃堕棿涔嬪悗鐨勫嚑灏忔椂 qsw
      */
-    public static Date getHourAfter(Date data,int number) {
+    public static Date getHourAfter(Date data, int number) {
         Calendar c = Calendar.getInstance();
         c.setTime(data);
         c.add(Calendar.HOUR_OF_DAY, number);
@@ -784,6 +783,16 @@
         return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
     }
 
-
-
+    /**
+     * 鏃ユ湡鍔犲勾
+     * @param date
+     * @param year
+     * @return
+     */
+    public static Date addYear(Date date, int year) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.YEAR, year);
+        return calendar.getTime();
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3