From 61c2cdd56aef0cc3006f30a13fc6a8e539f3bc06 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:09:00 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/mapper/BusAttendanceMapper.java   |  6 ++++--
 .../impl/BusAttendanceServiceImpl.java        | 20 +++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java
index 04930bf7..80690984 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java
@@ -9,6 +9,8 @@ import org.dromara.project.domain.BusAttendance;
 import org.dromara.project.domain.bo.BusAttendanceBo;
 import org.dromara.project.domain.vo.BusAttendanceVo;
 
+import java.util.List;
+
 /**
  * 考勤Mapper接口
  *
@@ -20,6 +22,6 @@ public interface BusAttendanceMapper extends BaseMapperPlus<BusAttendance, BusAt
 
     Page<BusAttendanceVo> queryPageList(BusAttendanceBo bo, PageQuery pageQuery);
 
-    @Select("select * from sub_contractor where id = #{id}")
-    SubContractor getSubContractor(Long id);
+    @Select("select * from sub_contractor")
+    List<SubContractor> getSubContractor();
 }
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 2b8e5fcc..2d5b6fb1 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
@@ -2877,6 +2877,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         List<SubConstructionUser> list = constructionUserService.list(lqw);
         //先查询出用户列表
         List<SysUserVo> users = userMapper.selectVoList(Wrappers.lambdaQuery());
+        //查询分包公司用于填充名称
+        List<SubContractor> subContractors = baseMapper.getSubContractor();
         //根据分包和班组的id进行分类 统计都有多少人 未入场人员没有两项数据 无法统计 仅能计算为总数
         List<RyglWebSocketVo> fbList = new ArrayList<>();
         List<RyglWebSocketVo> bzList = new ArrayList<>();
@@ -2893,15 +2895,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             if (sysUserVo == null){
                 continue;
             }
-//            SysUserVo sysUserVo = userService.queryById(constructionUser.getSysUserId());
-//            if (sysUserVo == null){
-//                continue;
-//            }
             //判断userType    app用户类型 0-施工人员 1-管理人员 2-分包人员
             if (sysUserVo.getAppUserType().equals("0")){
-                checkAndSetValue(bzList,constructionUser,0,timeType,projectId);
+                checkAndSetValue(bzList,constructionUser,0,timeType,projectId,subContractors);
             }else if (sysUserVo.getAppUserType().equals("2")){
-                checkAndSetValue(fbList,constructionUser,2,timeType,projectId);
+                checkAndSetValue(fbList,constructionUser,2,timeType,projectId,subContractors);
             }
         }
 
@@ -2966,7 +2964,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
     /**
      * getAttendanceInfo附属方法
      */
-    private void checkAndSetValue(List<RyglWebSocketVo> ryglWebSocketVoList, SubConstructionUser info,int type,Long time,Long projectId){
+    private void checkAndSetValue(List<RyglWebSocketVo> ryglWebSocketVoList, SubConstructionUser info,int type,Long time,Long projectId,List<SubContractor> SubContractors){
         //timeType 1:今天 2:本周 3:本月   此参数的校验放在连接时获取参数进行校验
         if (time == 2L) {
             // 获取本周一到今天的天数
@@ -2995,9 +2993,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                         ryglWebSocketVo.setZzId(info.getContractorId());
                         //分包组织名称
                         if (info.getContractorId() != null) {
-                            SubContractor byId = baseMapper.getSubContractor(info.getContractorId());
-                            if (byId != null) {
-                                ryglWebSocketVo.setZzmc(byId.getName());
+                            for (SubContractor subContractor : SubContractors) {
+                                if (subContractor.getId().equals(info.getContractorId())) {
+                                    ryglWebSocketVo.setZzmc(subContractor.getName());
+                                }
+                                break;
                             }
                         }
                         //总人数 先设置1