gongchunyi
10 小时以前 e237862aa7204822a89340fc28e8613f993bb9ce
src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -65,14 +66,14 @@
        // 收集所有设施ID
        List<Integer> facilityIds = records.stream()
                .map(SafeFacilityInspection::getFacilityId)
                .filter(id -> id != null)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());
        // 收集所有巡检人ID
        List<Long> inspectorIds = records.stream()
                .map(SafeFacilityInspection::getInspectorId)
                .filter(id -> id != null)
                .filter(Objects::nonNull)
                .map(Integer::longValue)
                .distinct()
                .collect(Collectors.toList());
@@ -81,7 +82,7 @@
        Map<Integer, SafeFacilityLedger> facilityMap = Map.of();
        if (!facilityIds.isEmpty()) {
            facilityMap = safeFacilityLedgerService.listByIds(facilityIds).stream()
                    .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, v2) -> v1));
                    .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, _) -> v1));
        }
        // 批量查询巡检人信息
@@ -89,7 +90,7 @@
        if (!inspectorIds.isEmpty()) {
            List<SysUser> users = sysUserMapper.selectUserByIds(inspectorIds);
            userMap = users.stream()
                    .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, v2) -> v1));
                    .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, _) -> v1));
        }
        // 填充字段