admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

木垒安全管理调整bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-10-29 11:33:16 +08:00
parent 8515a15ab1
commit 3101ce2b3c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java
View File

@ -139,11 +139,14 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
String projectSn = MapUtils.getString(param, "projectSn"); String projectSn = MapUtils.getString(param, "projectSn");
List<Long> eduIds = workerSafeEducationService.list(new LambdaQueryWrapper<WorkerSafeEducation>() List<Long> eduIds = workerSafeEducationService.list(new LambdaQueryWrapper<WorkerSafeEducation>()
.eq(WorkerSafeEducation::getVideoType, 1)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList()); .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<>(); List<WorkerSafeEducationWorker> list = new ArrayList<>();
if (CollUtil.isNotEmpty(eduIds)) { if (CollUtil.isNotEmpty(eduIds)) {
list = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery() list = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
.eq(WorkerSafeEducationWorker::getProjectSn, projectSn) .eq(WorkerSafeEducationWorker::getProjectSn, projectSn)
.in(WorkerSafeEducationWorker::getEduId, eduIds) .in(WorkerSafeEducationWorker::getEduId, eduIds)
.in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
.orderByDesc(WorkerSafeEducationWorker::getId)); .orderByDesc(WorkerSafeEducationWorker::getId));
} }
resultMap.put("educationNum", list.size()); resultMap.put("educationNum", list.size());
@ -160,9 +163,12 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
.eq(WorkerSafeEducation::getEduType, 5) .eq(WorkerSafeEducation::getEduType, 5)
.eq(WorkerSafeEducation::getProjectSn, projectSn)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList()); .eq(WorkerSafeEducation::getProjectSn, projectSn)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList());
List<WorkerSafeEducationWorker> educationWorkers = new ArrayList<>(); 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) { if (list.size() > 0) {
educationWorkers = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery() educationWorkers = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
.in(WorkerSafeEducationWorker::getEduId, list) .in(WorkerSafeEducationWorker::getEduId, list)
.in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
.ge(WorkerSafeEducationWorker::getStudyTime, DateUtil.offsetDay(new Date(), -7))); .ge(WorkerSafeEducationWorker::getStudyTime, DateUtil.offsetDay(new Date(), -7)));
} }
List<Map<String, Object>> resultList = new ArrayList<>(); List<Map<String, Object>> resultList = new ArrayList<>();
@ -185,8 +191,12 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
.eq(WorkerSafeEducation::getProjectSn, projectSn) .eq(WorkerSafeEducation::getProjectSn, projectSn)
.eq(WorkerSafeEducation::getVideoType, 1) .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() 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<>(); List<Map<String, Object>> resultList = new ArrayList<>();
for (int i = 0; i < type.length; i++) { for (int i = 0; i < type.length; i++) {
int j = i + 1; 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)); List<TeamInfo> teamInfoList = teamInfoService.list(Wrappers.<TeamInfo>lambdaQuery().eq(TeamInfo::getProjectSn, projectSn));
int count = workerInfoService.count(Wrappers.<WorkerInfo>lambdaQuery() int count = workerInfoService.count(Wrappers.<WorkerInfo>lambdaQuery()
.eq(WorkerInfo::getProjectSn, projectSn) .eq(WorkerInfo::getProjectSn, projectSn)
.eq(WorkerInfo::getPersonType, 1)
.eq(WorkerInfo::getInserviceType, 1)); .eq(WorkerInfo::getInserviceType, 1));
List<Long> eduIds = workerSafeEducationService.list(Wrappers.<WorkerSafeEducation>lambdaQuery() List<Long> eduIds = workerSafeEducationService.list(Wrappers.<WorkerSafeEducation>lambdaQuery()
.eq(WorkerSafeEducation::getVideoType, 1) .eq(WorkerSafeEducation::getVideoType, 1)
.eq(WorkerSafeEducation::getProjectSn, projectSn)).stream().map(WorkerSafeEducation::getId).collect(Collectors.toList()); .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<>(); List<WorkerSafeEducationWorker> workerEduList = new ArrayList<>();
if (CollUtil.isNotEmpty(eduIds)) { if (CollUtil.isNotEmpty(eduIds)) {
workerEduList = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery() workerEduList = this.list(Wrappers.<WorkerSafeEducationWorker>lambdaQuery()
.in(WorkerSafeEducationWorker::getEduId, eduIds) .in(WorkerSafeEducationWorker::getEduId, eduIds)
.in(CollUtil.isNotEmpty(workIds), WorkerSafeEducationWorker::getWorkerId, workIds)
.eq(WorkerSafeEducationWorker::getProjectSn, projectSn) .eq(WorkerSafeEducationWorker::getProjectSn, projectSn)
.ge(WorkerSafeEducationWorker::getStudyTime, DateUtil.offsetMonth(new Date(), -1))); .ge(WorkerSafeEducationWorker::getStudyTime, DateUtil.offsetMonth(new Date(), -1)));
} }
@ -230,7 +242,7 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
for (TeamInfo teamInfo : teamInfoList) { for (TeamInfo teamInfo : teamInfoList) {
Map<String, Object> teamMap = new HashMap<>(); Map<String, Object> teamMap = new HashMap<>();
teamMap.put("name", teamInfo.getTeamName()); 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); resultList.add(teamMap);
} }
resultMap.put("teamStat", resultList); resultMap.put("teamStat", resultList);