From 300cf495c6a708df63621ff70e6d5408abc2912a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:50:27 +0800
Subject: [PATCH] yys 转移设备代码
---
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 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 72a77a4..8660237 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
@@ -1,14 +1,9 @@
package com.ruoyi.measuringinstrumentledger.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -20,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