From d4a3ddfeac6aea951c51bee91d9cf4eb57c4f4c4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 30 六月 2026 14:31:07 +0800
Subject: [PATCH] feat(safe): 完善安全巡检系统功能

---
 src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java |   80 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
index e11b3f9..f3f83f7 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
@@ -2,11 +2,22 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
 import com.ruoyi.safe.pojo.SafeFacilityInspection;
+import com.ruoyi.safe.pojo.SafeFacilityLedger;
 import com.ruoyi.safe.mapper.SafeFacilityInspectionMapper;
 import com.ruoyi.safe.service.SafeFacilityInspectionService;
+import com.ruoyi.safe.service.SafeFacilityLedgerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -19,13 +30,80 @@
 @Service
 public class SafeFacilityInspectionServiceImpl extends ServiceImpl<SafeFacilityInspectionMapper, SafeFacilityInspection> implements SafeFacilityInspectionService {
 
+    @Autowired
+    private SafeFacilityLedgerService safeFacilityLedgerService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Override
+    public SafeFacilityInspection getById(Serializable id) {
+        SafeFacilityInspection record = super.getById(id);
+        if (record != null) {
+            fillExtraInfo(Collections.singletonList(record));
+        }
+        return record;
+    }
+
     @Override
     public IPage<SafeFacilityInspection> pageSafeFacilityInspection(Page page, SafeFacilityInspection safeFacilityInspection) {
-        return this.lambdaQuery()
+        IPage<SafeFacilityInspection> result = this.lambdaQuery()
                 .like(safeFacilityInspection.getInspectionCode() != null, SafeFacilityInspection::getInspectionCode, safeFacilityInspection.getInspectionCode())
                 .eq(safeFacilityInspection.getFacilityId() != null, SafeFacilityInspection::getFacilityId, safeFacilityInspection.getFacilityId())
                 .eq(safeFacilityInspection.getStatus() != null, SafeFacilityInspection::getStatus, safeFacilityInspection.getStatus())
                 .orderByDesc(SafeFacilityInspection::getCreateTime)
                 .page(page);
+
+        fillExtraInfo(result.getRecords());
+        return result;
+    }
+
+    private void fillExtraInfo(List<SafeFacilityInspection> records) {
+        if (records == null || records.isEmpty()) {
+            return;
+        }
+
+        // 鏀堕泦鎵�鏈夎鏂絀D
+        List<Integer> facilityIds = records.stream()
+                .map(SafeFacilityInspection::getFacilityId)
+                .filter(id -> id != null)
+                .distinct()
+                .collect(Collectors.toList());
+
+        // 鏀堕泦鎵�鏈夊贰妫�浜篒D
+        List<Long> inspectorIds = records.stream()
+                .map(SafeFacilityInspection::getInspectorId)
+                .filter(id -> id != null)
+                .map(Integer::longValue)
+                .distinct()
+                .collect(Collectors.toList());
+
+        // 鎵归噺鏌ヨ璁炬柦淇℃伅
+        Map<Integer, SafeFacilityLedger> facilityMap = Map.of();
+        if (!facilityIds.isEmpty()) {
+            facilityMap = safeFacilityLedgerService.listByIds(facilityIds).stream()
+                    .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, v2) -> v1));
+        }
+
+        // 鎵归噺鏌ヨ宸℃浜轰俊鎭�
+        Map<Long, String> userMap = Map.of();
+        if (!inspectorIds.isEmpty()) {
+            List<SysUser> users = sysUserMapper.selectUserByIds(inspectorIds);
+            userMap = users.stream()
+                    .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, v2) -> v1));
+        }
+
+        // 濉厖瀛楁
+        for (SafeFacilityInspection record : records) {
+            if (record.getFacilityId() != null) {
+                SafeFacilityLedger facility = facilityMap.get(record.getFacilityId());
+                if (facility != null) {
+                    record.setFacilityName(facility.getFacilityName());
+                    record.setFacilityCode(facility.getFacilityCode());
+                }
+            }
+            if (record.getInspectorId() != null) {
+                record.setInspectorName(userMap.getOrDefault(record.getInspectorId().longValue(), "鏈煡鐢ㄦ埛"));
+            }
+        }
     }
 }

--
Gitblit v1.9.3