From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/util/ActionUtil.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index 257a21c..3b2bd86 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -3,7 +3,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException;
-import com.whyc.pojo.db_user.User;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -18,11 +17,11 @@
import java.lang.reflect.Type;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
+import java.time.LocalDate;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import com.whyc.pojo.db_user.User;
public class ActionUtil {
@@ -417,8 +416,34 @@
} else {//鐩哥瓑
return 0;
}
- }
- /**
+ }
+ //璁＄畻褰撳墠鏈堢殑涓婁竴涓搴﹀勾_鏈堜唤闆嗗悎
+ public static List<String> getLastQuarterYearMonths() {
+ LocalDate currentDate = LocalDate.now();
+ int currentYear = currentDate.getYear();
+ int currentMonth = currentDate.getMonthValue();
+
+ int quarter = (currentMonth - 1) / 3 + 1; // 璁＄畻褰撳墠瀛ｅ害
+ int lastQuarter = quarter - 1; // 涓婁竴瀛ｅ害
+
+ if (lastQuarter == 0) {
+ lastQuarter = 4; // 濡傛灉褰撳墠鏄涓�瀛ｅ害锛屽垯涓婁竴瀛ｅ害涓虹鍥涘搴�
+ }
+
+ List<String> yearMonths = new ArrayList<>();
+ for (int i = 1; i <= 3; i++) {
+ int month = (lastQuarter - 1) * 3 + i;
+ int year = currentYear;
+ // 濡傛灉涓婁竴瀛ｅ害鏄鍥涘搴︼紝鍒欏勾浠介渶瑕佸噺涓�骞�
+ if (lastQuarter == 4) {
+ year = currentYear - 1;
+ }
+ yearMonths.add(year + "_" + (month < 10 ? "0" + month : month)); // 淇濊瘉鏈堜唤涓轰袱浣嶆牸寮�
+ }
+
+ return yearMonths;
+ }
+ /**
* @Description: 鏍规嵁鍥剧墖鍦板潃杞崲涓篵ase64缂栫爜瀛楃涓�
* @Author:
* @CreateTime:
--
Gitblit v1.9.1