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/DataStatisticsController.java | 124 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 33aa8cc..8714eb4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -228,9 +228,20 @@
}
}
// 超级管理员 查询所有任务列表
- 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));
@@ -459,18 +470,23 @@
list.addAll(taskList);
}
list = list.stream().distinct().collect(Collectors.toList());
- map.put("timeoutWarn", list.stream().filter(task -> task.getStatus() == 2).count());
+ int timeoutWarn = 0;
int unqualifiedWarn = 0;
List<TEarlyWarning> earlyWarnings = earlyWarningService.list(Wrappers.lambdaQuery(TEarlyWarning.class));
if(CollectionUtils.isEmpty(earlyWarnings)){
map.put("unqualifiedWarn", unqualifiedWarn);
}else {
// 将earlyWarnings列表的taskId用逗号拼接
- String taskIds = earlyWarnings.stream().map(TEarlyWarning::getTaskId).collect(Collectors.joining(","));
- for (TTask task : list) {
- if(taskIds.contains(task.getId())){
- unqualifiedWarn++;
- }
+ List<TEarlyWarning> timeoutWarnList = earlyWarnings.stream().filter(e -> e.getWarningType() == 1).collect(Collectors.toList());
+ for (TEarlyWarning earlyWarning : timeoutWarnList) {
+ List<TTask> timeoutWarnTasks = list.stream().filter(task -> earlyWarning.getTaskId().contains(task.getId())).collect(Collectors.toList());
+ timeoutWarn = timeoutWarn + timeoutWarnTasks.size();
+ }
+ map.put("timeoutWarn", timeoutWarn);
+ List<TEarlyWarning> unqualifiedWarnList = earlyWarnings.stream().filter(e -> e.getWarningType() == 2).collect(Collectors.toList());
+ for (TEarlyWarning earlyWarning : unqualifiedWarnList) {
+ List<TTask> unqualifiedWarnTasks = list.stream().filter(task -> earlyWarning.getTaskId().contains(task.getId())).collect(Collectors.toList());
+ unqualifiedWarn = unqualifiedWarn + unqualifiedWarnTasks.size();
}
map.put("unqualifiedWarn", unqualifiedWarn);
}
@@ -489,7 +505,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));
@@ -514,18 +540,23 @@
list.addAll(taskList);
}
list = list.stream().distinct().collect(Collectors.toList());
- map.put("timeoutWarn", list.stream().filter(task -> task.getStatus() == 2).count());
+ int timeoutWarn = 0;
int unqualifiedWarn = 0;
List<TEarlyWarning> earlyWarnings = earlyWarningService.list(Wrappers.lambdaQuery(TEarlyWarning.class));
if(CollectionUtils.isEmpty(earlyWarnings)){
map.put("unqualifiedWarn", unqualifiedWarn);
}else {
// 将earlyWarnings列表的taskId用逗号拼接
- String taskIds = earlyWarnings.stream().map(TEarlyWarning::getTaskId).collect(Collectors.joining(","));
- for (TTask task : list) {
- if(taskIds.contains(task.getId())){
- unqualifiedWarn++;
- }
+ List<TEarlyWarning> timeoutWarnList = earlyWarnings.stream().filter(e -> e.getWarningType() == 1).collect(Collectors.toList());
+ for (TEarlyWarning earlyWarning : timeoutWarnList) {
+ List<TTask> timeoutWarnTasks = list.stream().filter(task -> earlyWarning.getTaskId().contains(task.getId())).collect(Collectors.toList());
+ timeoutWarn = timeoutWarn + timeoutWarnTasks.size();
+ }
+ map.put("timeoutWarn", timeoutWarn);
+ List<TEarlyWarning> unqualifiedWarnList = earlyWarnings.stream().filter(e -> e.getWarningType() == 2).collect(Collectors.toList());
+ for (TEarlyWarning earlyWarning : unqualifiedWarnList) {
+ List<TTask> unqualifiedWarnTasks = list.stream().filter(task -> earlyWarning.getTaskId().contains(task.getId())).collect(Collectors.toList());
+ unqualifiedWarn = unqualifiedWarn + unqualifiedWarnTasks.size();
}
map.put("unqualifiedWarn", unqualifiedWarn);
}
@@ -658,7 +689,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));
@@ -951,9 +992,20 @@
sysUsers = sysUserService.selectListByDeptId(deptId);
}
// 超级管理员 查询所有的任务列表
- 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)
@@ -1197,8 +1249,18 @@
// 超级管理员 查询所有的任务列表
List<TTask> taskList = new ArrayList<>();
if(CollectionUtils.isEmpty(query.getProjectId())){
- taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
- .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));
@@ -1259,7 +1321,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);
@@ -1359,7 +1431,13 @@
List<TTask> tasks = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
.in(TTask::getLocationId, locationIds));
+ // 查询片区负责人
+// List<SysUser> users = sysUserService.selectUserByNickName("片区负责人");
+
for (TLocation tLocation : locationList) {
+// if(!CollectionUtils.isEmpty(users)){
+//
+// }
long count = tasks.stream().filter(task -> task.getLocationId().equals(tLocation.getId())).count();
tLocation.setTaskNum(count);
}
@@ -1375,6 +1453,12 @@
TLocationStatisticsVO locationStatisticsVO = new TLocationStatisticsVO();
BeanUtils.copyProperties(location, locationStatisticsVO);
+ // 查询点位类型
+ TLocationType locationType = locationTypeService.getById(location.getLocationType());
+ if(Objects.nonNull(locationType)){
+ locationStatisticsVO.setLocationIcon(locationType.getLocationIcon());
+ }
+
List<TTask> list = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)
.eq(TTask::getLocationId, query.getLocationId()));
// 总数
--
Gitblit v1.7.1