lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
zt
2025-10-10 22:44:03 +08:00
parent bb38b6a6e1
commit 3bf7a1201f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
View File

@ -3,6 +3,7 @@ package org.dromara.bigscreen.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONArray; import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.dromara.bigscreen.domain.vo.ProjectImageProgressVo; import org.dromara.bigscreen.domain.vo.ProjectImageProgressVo;
import org.dromara.bigscreen.domain.vo.ProjectPeopleVo; import org.dromara.bigscreen.domain.vo.ProjectPeopleVo;
@ -141,11 +142,12 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
// 获取大屏数据 // 获取大屏数据
ProjectPeopleVo vo = new ProjectPeopleVo(); ProjectPeopleVo vo = new ProjectPeopleVo();
// 获取施工人员总数 // 获取施工人员总数
Long count = constructionUserService.lambdaQuery() List<SubConstructionUser> list = constructionUserService.lambdaQuery()
.eq(SubConstructionUser::getProjectId, projectId) .eq(SubConstructionUser::getProjectId, projectId)
.eq(SubConstructionUser::getUserRole, "0") .eq(SubConstructionUser::getUserRole, "0")
.isNotNull(SubConstructionUser::getTeamId) .isNotNull(SubConstructionUser::getTeamId).list();
.count(); List<Long> sysUserIdList = list.stream().map(SubConstructionUser::getSysUserId).toList();
int count = list.size();
BigDecimal countDec = BigDecimal.valueOf(count); BigDecimal countDec = BigDecimal.valueOf(count);
vo.setPeopleCount(countDec); vo.setPeopleCount(countDec);
// 获取考勤数据 // 获取考勤数据
@ -159,13 +161,16 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
List<BusProjectTeamMember> memberList = projectTeamMemberService.lambdaQuery() List<BusProjectTeamMember> memberList = projectTeamMemberService.lambdaQuery()
.select(BusProjectTeamMember::getId, BusProjectTeamMember::getTeamId) .select(BusProjectTeamMember::getId, BusProjectTeamMember::getTeamId)
.eq(BusProjectTeamMember::getProjectId, projectId) .eq(BusProjectTeamMember::getProjectId, projectId)
.in(BusProjectTeamMember::getMemberId, sysUserIdList)
.list(); .list();
Map<Long, List<BusProjectTeamMember>> memberMap = memberList.stream() Map<Long, List<BusProjectTeamMember>> memberMap = memberList.stream()
.collect(Collectors.groupingBy(BusProjectTeamMember::getTeamId)); .collect(Collectors.groupingBy(BusProjectTeamMember::getTeamId));
// 统计班组考勤数据 // 统计班组考勤数据
Map<Long, List<SubConstructionUser>> userTeamMap = new HashMap<>(); Map<Long, List<SubConstructionUser>> userTeamMap = new HashMap<>();
if (CollUtil.isNotEmpty(attendancePeopleList)) { if (CollUtil.isNotEmpty(attendancePeopleList)) {
List<SubConstructionUser> users = constructionUserService.listByIds(attendancePeopleList); List<SubConstructionUser> users = constructionUserService.lambdaQuery()
.in(SubConstructionUser::getSysUserId, attendancePeopleList)
.list();
userTeamMap = users.stream() userTeamMap = users.stream()
.collect(Collectors.groupingBy(SubConstructionUser::getTeamId)); .collect(Collectors.groupingBy(SubConstructionUser::getTeamId));
} }
@ -176,7 +181,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
String punchTime = ""; String punchTime = "";
if (punchRange != null) { if (punchRange != null) {
String start = punchRange.split(",")[0]; String start = punchRange.split(",")[0];
punchTime = LocalDate.now() + " " + start; punchTime = LocalDate.now() + " ";
} }
List<ProjectTeamAttendanceVo> listVo = new ArrayList<>(); List<ProjectTeamAttendanceVo> listVo = new ArrayList<>();
for (BusProjectTeam projectTeam : teamList) { for (BusProjectTeam projectTeam : teamList) {