From 0923c2a6f1a7b4d28e39f566f9ff27557e2bf250 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 三月 2026 14:57:29 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 5d56e06..2264aba 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
@@ -14,6 +14,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@Api(tags = "数据大屏")
@@ -63,9 +64,9 @@
*/
@ApiOperation(value = "获取组织人员列表")
@GetMapping(value = "/largeUserList")
- public R<List<TLargeUser>> largeUserList(@RequestParam String deptId) {
+ public R<List<TLargeUser>> largeUserList(String deptId) {
List<TLargeUser> list = largeUserService.list(Wrappers.lambdaQuery(TLargeUser.class)
- .eq(TLargeUser::getDeptId, deptId)
+ .eq(Objects.nonNull(deptId),TLargeUser::getDeptId, deptId)
.orderByDesc(TLargeUser::getCreateTime));
return R.ok(list);
}
@@ -138,6 +139,12 @@
// 重点人数
long keyCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
.eq(TLargeKeyGridUser::getUserType, 1));
+ List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
+ .eq(TLargeKeyPersonnelType::getShowType, 1));
+ if(!CollectionUtils.isEmpty(list)){
+ int sum = list.stream().filter(e->Objects.nonNull(e.getShowNumber())).mapToInt(TLargeKeyPersonnelType::getShowNumber).sum();
+ keyCount += sum;
+ }
// 网格人数
long gridCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
.eq(TLargeKeyGridUser::getUserType, 2));
--
Gitblit v1.7.1