From 48117eb5d4f4786d817a3e76932e9b829a8a1bd8 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 14:47:44 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BusAttendanceServiceImpl.java | 18 +++++++++++-------
 .../service/BigScreenWebSocketServer.java      |  6 +++---
 2 files changed, 14 insertions(+), 10 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 a47f1105..d4709dec 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
@@ -2842,7 +2842,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 = 0L; //总人数
+        Long zrs; //总人数
         Long cqr = 0L; //出勤人数
         BigDecimal cql = BigDecimal.ZERO; //出勤率
         //查询此项目的所有人员
@@ -2875,8 +2875,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         for (RyglWebSocketVo vo : fbList) {
             if (vo.getZrs()>0){
                 vo.setDgl(
-                    //到岗人数/总人数 四舍五入 一位小数
-                    BigDecimal.valueOf(vo.getDgrs()).divide(BigDecimal.valueOf(vo.getZrs()), 1, RoundingMode.HALF_UP)
+                    //到岗人数/总人数 四舍五入 2位小数
+                    BigDecimal.valueOf(vo.getDgrs()).divide(BigDecimal.valueOf(vo.getZrs()), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100))
                 );
             }else {
                 vo.setDgl(BigDecimal.ZERO);
@@ -2887,8 +2887,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         for (RyglWebSocketVo vo : bzList) {
             if (vo.getZrs()>0){
                 vo.setDgl(
-                    //到岗人数/总人数 四舍五入 一位小数
-                    BigDecimal.valueOf(vo.getDgrs()).divide(BigDecimal.valueOf(vo.getZrs()), 1, RoundingMode.HALF_UP)
+                    //到岗人数/总人数 四舍五入 2位小数
+                    BigDecimal.valueOf(vo.getDgrs()).divide(BigDecimal.valueOf(vo.getZrs()), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100))
                 );
             }else {
                 vo.setDgl(BigDecimal.ZERO);
@@ -2897,12 +2897,16 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
 //            zrs = zrs + vo.getZrs();
         }
 
+        //总人数
+        zrs = (long) list.size() * timeType;
+        //总出勤人
+        cqr = fbcqr + bzcqr;
         //出勤率
-        zrs = (long) list.size();
         if (zrs != 0L){
-            cql = (BigDecimal.valueOf(fbcqr).add(BigDecimal.valueOf(bzcqr))).divide(BigDecimal.valueOf(zrs),1,RoundingMode.HALF_UP);
+            cql = (BigDecimal.valueOf(fbcqr).add(BigDecimal.valueOf(bzcqr))).divide(BigDecimal.valueOf(zrs),2,RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
 
+
         map.put("zrs", zrs.toString()); //总人数
         map.put("cqr", cqr.toString()); //出勤人数
         map.put("cql", cql.toString()); //出勤率
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java
index dd8599a7..353a2f70 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java
@@ -240,15 +240,15 @@ public class BigScreenWebSocketServer {
             case 1:
                 break;
             case 2:
-                int timeType = Math.toIntExact((Long) JSONUtil.parseObj(message).get("timeType"));
+                String timeType = JSONUtil.parseObj(message).get("timeType").toString();
                 //判断参数
-                if (timeType != 1L && timeType != 2L && timeType != 3L) {
+                if (Long.parseLong(timeType) != 1L && Long.parseLong(timeType) != 2L && Long.parseLong(timeType) != 3L) {
                     throw new RuntimeException("时间类型参数错误");
                 }
                 //先获取左边坐标得到map
                 Map<String, String> infoData = busAttendanceService.getRyglOnlineUserInfoData(projectId);
                 //获取右边数据
-                busAttendanceService.getAttendanceInfo(projectId, (long) timeType, infoData);
+                busAttendanceService.getAttendanceInfo(projectId, Long.valueOf(timeType) , infoData);
                 //返回数据
                 maps.add(infoData);
                 break;