From dd15f7f00e9eda3b15bd956ff830ccbe78752a4f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 20 五月 2024 17:11:07 +0800
Subject: [PATCH] 田间灌溉项目管理 项目模块 解决分页问题、增加创建时间字段、解决地址ID不一致问题 灌溉单元模块 创建Ctrl SV mapper 实体类
---
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