From b167a4203201dee255c57afa5c96a01842889f42 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 13 十月 2025 18:46:41 +0800
Subject: [PATCH] 资产盘点任务接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetRepairRecordServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetRepairRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetRepairRecordServiceImpl.java
index 4d93ec3..9959fbf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetRepairRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetRepairRecordServiceImpl.java
@@ -31,7 +31,6 @@
import org.springframework.util.StringUtils;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -170,7 +169,11 @@
// 2. 转换主表信息到VO
AssetRepairRecordDetailVO detailVO = new AssetRepairRecordDetailVO();
BeanUtil.copyProperties(repairRecord, detailVO);
-
+ //3.查询资产类型
+ if (Objects.nonNull(repairRecord.getAssetTypeId())) {
+ String assetTypeName = assetTypeService.getAssetTypeNameById(repairRecord.getAssetTypeId());
+ detailVO.setAssetTypeName(assetTypeName);
+ }
// 4. 查询关联的资产列表
List<AssetRepairRecordAssetVO> assetList = this.baseMapper.getRepairAssetList(id);
detailVO.setAssetList(assetList);
@@ -187,7 +190,7 @@
if (Objects.isNull(item)) {
throw new ServiceException("维修记录不存在");
}
- item.setRepairFinishTime(Objects.nonNull(dto.getRepairFinishTime()) ? dto.getRepairFinishTime() : LocalDateTime.now());
+ item.setRepairFinishTime(Objects.nonNull(dto.getRepairFinishTime()) ? dto.getRepairFinishTime() : LocalDate.now());
item.setRepairFee(dto.getRepairFee());
item.setStatus(1);
assetRepairRecordItemService.updateById(item);
@@ -218,4 +221,10 @@
.eq(AssetRepairRecordItem::getRepairRecordId, id)
.remove();
}
+
+ @Override
+ public List<AssetRepairRequestVO> listAll(AssetRepairRequestListQuery query) {
+ List<AssetRepairRequestVO> list = this.baseMapper.listAll(query);
+ return list;
+ }
}
--
Gitblit v1.7.1