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/device/service/impl/DeviceMaintenanceServiceImpl.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 4a92286..a941d13 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -4,27 +4,34 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
+import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
+import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {
+ @Autowired
+ private SparePartsMapper sparePartsMapper;
@Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
@@ -32,12 +39,48 @@
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
- return deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
+ IPage<DeviceMaintenanceDto> deviceMaintenanceDtoIPage = deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
+ List<DeviceMaintenanceDto> records = deviceMaintenanceDtoIPage.getRecords();
+ if (!CollectionUtils.isEmpty(records)) {
+ // 1. 鑾峰彇鎵�鏈夊敮涓�鐨勫浠禝D
+ Set<String> allIds = records.stream()
+ .map(DeviceMaintenanceDto::getSparePartsIds)
+ .filter(StrUtil::isNotBlank)
+ .flatMap(ids -> Arrays.stream(StringUtils.split(ids, ",")))
+ .map(String::trim)
+ .filter(StrUtil::isNotBlank)
+ .collect(Collectors.toSet());
+
+ if (!allIds.isEmpty()) {
+ // 2. 鏌ヨ骞跺垱寤篒D鍒板悕绉扮殑鏄犲皠
+ Map<Long, String> idToNameMap = sparePartsMapper.selectBatchIds(new ArrayList<>(allIds))
+ .stream()
+ .collect(Collectors.toMap(
+ SpareParts::getId,
+ SpareParts::getName,
+ (v1, v2) -> v1
+ ));
+
+ // 3. 涓烘瘡涓褰曡缃浠跺悕绉�
+ records.forEach(record -> {
+ String names = Optional.ofNullable(record.getSparePartsIds())
+ .filter(StrUtil::isNotBlank)
+ .map(ids -> Arrays.stream(StringUtils.split(ids, ","))
+ .map(String::trim)
+ .map(idToNameMap::get)
+ .filter(Objects::nonNull)
+ .collect(Collectors.joining(",")))
+ .orElse("");
+ record.setSparePartsNames(names);
+ });
+ }
+ }
+ return deviceMaintenanceDtoIPage;
}
@Override
- public AjaxResult saveDeviceRepair(DeviceMaintenance deviceRepair) {
- boolean save = this.save(deviceRepair);
+ public AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance) {
+ boolean save = this.save(deviceMaintenance);
if (save){
return AjaxResult.success();
}
@@ -45,8 +88,8 @@
}
@Override
- public AjaxResult updateDeviceRepair(DeviceMaintenance deviceRepair) {
- if (this.updateById(deviceRepair)) {
+ public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance) {
+ if (this.updateById(deviceMaintenance)) {
return AjaxResult.success();
}
return AjaxResult.error();
@@ -54,21 +97,21 @@
@Override
public void export(HttpServletResponse response, Long[] ids) {
- ArrayList<Long> arrayList = new ArrayList<>();
- Arrays.stream(ids).map(id -> {
- return arrayList.add( id);
- });
- List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectBatchIds(arrayList);
+ List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectList(null);
ArrayList<DeviceMaintenanceExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceMaintenance -> {
+ supplierManageList.forEach(deviceMaintenance -> {
DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : "瀹岀粨");
- deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
-
+ deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : deviceMaintenance.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
deviceLedgerExeclDtos.add(deviceRepairExeclDto);
});
ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<DeviceMaintenanceExeclDto>(DeviceMaintenanceExeclDto.class);
util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
}
+
+ @Override
+ public DeviceMaintenanceDto detailById(Long id) {
+
+ return deviceMaintenanceMapper.detailById(id);
+ }
}
--
Gitblit v1.9.3