From 42131eb034e559dc361fe75d653e4d904aa6a316 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 十月 2025 17:51:32 +0800
Subject: [PATCH] 保修详情增加资产类型名称字段
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java | 31 +++++++++++++++++++++----------
ruoyi-system/src/main/java/com/ruoyi/system/dto/AddAssetRepairRequestDTO.java | 4 ++--
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java
index 1b64135..f352ecf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java
@@ -6,37 +6,41 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.entity.TDept;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AddAssetRepairRequestDTO;
-import com.ruoyi.system.dto.AddContractDTO;
import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetRepairRequest;
import com.ruoyi.system.model.AssetRepairRequestItem;
+import com.ruoyi.system.model.AssetType;
import com.ruoyi.system.query.AssetRepairRequestListQuery;
-import com.ruoyi.system.query.AssetStatisticsListQuery;
-import com.ruoyi.system.service.*;
import com.ruoyi.system.service.AssetMainService;
import com.ruoyi.system.service.AssetRepairRecordService;
+import com.ruoyi.system.service.AssetRepairRequestItemService;
+import com.ruoyi.system.service.AssetRepairRequestService;
+import com.ruoyi.system.service.AssetTypeService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.OaApprovalApplicationAssetItemService;
import com.ruoyi.system.service.TDeptService;
import com.ruoyi.system.vo.AssetRepairListVO;
import com.ruoyi.system.vo.AssetRepairRequestVO;
-import com.ruoyi.system.vo.AssetStatisticsVO;
-import com.ruoyi.system.vo.GrabListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -68,6 +72,8 @@
private ISysUserService sysUserService;
@Resource
private AssetMainService assetMainService;
+ @Autowired
+ private AssetTypeService assetTypeService;
@ApiOperation("资产报修分页列表")
@PostMapping("/pageList")
@@ -141,6 +147,11 @@
AddAssetRepairRequestDTO res = new AddAssetRepairRequestDTO();
AssetRepairRequest assetRepairRequest = assetRepairRequestService.getById(id);
BeanUtils.copyProperties(assetRepairRequest, res);
+ //查询类型名称
+ AssetType assetType = assetTypeService.getById(assetRepairRequest.getAssetTypeId());
+ if (Objects.nonNull(assetType)) {
+ res.setAssetTypeName(assetType.getTypeName());
+ }
List<AssetRepairListVO> items = assetRepairRequestItemService.listDetail(id);
res.setListDetail(items);
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(assetRepairRequest.getReporterId()));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddAssetRepairRequestDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddAssetRepairRequestDTO.java
index 3c983c0..031d519 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddAssetRepairRequestDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddAssetRepairRequestDTO.java
@@ -3,12 +3,10 @@
import com.ruoyi.system.model.AssetRepairRequest;
import com.ruoyi.system.model.AssetRepairRequestItem;
import com.ruoyi.system.vo.AssetRepairListVO;
-import com.ruoyi.system.vo.GrabListVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.io.Serializable;
import java.util.List;
@Data
@@ -18,6 +16,8 @@
@ApiModelProperty(value = "报修人")
private String reporterName;
+ @ApiModelProperty(value = "报修资产类型名称")
+ private String assetTypeName;
@ApiModelProperty(value = "新增使用报修资产列表")
private List<AssetRepairRequestItem> list;
@ApiModelProperty(value = "详情使用报修资产列表")
--
Gitblit v1.7.1