From 11b5908d8c8399b93e3b48488133fda82692aa1d Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 10 Oct 2025 21:45:08 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigscreen/service/impl/ProjectBigScreenServiceImpl.java | 1 + .../project/controller/app/BusAttendanceAppController.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java index 949d8afe..6cbb98a2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java @@ -143,6 +143,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService { // 获取施工人员总数 Long count = constructionUserService.lambdaQuery() .eq(SubConstructionUser::getProjectId, projectId) + .eq(SubConstructionUser::getUserRole, "0") .isNotNull(SubConstructionUser::getTeamId) .count(); BigDecimal countDec = BigDecimal.valueOf(count); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java index 4bf0679c..14e13519 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java @@ -128,8 +128,8 @@ public class BusAttendanceAppController extends BaseController { * 获取用户打卡异常记录 */ @GetMapping("/getAbnormalAttendance/{projectId}") - public R> getAbnormalAttendance(@NotNull @PathVariable("projectId") Long projectId){ - return R.ok(attendanceService.getAbnormalAttendance(projectId)); + public TableDataInfo getAbnormalAttendance(@NotNull @PathVariable("projectId") Long projectId, PageQuery pageQuery){ + return attendanceService.getAbnormalAttendance(projectId,pageQuery); } /**