点检添加周报校验

Lius

2025-07-12 60e43e1bc0785a7151fd050b20b04f2047df2727

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java

@@ -1099,8 +1099,8 @@
        // 获取本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);

        // 转换回 java.sql.Date 类型
        return java.sql.Date.valueOf(firstDayOfWeek);
        // 转换回 Date 类型
        return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    /**
@@ -1116,8 +1116,8 @@
        // 获取本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);

        // 转换回 java.sql.Date 类型
        return java.sql.Date.valueOf(firstDayOfWeek);
        // 转换回 Date 类型
        return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    /**
@@ -1128,11 +1128,11 @@
        // 将 java.util.Date 转换为 LocalDate
        LocalDate localDate = LocalDate.parse(date);

        // 获取本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
        // 获取本周第一天（周日）
        LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);

        // 转换回 java.sql.Date 类型
        return java.sql.Date.valueOf(firstDayOfWeek);
        // 转换回 Date 类型
        return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    /**
@@ -1144,10 +1144,21 @@
        LocalDate localDate = date.toInstant()
                .atZone(ZoneId.systemDefault())
                .toLocalDate();
        // 获取本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
        // 获取本周第一天（周日）
        LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);

        // 转换回 java.sql.Date 类型
        return java.sql.Date.valueOf(firstDayOfWeek);
        // 转换回 Date 类型
        return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    public static boolean isSameDay(Date date1, Date date2) {
        if (date1 == null || date2 == null) {
            return false;
        }

        LocalDate localDate1 = date1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
        LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();

        return localDate1.equals(localDate2);
    }
}