From a4b0ec835e8f8ea0b46db77e35c8048b8f2507fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 17 Dec 2025 20:35:29 +0800
Subject: [PATCH] =?UTF-8?q?12-17-=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E6=B3=A8=E5=85=A5=E7=89=88-=E4=BF=AE=E5=A4=8DtimeType=E7=89=88?=
 =?UTF-8?q?-=E6=B6=88=E6=81=AF=E5=9B=9E=E5=A4=8D-=E5=AE=8C=E5=96=84-?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88-=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E5=8C=85=E5=85=AC=E5=8F=B8=E6=9F=A5=E8=AF=A2=E7=89=88-?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusAttendanceServiceImpl.java        | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
index 2d5b6fb1..bb6b3be2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
@@ -2868,7 +2868,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
     public void getAttendanceInfo(Long projectId,Long timeType,Map<String, String> map){
         //构建数据
         //timeType 1:今天 2:本周 3:本月
-        Long zrs; //总人数
+        Long zrs = 0L; //总人数
         Long cqr = 0L; //出勤人数
         BigDecimal cql = BigDecimal.ZERO; //出勤率
         //查询此项目的所有人员
@@ -2918,7 +2918,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                 vo.setDgl(BigDecimal.ZERO);
             }
             fbcqr = fbcqr + vo.getDgrs();
-//            zrs = zrs + vo.getZrs();
+            zrs = zrs + vo.getZrs();
         }
         for (RyglWebSocketVo vo : bzList) {
             if (vo.getZrs()>0){
@@ -2930,22 +2930,22 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                 vo.setDgl(BigDecimal.ZERO);
             }
             bzcqr = bzcqr + vo.getDgrs();
-//            zrs = zrs + vo.getZrs();
+            zrs = zrs + vo.getZrs();
         }
 
         //总人数
-        if (timeType == 2L) {
-            // 获取本周一到今天的天数
-            LocalDate today = LocalDate.now();
-            LocalDate monday = today.with(DayOfWeek.MONDAY);
-            timeType = ChronoUnit.DAYS.between(monday, today) + 1;
-        } else if (timeType == 3L) {
-            // 获取本月1日到今天的天数
-            LocalDate today = LocalDate.now();
-            LocalDate firstDay = today.withDayOfMonth(1);
-            timeType = ChronoUnit.DAYS.between(firstDay, today) + 1;
-        }
-        zrs = (long) list.size() * timeType;
+//        if (timeType == 2L) {
+//            // 获取本周一到今天的天数
+//            LocalDate today = LocalDate.now();
+//            LocalDate monday = today.with(DayOfWeek.MONDAY);
+//            timeType = ChronoUnit.DAYS.between(monday, today) + 1;
+//        } else if (timeType == 3L) {
+//            // 获取本月1日到今天的天数
+//            LocalDate today = LocalDate.now();
+//            LocalDate firstDay = today.withDayOfMonth(1);
+//            timeType = ChronoUnit.DAYS.between(firstDay, today) + 1;
+//        }
+//        zrs = (long) list.size() * timeType;
         //总出勤人
         cqr = fbcqr + bzcqr;
         //出勤率
@@ -3044,17 +3044,15 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         if (time == 1L) {
             lqw.eq(BusAttendance::getClockDate, LocalDate.now());
         } else if (time == 2L) {
-            // 获取本周一和周日的日期
+            // 获取本周一到今天的日期
             LocalDate today = LocalDate.now();
             LocalDate monday = today.with(DayOfWeek.MONDAY);
-            LocalDate sunday = today.with(DayOfWeek.SUNDAY);
-            lqw.between(BusAttendance::getClockDate, monday, sunday);
+            lqw.between(BusAttendance::getClockDate, monday, today);
         }else if (time == 3L){
-            // 获取本月第一天和最后一天
+            // 获取本月1号到今天的日期
             LocalDate today = LocalDate.now();
             LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth());
-            LocalDate lastDayOfMonth = today.with(TemporalAdjusters.lastDayOfMonth());
-            lqw.between(BusAttendance::getClockDate, firstDayOfMonth, lastDayOfMonth);
+            lqw.between(BusAttendance::getClockDate, firstDayOfMonth, today);
         }
         lqw.in(BusAttendance::getClockStatus, ATTENDANCE_STATUS)
             .apply(" user_id not in (select sys_user_id from sub_construction_user where project_id = {0} and user_role != '0' )", projectId);