保洁巡检
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
13 小时以前 25b19e60e004290531f61fdf608d1adb5e531903 
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java


@@ -41,6 +41,7 @@


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.LocalTime;


import java.time.format.DateTimeFormatter;


import java.util.*;


import java.util.stream.Collectors;




@@ -106,6 +107,7 @@


        TSystemBulletin systemBulletin = systemBulletinService.lambdaQuery().eq(TSystemBulletin::getStatus, 1).last("limit 1").one();


        return R.ok(systemBulletin);


    }






    @ApiOperation(value = "首页-数据概览-更多")


    @PostMapping(value = "/dataReport")


@@ -186,8 +188,10 @@


            // 获取今天凌晨00:00:00 和今天23:59:59 类型为LocalDateTime


            LocalDateTime startOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);


            LocalDateTime endOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);


            tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, startOfToday);


            tTaskLambdaQueryWrapper.le(TTask::getImplementTime, endOfToday);


            String startOfTodayStr = startOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


            String endOfTodayStr = endOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


            tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, startOfTodayStr);


            tTaskLambdaQueryWrapper.le(TTask::getImplementTime, endOfTodayStr);


        }


//        tTaskLambdaQueryWrapper.ne(TTask::getStatus, 1);


        List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);


@@ -336,8 +340,10 @@


        // 获取今天凌晨00:00:00 和今天23:59:59 类型为LocalDateTime


        LocalDateTime startOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);


        LocalDateTime endOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);


        String startOfTodayStr = startOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


        String endOfTodayStr = endOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


        List<TTask> taskToday = taskCleanerService.lambdaQuery()


                .between(TTask::getImplementTime, startOfToday, endOfToday)


                .between(TTask::getImplementTime, startOfTodayStr, endOfTodayStr)


                .eq(TTask::getPatrolInspector, userId).list();


        List<SysUser> sysUsers = sysUserService.selectAllList();


        SysUser sysUser = sysUserService.selectUserById(userId);