bug修改

xuhy

1 天以前 e9db31e49c790aff85a5ebe20dbb425ae59d6913

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java

@@ -260,19 +260,20 @@
                map.put("totalLocationNum", locationList.size());
            }
            // 超级管理员 查询所有的任务列表
            List<TTask> taskList = new ArrayList<>();
            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .in(TTask::getPatrolInspector, userId));
            if(CollectionUtils.isEmpty(query.getProjectId())){
                // 查询点位类型
                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
                    // 查询点位
                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                            .in(TLocation::getLocationType, query.getLocationTypeId()));
                    if(!CollectionUtils.isEmpty(locationList)){
                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                                .in(TTask::getLocationId, locationIds));
                    }
                }
//                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
//                    // 查询点位
//                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
//                            .in(TLocation::getLocationType, query.getLocationTypeId()));
//                    if(!CollectionUtils.isEmpty(locationList)){
//                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
//                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
//                                .in(TTask::getLocationId, locationIds));
//                    }
//                }
                // 查询所有项目部的任务列表
                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .eq(TProjectDept::getStatus, 1));
@@ -471,20 +472,21 @@
                }
            }
            // 超级管理员 查询所有的任务列表
            List<TTask> taskList = new ArrayList<>();
            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .in(TTask::getPatrolInspector, userId));
            if(CollectionUtils.isEmpty(query.getProjectId())){
                // 查询点位类型
                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
                    // 查询点位
                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                            .in(TLocation::getLocationType, query.getLocationTypeId()));
                    if(!CollectionUtils.isEmpty(locationList)){
                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                                .in(TTask::getLocationId, locationIds)
                                .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime()));
                    }
                }
//                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
//                    // 查询点位
//                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
//                            .in(TLocation::getLocationType, query.getLocationTypeId()));
//                    if(!CollectionUtils.isEmpty(locationList)){
//                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
//                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
//                                .in(TTask::getLocationId, locationIds)
//                                .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime()));
//                    }
//                }
                // 查询所有项目部的任务列表
                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .eq(TProjectDept::getStatus, 1));
@@ -762,19 +764,20 @@
                }
            }
            // 超级管理员 查询所有的任务列表
            List<TTask> taskList = new ArrayList<>();
            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .in(TTask::getPatrolInspector, userId));
            if(CollectionUtils.isEmpty(query.getProjectId())){
                // 查询点位类型
                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
                    // 查询点位
                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                            .in(TLocation::getLocationType, query.getLocationTypeId()));
                    if(!CollectionUtils.isEmpty(locationList)){
                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                                .in(TTask::getLocationId, locationIds).between(TTask::getImplementTime, startTime, endTime));
                    }
                }
//                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
//                    // 查询点位
//                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
//                            .in(TLocation::getLocationType, query.getLocationTypeId()));
//                    if(!CollectionUtils.isEmpty(locationList)){
//                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
//                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
//                                .in(TTask::getLocationId, locationIds).between(TTask::getImplementTime, startTime, endTime));
//                    }
//                }
                // 查询所有项目部的任务列表
                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .eq(TProjectDept::getStatus, 1));
@@ -958,19 +961,20 @@
                }
            }
            // 超级管理员 查询所有的任务列表
            List<TTask> taskList = new ArrayList<>();
            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .in(TTask::getPatrolInspector, userId));
            if(CollectionUtils.isEmpty(query.getProjectId())){
                // 查询点位类型
                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
                    // 查询点位
                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                            .in(TLocation::getLocationType, query.getLocationTypeId()));
                    if(!CollectionUtils.isEmpty(locationList)){
                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                                .in(TTask::getLocationId, locationIds));
                    }
                }
//                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
//                    // 查询点位
//                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
//                            .in(TLocation::getLocationType, query.getLocationTypeId()));
//                    if(!CollectionUtils.isEmpty(locationList)){
//                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
//                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
//                                .in(TTask::getLocationId, locationIds));
//                    }
//                }
                // 查询所有项目部的任务列表
                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .eq(TProjectDept::getStatus, 1));
@@ -1128,19 +1132,20 @@
                }
            }
            // 超级管理员 查询所有的任务列表
            List<TTask> taskList = new ArrayList<>();
            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .in(TTask::getPatrolInspector, userId));
            if(CollectionUtils.isEmpty(query.getProjectId())){
                // 查询点位类型
                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
                    // 查询点位
                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                            .in(TLocation::getLocationType, query.getLocationTypeId()));
                    if(!CollectionUtils.isEmpty(locationList)){
                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                                .in(TTask::getLocationId, locationIds));
                    }
                }
//                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
//                    // 查询点位
//                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
//                            .in(TLocation::getLocationType, query.getLocationTypeId()));
//                    if(!CollectionUtils.isEmpty(locationList)){
//                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
//                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
//                                .in(TTask::getLocationId, locationIds));
//                    }
//                }
                // 查询所有项目部的任务列表
                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .eq(TProjectDept::getStatus, 1));
@@ -1330,19 +1335,20 @@
                }
            }
            // 超级管理员 查询所有的任务列表
            List<TTask> taskList = new ArrayList<>();
            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                    .in(TTask::getPatrolInspector, userId));
            if(CollectionUtils.isEmpty(query.getProjectId())){
                // 查询点位类型
                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
                    // 查询点位
                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
                            .in(TLocation::getLocationType, query.getLocationTypeId()));
                    if(!CollectionUtils.isEmpty(locationList)){
                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
                                .in(TTask::getLocationId, locationIds));
                    }
                }
//                if(StringUtils.isNotEmpty(query.getLocationTypeId())){
//                    // 查询点位
//                    List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)
//                            .in(TLocation::getLocationType, query.getLocationTypeId()));
//                    if(!CollectionUtils.isEmpty(locationList)){
//                        List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList());
//                        taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
//                                .in(TTask::getLocationId, locationIds));
//                    }
//                }
                // 查询所有项目部的任务列表
                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
                        .eq(TProjectDept::getStatus, 1));