From 3101ce2b3c163d0506cc533c320a2222b851e83d Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 29 Oct 2024 11:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=A8=E5=9E=92=E5=AE=89=E5=85=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkerSafeEducationWorkerServiceImpl.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java
index 677a04de7..5e9b0ebc3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java
@@ -139,11 +139,14 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
         String projectSn = MapUtils.getString(param, "projectSn");
         List<Long> eduIds = workerSafeEducationService.list(new LambdaQueryWrapper<WorkerSafeEducation>()
                 .eq(WorkerSafeEducation::getVideoType, 1)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList());
+        List<Long> workIds = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
+                .eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getId).collect(Collectors.toList());
         List<WorkerSafeEducationWorker> list = new ArrayList<>();
         if (CollUtil.isNotEmpty(eduIds)) {
             list = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
                     .eq(WorkerSafeEducationWorker::getProjectSn, projectSn)
                     .in(WorkerSafeEducationWorker::getEduId, eduIds)
+                    .in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
                     .orderByDesc(WorkerSafeEducationWorker::getId));
         }
         resultMap.put("educationNum", list.size());
@@ -160,9 +163,12 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
                 .eq(WorkerSafeEducation::getEduType, 5)
                 .eq(WorkerSafeEducation::getProjectSn, projectSn)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList());
         List<WorkerSafeEducationWorker> educationWorkers = new ArrayList<>();
+        List<Long> workIds = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
+                .eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getId).collect(Collectors.toList());
         if (list.size() > 0) {
             educationWorkers = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
                     .in(WorkerSafeEducationWorker::getEduId, list)
+                    .in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
                     .ge(WorkerSafeEducationWorker::getStudyTime, DateUtil.offsetDay(new Date(), -7)));
         }
         List<Map<String, Object>> resultList = new ArrayList<>();
@@ -185,8 +191,12 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
                 .eq(WorkerSafeEducation::getProjectSn, projectSn)
                 .eq(WorkerSafeEducation::getVideoType, 1)
         );
+        List<Long> workIds = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
+                .eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getId).collect(Collectors.toList());
         List<WorkerSafeEducationWorker> workerList = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
-                .eq(WorkerSafeEducationWorker::getProjectSn, projectSn));
+                .eq(WorkerSafeEducationWorker::getProjectSn, projectSn)
+                .in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
+        );
         List<Map<String, Object>> resultList = new ArrayList<>();
         for (int i = 0; i < type.length; i++) {
             int j = i + 1;
@@ -210,15 +220,17 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
         List<TeamInfo> teamInfoList = teamInfoService.list(Wrappers.<TeamInfo>lambdaQuery().eq(TeamInfo::getProjectSn, projectSn));
         int count = workerInfoService.count(Wrappers.<WorkerInfo>lambdaQuery()
                 .eq(WorkerInfo::getProjectSn, projectSn)
-                .eq(WorkerInfo::getPersonType, 1)
                 .eq(WorkerInfo::getInserviceType, 1));
         List<Long> eduIds = workerSafeEducationService.list(Wrappers.<WorkerSafeEducation>lambdaQuery()
                 .eq(WorkerSafeEducation::getVideoType, 1)
                 .eq(WorkerSafeEducation::getProjectSn, projectSn)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList());
+        List<Long> workIds = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
+                .eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getId).collect(Collectors.toList());
         List<WorkerSafeEducationWorker> workerEduList = new ArrayList<>();
         if (CollUtil.isNotEmpty(eduIds)) {
             workerEduList = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
                     .in(WorkerSafeEducationWorker::getEduId, eduIds)
+                    .in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
                     .eq(WorkerSafeEducationWorker::getProjectSn, projectSn)
                     .ge(WorkerSafeEducationWorker::getStudyTime, DateUtil.offsetMonth(new Date(), -1)));
         }
@@ -230,7 +242,7 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
         for (TeamInfo teamInfo : teamInfoList) {
             Map<String, Object> teamMap = new HashMap<>();
             teamMap.put("name", teamInfo.getTeamName());
-            teamMap.put("num", workerFilter.stream().filter(w -> w.getTeamId().toString().equals(teamInfo.getId().toString())).count());
+            teamMap.put("num", workerFilter.stream().filter(w -> Objects.equals(w.getTeamId(), teamInfo.getId())).count());
             resultList.add(teamMap);
         }
         resultMap.put("teamStat", resultList);