From dd1a51612fcd3c839d31dfa0df83b3d3071c8145 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 17:50:11 +0800
Subject: [PATCH] feat: 完善无人值守系统后端
---
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
index 26e3bdd..e878730 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -62,7 +62,16 @@
@Override
public IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
LambdaQueryWrapper<InspectionTask> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.orderByDesc(InspectionTask::getCreateTime);
+ queryWrapper.and(w -> w.isNull(InspectionTask::getDeleted).or().eq(InspectionTask::getDeleted, 0))
+ .like(StringUtils.isNotBlank(inspectionTaskDto.getTaskName()),
+ InspectionTask::getTaskName, inspectionTaskDto.getTaskName())
+ .like(StringUtils.isNotBlank(inspectionTaskDto.getInspectionLocation()),
+ InspectionTask::getInspectionLocation, inspectionTaskDto.getInspectionLocation())
+ .eq(StringUtils.isNotBlank(inspectionTaskDto.getTaskStatus()),
+ InspectionTask::getTaskStatus, inspectionTaskDto.getTaskStatus())
+ .eq(StringUtils.isNotBlank(inspectionTaskDto.getDeviceSource()),
+ InspectionTask::getDeviceSource, inspectionTaskDto.getDeviceSource())
+ .orderByDesc(InspectionTask::getCreateTime);
IPage<InspectionTask> entityPage = inspectionTaskMapper.selectPage(page, queryWrapper);
// 鏃犳暟鎹彁鍓嶈繑鍥�
@@ -70,9 +79,13 @@
return new Page<>(entityPage.getCurrent(), entityPage.getSize(), entityPage.getTotal());
}
// 鑾峰彇id闆嗗悎
- List<Long> ids = entityPage.getRecords().stream().map(InspectionTask::getId).toList();
+ List<Long> ids = entityPage.getRecords().stream().map(InspectionTask::getId).collect(Collectors.toList());
//鐧昏浜篿ds
- List<Long> registrantIds = entityPage.getRecords().stream().map(InspectionTask::getRegistrantId).toList();
+ List<Long> registrantIds = entityPage.getRecords().stream()
+ .map(InspectionTask::getRegistrantId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
// 鎵归噺鏌ヨ鐧昏浜�
Map<Long, SysUser> sysUserMap;
if (!registrantIds.isEmpty()) {
@@ -82,7 +95,7 @@
sysUserMap = new HashMap<>();
}
//宸℃浜篿ds
- List<String> inspectorIds = entityPage.getRecords().stream().map(InspectionTask::getInspectorId).toList();
+ List<String> inspectorIds = entityPage.getRecords().stream().map(InspectionTask::getInspectorId).collect(Collectors.toList());
//鑾峰彇鎵�鏈変笉閲嶅鐨勭敤鎴稩D
Set<Long> allUserIds = entityPage.getRecords().stream()
--
Gitblit v1.9.3