From 4e0b0be90a8bf14a59f4cfee7959534adea24ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 18:45:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
index 5d89022..3c70789 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
@@ -381,6 +381,9 @@
List<TLocation> locations = locationService.list();
LambdaQueryWrapper<TTask> tTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.hasLength(query.getStartTime()) && StringUtils.hasLength(query.getEndTime())) {
+ String endTime = query.getEndTime();
+ String replace = endTime.replace(" 00:00:00", " 23:59:59");
+ query.setEndTime(replace);
tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, query.getStartTime());
tTaskLambdaQueryWrapper.le(TTask::getImplementTime, query.getEndTime());
}
@@ -511,11 +514,15 @@
List<TLocation> locations = locationService.list();
LambdaQueryWrapper<TTask> tTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.hasLength(query.getStartTime()) && StringUtils.hasLength(query.getEndTime())) {
+ String endTime = query.getEndTime();
+ String replace = endTime.replace(" 00:00:00", " 23:59:59");
+ query.setEndTime(replace);
tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, query.getStartTime());
tTaskLambdaQueryWrapper.le(TTask::getImplementTime, query.getEndTime());
}
List<ProjectDeptDetailsVO> res = new ArrayList<>();
List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);
+
List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery().orderByDesc(BaseModel::getCreateTime).list();
List<String> collect = tasks.stream().map(TTask::getProjectId).distinct().collect(Collectors.toList());
List<TProjectDept> projectDepts = projectDeptService.list();
@@ -885,7 +892,7 @@
.divide(new BigDecimal(status4.size()).add(new BigDecimal(status5.size())), 2, RoundingMode.HALF_DOWN)
.multiply(new BigDecimal(100)) : BigDecimal.ZERO);
patrolInspectorVO.setNum10(status6.size());
- patrolInspectorVO.setNum11(!taskList.isEmpty() ? new BigDecimal(status6.size()).divide(new BigDecimal(taskList.size()), 2, RoundingMode.HALF_DOWN) : BigDecimal.ZERO);
+ patrolInspectorVO.setNum11(!taskList.isEmpty() ? new BigDecimal(status6.size()).divide(new BigDecimal(taskList.size()), 2, RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)) : BigDecimal.ZERO);
List<TLeave> collect1 = leaves.stream().filter(e -> e.getLeavePerson().equals(sysUser.getUserId() + "")).collect(Collectors.toList());
patrolInspectorVO.setNum12(collect1.size());
res.add(patrolInspectorVO);
--
Gitblit v1.7.1