From 8af5fb52ec409ab5a9b78fbb1c1a633f4241b585 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Tue, 23 Sep 2025 09:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BA=A7=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=87=BA=E5=8B=A4=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EnterpriseBigScreenController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java index 2b7da484..080a90d7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java @@ -1,6 +1,7 @@ package org.dromara.bigscreen.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import org.dromara.bigscreen.domain.dto.WeatherQueryReq; @@ -217,12 +218,18 @@ public class EnterpriseBigScreenController { // return vo; // }).toList()); ArrayList projectAttendanceCountVos = new ArrayList<>(); + List busProjects = projectService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(BusProject::getPId, 0L).eq(BusProject::getIsDelete,0)); + List projectIds = new ArrayList<>(); + for (BusProject busProject : busProjects) { + projectIds.add(busProject.getId()); + } List list = attendanceService.list(Wrappers.lambdaQuery() .eq(BusAttendance::getClockDate, LocalDate.now()) .in(BusAttendance::getClockStatus, Arrays.asList("1", "2", "3")) + .in(BusAttendance::getProjectId, projectIds) ); - List relevancyList = userProjectRelevancyService.list(); + List relevancyList = userProjectRelevancyService.list(new LambdaQueryWrapper().in(BusUserProjectRelevancy::getProjectId, projectIds)); // 转换为 Map Map projectUserCountMap = relevancyList.stream()