From bc1a95cb1a7d2cbb2a4b8e7a043fc82f3b2ba119 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 13:57:29 +0800
Subject: [PATCH] yys 1.设备
---
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
index 5f329e8..8660237 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
@@ -2,12 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.device.mapper.DeviceLedgerMapper;
-import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsDto;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
@@ -19,29 +15,14 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
@Service
public class SparePartsServiceImpl extends ServiceImpl<SparePartsMapper, SpareParts> implements SparePartsService {
@Autowired
private SparePartsMapper sparePartsMapper;
-
- @Autowired
- private DeviceLedgerMapper deviceLedgerMapper;
-
@Override
public IPage<SparePartsDto> listPage(Page page, SpareParts spareParts) {
- IPage<SparePartsDto> sparePartsDtoIPage = sparePartsMapper.listPage(page, spareParts);
- for (SparePartsDto record : sparePartsDtoIPage.getRecords()) {
- if(StringUtils.isNotEmpty(record.getDeviceIds())){
- List<String> deviceIds = StringUtils.str2List(record.getDeviceIds(), ",", true, true);
- List<DeviceLedger> deviceLedgers = deviceLedgerMapper.selectBatchIds(deviceIds);
- if(CollectionUtils.isNotEmpty(deviceLedgers)){
- record.setDeviceNameStr(deviceLedgers.stream().map(DeviceLedger::getDeviceName).collect(Collectors.joining( ",")));
- }
- }
- }
- return sparePartsDtoIPage;
+ return sparePartsMapper.listPage(page,spareParts);
}
@Override
--
Gitblit v1.9.3