From 29e5ce7e230beb96c06105c7baa530c6b9279508 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 18:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetHouseInspectionRecordServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetHouseInspectionRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetHouseInspectionRecordServiceImpl.java
index 4b8b3ea..7690813 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetHouseInspectionRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetHouseInspectionRecordServiceImpl.java
@@ -1,10 +1,27 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.TDept;
+import com.ruoyi.system.mapper.AssetHouseInspectionDetailMapper;
+import com.ruoyi.system.mapper.AssetHouseInspectionItemMapper;
import com.ruoyi.system.mapper.AssetHouseInspectionRecordMapper;
+import com.ruoyi.system.model.AssetHouseInspectionDetail;
+import com.ruoyi.system.model.AssetHouseInspectionItem;
import com.ruoyi.system.model.AssetHouseInspectionRecord;
+import com.ruoyi.system.query.AssetHouseInspectionRecordListQuery;
import com.ruoyi.system.service.AssetHouseInspectionRecordService;
+import com.ruoyi.system.vo.AssetHouseInspectionVO;
+import com.ruoyi.system.vo.AssetRepairRequestVO;
+import com.ruoyi.system.vo.system.ApprovalVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +34,24 @@
@Service
public class AssetHouseInspectionRecordServiceImpl extends ServiceImpl<AssetHouseInspectionRecordMapper, AssetHouseInspectionRecord> implements AssetHouseInspectionRecordService {
+ @Autowired
+ private AssetHouseInspectionDetailMapper assetHouseInspectionDetailMapper;
+ @Autowired
+ private AssetHouseInspectionItemMapper assetHouseInspectionItemMapper;
+ @Override
+ public PageInfo<AssetHouseInspectionVO> pageList(AssetHouseInspectionRecordListQuery query) {
+// List<AssetHouseInspectionItem> assetHouseInspectionItems = assetHouseInspectionItemMapper.selectList(null);
+ PageInfo<AssetHouseInspectionVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AssetHouseInspectionVO> list = this.baseMapper.pageList(query,pageInfo);
+
+// List<Integer> inspectionIds = list.stream().map(AssetHouseInspectionRecord::getId).collect(Collectors.toList());
+// if (!inspectionIds.isEmpty()){
+// Map<Integer, List<AssetHouseInspectionDetail>> detailMaps = assetHouseInspectionDetailMapper.selectList(
+// new LambdaQueryWrapper<AssetHouseInspectionDetail>()
+// .in(AssetHouseInspectionDetail::getInspectionRecordId, inspectionIds)
+// ).stream().collect(Collectors.groupingBy(AssetHouseInspectionDetail::getInspectionRecordId));
+// }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1