From c4117e83029610beb9d9ff113493f7c2da2ea027 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 09:09:14 +0800
Subject: [PATCH] feat(quality): 设备维修领用备件
---
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 8660237..bb5952c 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
@@ -2,8 +2,12 @@
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;
@@ -11,18 +15,30 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+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) {
- return sparePartsMapper.listPage(page,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;
}
@Override
@@ -33,6 +49,11 @@
return buildTree(records);
}
+ @Override
+ public List<SparePartsDto> getByDeviceId(Long id) {
+ return sparePartsMapper.getByDeviceId(id);
+ }
+
/**
* 灏嗘墎骞崇粨鏋勬暟鎹浆鎹负鏍戝舰缁撴瀯
--
Gitblit v1.9.3