Browse Source

盯盘2.0功能 获取周几函数更改

zhaoxian 4 năm trước cách đây
mục cha
commit
0c76fcdf36

+ 5 - 10
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -1594,21 +1594,16 @@ public class DateUtils extends PropertyEditorSupport {
      */
     public static String getdateFromWeek(int number) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar c = Calendar.getInstance();
-        // 今天是一周中的第几天
-        int dayOfWeek = c.get(Calendar.DAY_OF_WEEK);
+        Calendar calendar = Calendar.getInstance();
 
-        if (c.getFirstDayOfWeek() == Calendar.SUNDAY) {
-            c.add(Calendar.DAY_OF_MONTH, 1);
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+            calendar.add(Calendar.DAY_OF_WEEK, -1);
         }
-        // 计算一周开始的日期
-        c.add(Calendar.DAY_OF_MONTH, -dayOfWeek);
-
         for (int i = 1; i <= 7; i++) {
-            c.add(Calendar.DAY_OF_MONTH, 1);
             if (number == i) {
-                return sdf.format(c.getTime());
+                return sdf.format(calendar.getTime());
             }
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
         }
         return null;
     }