From 4b9dc71d162f3fcd79bc88b170154b7516fc4962 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 18 十二月 2025 13:37:14 +0800
Subject: [PATCH] 新增设备维修保养过程描述,上传对应附件
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 37ce27d..71fd2ce 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -3,13 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
-import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.device.pojo.DeviceMaintenance;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +13,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Arrays;
@Api(tags = "璁惧淇濆吇")
@@ -40,7 +35,7 @@
@PostMapping()
@ApiModelProperty("娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+ public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -55,7 +50,7 @@
@PutMapping ()
@ApiModelProperty("淇敼璁惧淇濆吇")
- public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
+ public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -64,8 +59,10 @@
@PostMapping ("maintenance")
@ApiModelProperty("淇敼璁惧淇濆吇")
- public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
+ public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ DeviceMaintenanceDto byId = deviceMaintenanceService.detailById(deviceMaintenance.getId());
deviceMaintenance.setStatus(1);
+ deviceMaintenance.setFiles(byId.getFiles());
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
--
Gitblit v1.9.3