Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/DayInfo.java

@@ -6,7 +6,8 @@ import lombok.Data;
 @Data
 public class DayInfo {
     private String date;       // 日期，格式：yyyy-MM-dd
-    private int dayOfWeek;     // 星期几，1-7 (Monday-Sunday)
+    private int dayOfWeekValue;     // 星期几，1-7 (Monday-Sunday)
+    private String dayOfWeek;     // 星期几，1-7 (Monday-Sunday)
     private int type;          // 0-工作日，1-休息日
 
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/AttendanceServiceImpl.java

@@ -194,8 +194,9 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
             for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
                 DayInfo dayInfo = new DayInfo();
                 dayInfo.setDate(date.format(DateTimeFormatter.ISO_LOCAL_DATE));
-                dayInfo.setDayOfWeek(date.getDayOfWeek().getValue()); // 1-7 (Monday-Sunday)
-
+                int value = date.getDayOfWeek().getValue();
+                String dayWeekName = getDayWeekName(value);
+                dayInfo.setDayOfWeek(dayWeekName); // 1-7 (Monday-Sunday)
                 dayInfo.setType(2);//工作日
                 // 判断是否为休息日（周末或自定义假日）
                 if (date.getDayOfWeek() == DayOfWeek.SATURDAY
@@ -209,7 +210,6 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
                 if (workdays.contains(date)){
                     dayInfo.setType(2);//工作日
                 }
-
                 calendar.add(dayInfo);
             }
 
@@ -224,6 +224,34 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
         return msg;
     }
 
+    private static String getDayWeekName(int value) {
+        String dayWeekName="";
+        switch (value) {
+            case 1:
+                dayWeekName="一";
+                break;
+            case 2:
+                dayWeekName="二";
+                break;
+            case 3:
+                dayWeekName="三";
+                break;
+            case 4:
+                dayWeekName="四";
+                break;
+            case 5:
+                dayWeekName="五";
+                break;
+            case 6:
+                dayWeekName="六";
+                break;
+            case 7:
+                dayWeekName="日";
+                break;
+        }
+        return dayWeekName;
+    }
+
     private List<LocalDate> getWorkDays(YearMonth yearMonth) {
         List<LocalDate> workDays = new ArrayList<>();
         LocalDate endOfMonth = yearMonth.atEndOfMonth();