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/DeviceRepairController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 44021a9..e02e223 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
-import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -14,16 +12,18 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Arrays;
@Api(tags = "璁惧鎶ヤ慨绠＄悊")
-@RequestMapping("/device/reppair")
+@RequestMapping("/device/repair")
@RestController
public class DeviceRepairController {
@Autowired
private IDeviceRepairService deviceRepairService;
+
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
@ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
@@ -33,19 +33,29 @@
@PostMapping()
@ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
- public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
+ public AjaxResult add( @RequestBody DeviceRepairDto deviceRepair) {
return deviceRepairService.saveDeviceRepair(deviceRepair);
}
@ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceRepairService.getById(id));
+ DeviceRepairDto byId = deviceRepairService.detailById(id);
+ return AjaxResult.success(byId);
}
@PutMapping ()
@ApiModelProperty("淇敼璁惧鎶ヤ慨")
- public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
+ public AjaxResult update( @RequestBody DeviceRepairDto deviceRepair) {
+ return deviceRepairService.updateDeviceRepair(deviceRepair);
+ }
+
+ @PostMapping ("repair")
+ @ApiModelProperty("璁惧缁翠慨")
+ public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepair) {
+ DeviceRepairDto deviceRepairDto = deviceRepairService.detailById(deviceRepair.getId());
+ deviceRepair.setStatus(1);
+ deviceRepair.setFiles(deviceRepairDto.getFiles());
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
--
Gitblit v1.9.3