From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 84c46e9..a2a78f6 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -110,21 +110,23 @@
@Override
public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
- if (CollectionUtils.isNotEmpty(deviceRepair.getFileList())) {
- List<String> fileIds = deviceRepair.getFileList().stream()
- .map(TempFile::getTempId)
- .collect(Collectors.toList());
- try {
- tempFileService.migrateTempFilesToFormal(deviceRepair.getId(), fileIds, FileNameType.DeviceRepair.getValue());
- } catch (Exception e) {
- log.error("璁惧缁翠慨鏂囦欢杩佺Щ閿欒", e);
- }
- }
-
deviceRepair.setDeviceName(byId.getDeviceName());
deviceRepair.setDeviceModel(byId.getDeviceModel());
+ if (deviceRepair.getRemark() == null) {
+ deviceRepair.setRemark("");
+ }
boolean save = this.save(deviceRepair);
if (save) {
+ if (CollectionUtils.isNotEmpty(deviceRepair.getFileList())) {
+ List<String> fileIds = deviceRepair.getFileList().stream()
+ .map(TempFile::getTempId)
+ .collect(Collectors.toList());
+ try {
+ tempFileService.migrateTempFilesToFormal(deviceRepair.getId(), fileIds, FileNameType.DeviceRepair.getValue());
+ } catch (Exception e) {
+ log.error("璁惧缁翠慨鏂囦欢杩佺Щ閿欒", e);
+ }
+ }
return AjaxResult.success();
}
return AjaxResult.error();
@@ -194,8 +196,13 @@
@Override
public DeviceRepairDto detailById(Long id) {
-
- return deviceRepairMapper.detailById(id);
+ DeviceRepairDto deviceRepairDto = deviceRepairMapper.detailById(id);
+ LambdaQueryWrapper<CommonFile> queryWrapper = new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, deviceRepairDto.getId()) // 鍏宠仈璁板綍ID
+ .eq(CommonFile::getType, FileNameType.DeviceRepair.getValue()); // 鏂囦欢绫诲瀷
+ List<CommonFile> commonFiles = commonFileMapper.selectList(queryWrapper);
+ deviceRepairDto.setFileList(commonFiles);
+ return deviceRepairDto;
}
}
--
Gitblit v1.9.3