1

13693261870

2024-12-02 453e3471e94b91169beec1e258a06a132d927011

 src/main/java/com/yssh/service/WarningAnalyseService.java

@@ -205,11 +205,23 @@
     */
    public List<Qxsh> selectWeekTop10() {
        Date now = InitConfig.getDate();
        int weekOfYear = DateUtils.getWeekOfYear(now);
        int year = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYY, now));
        Date lastSun = DateUtils.getWeekOfYearForSun(year, weekOfYear);
        Date mon = DateUtils.getAPeriodOfTime(lastSun, 1, Calendar.DATE);
        Date sun = DateUtils.getAPeriodOfTime(lastSun, 7, Calendar.DATE);
        //int weekOfYear = DateUtils.getWeekOfYear(now);
        //int year = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYY, now));
        //Date lastSun = DateUtils.getWeekOfYearForSun(year, weekOfYear);
        //Date mon = DateUtils.getAPeriodOfTime(lastSun, 1, Calendar.DATE);
        //Date sun = DateUtils.getAPeriodOfTime(lastSun, 7, Calendar.DATE);

        Calendar cal = Calendar.getInstance();
        cal.setTime(now);
        int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
        int diff = Calendar.MONDAY - dayOfWeek;
        if (diff > 0) diff -= 7;

        cal.add(Calendar.DAY_OF_MONTH, diff);
        Date mon = cal.getTime();
        cal.add(Calendar.DAY_OF_MONTH, 6);
        Date sun = cal.getTime();

        Integer intMon = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYYMMDD, mon) + "00"); // 2023080700
        Integer intSun = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYYMMDD, sun) + "23"); // 2023081323