From 22139031145838326262323b61d61ecc46617397 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 17 五月 2024 14:25:41 +0800
Subject: [PATCH] 完善协议实现代码

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 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 be8a88a..8e97a16 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
@@ -415,16 +415,29 @@
 	}
 	public static Integer week_Int(){
 		String str = week_Str() ;
-		return switch (str) {
-			case "Mon" -> 1;
-			case "Tue" -> 2;
-			case "Wed" -> 3;
-			case "Thu" -> 4;
-			case "Fri" -> 5;
-			case "Sat" -> 6;
-			case "Sun" -> 7;
-			default -> 0;
-		};
+		if(str.startsWith("鍛�")){
+			return switch (str) {
+				case "鍛ㄤ竴" -> 1;
+				case "鍛ㄤ簩" -> 2;
+				case "鍛ㄤ笁" -> 3;
+				case "鍛ㄥ洓" -> 4;
+				case "鍛ㄤ簲" -> 5;
+				case "鍛ㄥ叚" -> 6;
+				case "鍛ㄤ竷" -> 7;
+				default -> 0;
+			};
+		}else{
+			return switch (str) {
+				case "Mon" -> 1;
+				case "Tue" -> 2;
+				case "Wed" -> 3;
+				case "Thu" -> 4;
+				case "Fri" -> 5;
+				case "Sat" -> 6;
+				case "Sun" -> 7;
+				default -> 0;
+			};
+		}
 	}
 	/**
 	 * 涓や釜鏃ユ湡闂寸浉宸閽熸暟
@@ -1568,13 +1581,7 @@
 		String[] s = new String[3] ;
 		s[0] = ymd.substring(0 , 4) ;
 		s[1] = ymd.substring(5 , 7) ;
-		if(s[1].charAt(0) == '0'){
-			s[1] = s[1].substring(1) ;
-		}
 		s[2] = ymd.substring(8,10) ;
-		if(s[2].charAt(0) == '0'){
-			s[2] = s[2].substring(1) ;
-		}
 		return s ;
 	}
 	/**

--
Gitblit v1.8.0