From 7037f0de5c155c027b57380ecfd0925c8001b665 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 17:04:11 +0800
Subject: [PATCH] 同步配置文件

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
index c5c1bc4..76f4ac2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
@@ -423,7 +423,7 @@
 				case "鍛ㄥ洓" -> 4;
 				case "鍛ㄤ簲" -> 5;
 				case "鍛ㄥ叚" -> 6;
-				case "鍛ㄤ竷" -> 7;
+				case "鍛ㄤ竷" -> 0;//鏍规嵁鍗忚瑕佹眰鏄熸湡澶╀负0
 				default -> 0;
 			};
 		}else{
@@ -434,7 +434,7 @@
 				case "Thu" -> 4;
 				case "Fri" -> 5;
 				case "Sat" -> 6;
-				case "Sun" -> 7;
+				case "Sun" -> 0;//鏍规嵁鍗忚瑕佹眰鏄熸湡澶╀负0
 				default -> 0;
 			};
 		}
@@ -501,6 +501,17 @@
 	//////////////////////////////////////////////////////////////////////////
 
 	/**
+	 * 瀛楃涓插瀷鏃ユ湡(2024-12)杞垚骞存湀鏃ユ暟缁�
+	 * @param yyyy_MM 骞存湀鏃�
+	 * @return 骞存湀鏃ユ暟缁�
+	 */
+	public static int[] yyyy_MM_ymdGroup(String yyyy_MM){
+		int y = Integer.parseInt(yyyy_MM.substring(0 , 4)) ;
+		int m = Integer.parseInt(yyyy_MM.substring(5 , 7)) ;
+		return new int[]{y,m} ;
+	}
+
+	/**
 	 * 瀛楃涓插瀷鏃ユ湡(2009-09-10)杞垚骞存湀鏃ユ暟缁�
 	 * @param yyyy_MM_DD 骞存湀鏃�
 	 * @return 骞存湀鏃ユ暟缁�

--
Gitblit v1.8.0