无关风月
2025-07-03 830bc1621fa7dc468c95ce56082a10343c0b830b
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -305,10 +305,9 @@
        Long userId = tokenService.getLoginUser().getUserId();
        TaskSituationVO taskSituationVO = new TaskSituationVO();
        LambdaQueryWrapper<TTask> wrapper = new LambdaQueryWrapper<>();
        if(StringUtils.isEmpty(query.getStartTime()) || StringUtils.isNotEmpty(query.getEndTime())){
        if(StringUtils.isEmpty(query.getStartTime()) || StringUtils.isEmpty(query.getEndTime())){
            LocalDate now = LocalDate.now();
            String startTime = now.minusDays(6) + " 00:00:00";
            String endTime = now + " 23:59:59";
@@ -986,6 +985,7 @@
            List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
                    .in(TTaskDetail::getTaskId, taskIds)
                    .eq(TTaskDetail::getClearStatus, 2)
                            .eq(TTaskDetail::getHandleType,1)
                    .orderByDesc(TTaskDetail::getCreateTime));
            List<TTaskDetail> taskDetailList = new ArrayList<>();
            for (TTask task : list) {