From d1a7dbfe642981382584ce1a2b39cb1001b789b7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 17 三月 2026 10:39:00 +0800
Subject: [PATCH] 1.设备报修上传下载优化
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 22 ++++++++++++++--------
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 9 +++++++--
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 1 +
src/main/java/com/ruoyi/sales/pojo/CommonFile.java | 3 ++-
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 7ac0907..57e5355 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -28,13 +28,13 @@
@ApiOperation("璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
- return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
+ public AjaxResult page(Page page, DeviceRepairDto deviceRepairDto) {
+ return AjaxResult.success(deviceRepairService.queryPage(page, deviceRepairDto));
}
@PostMapping()
@ApiOperation("娣诲姞璁惧鎶ヤ慨")
- public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
+ public AjaxResult add(@RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.saveDeviceRepair(deviceRepair);
}
@@ -44,16 +44,22 @@
DeviceRepairDto byId = deviceRepairService.detailById(id);
return AjaxResult.success(byId);
}
+//
+// @ApiOperation("鏍规嵁id鏌ヨ闄勪欢")
+// @GetMapping("/{deviceId}")
+// public AjaxResult deviceId(@PathVariable Long id) {
+// DeviceRepairDto byId = deviceRepairService.detailById(id);
+// return AjaxResult.success(byId);
+// }
- @PutMapping ()
+ @PutMapping()
@ApiOperation("淇敼璁惧鎶ヤ慨")
- public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
+ public AjaxResult update(@RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
- @PostMapping ("repair")
- @ApiOperation("璁惧缁翠慨")
- public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
+ @PostMapping("/repairs")
+ public AjaxResult repair(@RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 89c3869..330b3a9 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -79,5 +79,6 @@
private String sparePartsIds;
@ApiModelProperty("鏂囦欢鍒楄〃")
+ @TableField(exist = false)
private List<TempFile> fileList;
}
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..b98ff53 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -194,8 +194,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;
}
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
index 239fd0d..16c12aa 100644
--- a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -11,7 +12,7 @@
@Data
@TableName("common_file")
-public class CommonFile {
+public class CommonFile implements Serializable {
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.3