From 946dc71d5679974538986e38f19c48bb2d1bdcae Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 18:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java | 129 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
index 5501de8..ee8099d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -262,7 +262,17 @@
// 超级管理员 查询所有的任务列表
List<TTask> taskList = new ArrayList<>();
if(CollectionUtils.isEmpty(query.getProjectId())){
- taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class));
+ // 查询点位类型
+ 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));
@@ -463,8 +473,18 @@
// 超级管理员 查询所有的任务列表
List<TTask> taskList = new ArrayList<>();
if(CollectionUtils.isEmpty(query.getProjectId())){
- taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
- .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));
@@ -537,7 +557,17 @@
List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList());
List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
.in(TTaskDetail::getTaskId, taskIds)
+ .eq(TTaskDetail::getHandleType,1)
.orderByDesc(TTaskDetail::getCreateTime));
+ taskDetails = new ArrayList<>(taskDetails.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
int qualifiedWarn = 0;
for (TTask task : list) {
TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null);
@@ -596,6 +626,9 @@
String startTime = LocalDate.now() + " 00:00:00";
String endTime = LocalDate.now() + " 23:59:59";
// wrapper.between(TTask::getImplementTime, startTime, endTime);
+
+ List<TTask> result = new ArrayList<>();
+
if (userId != 1L) {
// 查询点位类型
if(StringUtils.isNotEmpty(query.getLocationTypeId())){
@@ -678,6 +711,20 @@
}
}
+ for (TTask task : list) {
+ TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null);
+ if(Objects.nonNull(tLocation)) {
+ task.setLocationName(tLocation.getLocationName());
+ }
+ }
+
+ for (TEarlyWarning earlyWarning : earlyWarnings) {
+ List<TTask> tTasks = list.stream().filter(task -> earlyWarning.getTaskId().contains(task.getId())).collect(Collectors.toList());
+ tTasks.forEach(task -> {
+ task.setWarningType(earlyWarning.getWarningType());
+ });
+ result.addAll(tTasks);
+ }
// List<TTask> result = list.stream().filter(task -> task.getStatus() == 2).collect(Collectors.toList());
// List<TTask> tasks = list.stream().filter(task -> task.getStatus() == 1 || task.getStatus() == 2).collect(Collectors.toList());
// if(CollectionUtils.isEmpty(tasks)){
@@ -701,13 +748,7 @@
// }
// }
// }
-// for (TTask task : result) {
-// TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null);
-// if(Objects.nonNull(tLocation)) {
-// task.setLocationName(tLocation.getLocationName());
-// }
-// }
- return R.ok(list);
+ return R.ok(result);
}else {
// 超级管理员
// 查询点位类型
@@ -721,9 +762,19 @@
}
}
// 超级管理员 查询所有的任务列表
- List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
- .between(TTask::getImplementTime, startTime, endTime));
+ List<TTask> taskList = new ArrayList<>();
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));
+ }
+ }
// 查询所有项目部的任务列表
List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
.eq(TProjectDept::getStatus, 1));
@@ -767,6 +818,21 @@
}
}
+ for (TTask task : list) {
+ TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null);
+ if(Objects.nonNull(tLocation)) {
+ task.setLocationName(tLocation.getLocationName());
+ }
+ }
+
+ for (TEarlyWarning earlyWarning : earlyWarnings) {
+ List<TTask> tTasks = list.stream().filter(task -> earlyWarning.getTaskId().contains(task.getId())).collect(Collectors.toList());
+ tTasks.forEach(task -> {
+ task.setWarningType(earlyWarning.getWarningType());
+ });
+ result.addAll(tTasks);
+ }
+
// List<TTask> result = list.stream().filter(task -> task.getStatus() == 2).collect(Collectors.toList());
// List<TTask> tasks = list.stream().filter(task -> task.getStatus() == 1 || task.getStatus() == 2).collect(Collectors.toList());
// if(CollectionUtils.isEmpty(tasks)){
@@ -796,7 +862,7 @@
// task.setLocationName(tLocation.getLocationName());
// }
// }
- return R.ok(list);
+ return R.ok(result);
}
}
@@ -894,7 +960,17 @@
// 超级管理员 查询所有的任务列表
List<TTask> taskList = new ArrayList<>();
if(CollectionUtils.isEmpty(query.getProjectId())){
- taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class));
+ // 查询点位类型
+ 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));
@@ -1054,7 +1130,17 @@
// 超级管理员 查询所有的任务列表
List<TTask> taskList = new ArrayList<>();
if(CollectionUtils.isEmpty(query.getProjectId())){
- taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class));
+ // 查询点位类型
+ 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));
@@ -1229,6 +1315,7 @@
analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());
analysisUnqualifiedCleaningDetailVOS.add(analysisUnqualifiedCleaningDetailVO);
}
+ analysisUnqualifiedCleaningDetailVOS.sort(Comparator.comparingInt(AnalysisUnqualifiedCleaningDetailVO::getCount).reversed());
analysisUnqualifiedCleaningVO.setAnalysisUnqualifiedCleaningDetailVOS(analysisUnqualifiedCleaningDetailVOS);
}else {
// 超级管理员
@@ -1245,7 +1332,17 @@
// 超级管理员 查询所有的任务列表
List<TTask> taskList = new ArrayList<>();
if(CollectionUtils.isEmpty(query.getProjectId())){
- taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class));
+ // 查询点位类型
+ 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));
--
Gitblit v1.7.1