From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetRepairRecordServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 4593555..8ad7121 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
@@ -8,7 +8,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.constants.ApprovalApplicationCodePrefix;
-import com.ruoyi.system.dto.AssetRepairRecordAddDTO;
+import com.ruoyi.system.dto.asset.AssetRepairRecordAddDTO;
import com.ruoyi.system.dto.asset.AssetRepairCompleteDTO;
import com.ruoyi.system.mapper.AssetRepairRecordMapper;
import com.ruoyi.system.model.AssetRepairRecord;
@@ -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);
--
Gitblit v1.7.1