From beb0fc04f59f4f448e70d8de9ae39161632de2fb Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 03 七月 2025 11:22:28 +0800
Subject: [PATCH] 2025-07-01 添加设备维修保养的设备名称合型号字段

---
 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java |   49 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 1b6cfb5..37ce27d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -4,19 +4,23 @@
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Arrays;
 
-
+@Api(tags = "璁惧淇濆吇")
 @RestController
 @RequestMapping("/device/maintenance")
 public class DeviceMaintenanceController {
@@ -25,34 +29,51 @@
     @Autowired
     private IDeviceMaintenanceService deviceMaintenanceService;
 
-    @ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
+    @Autowired
+    private IDeviceLedgerService deviceLedgerService;
+
+    @ApiModelProperty("璁惧淇濆吇鍒楄〃")
     @GetMapping("/page")
     public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
         return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
     }
 
     @PostMapping()
-    @ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
-    public AjaxResult add(@RequestBody DeviceMaintenance deviceRepair) {
-        return deviceMaintenanceService.saveDeviceRepair(deviceRepair);
+    @ApiModelProperty("娣诲姞璁惧淇濆吇")
+    public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+        deviceMaintenance.setDeviceName(byId.getDeviceName());
+        deviceMaintenance.setDeviceModel(byId.getDeviceModel());
+        return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
     }
 
-    @ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
+    @ApiModelProperty("鏍规嵁id鏌ヨ璁惧淇濆吇")
     @GetMapping("/{id}")
     public AjaxResult detail(@PathVariable Long id) {
-        return AjaxResult.success(deviceMaintenanceService.getById(id));
+        return AjaxResult.success(deviceMaintenanceService.detailById(id));
     }
 
     @PutMapping ()
-    @ApiModelProperty("淇敼璁惧鎶ヤ慨")
+    @ApiModelProperty("淇敼璁惧淇濆吇")
     public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
-        return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
+        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+        deviceMaintenance.setDeviceName(byId.getDeviceName());
+        deviceMaintenance.setDeviceModel(byId.getDeviceModel());
+        return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
     }
 
-    @DeleteMapping("/{id}")
-    @ApiModelProperty("鍒犻櫎璁惧鎶ヤ慨")
-    public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
-        boolean b = deviceMaintenanceService.removeBatchByIds(ids);
+    @PostMapping ("maintenance")
+    @ApiModelProperty("淇敼璁惧淇濆吇")
+    public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
+        deviceMaintenance.setStatus(1);
+        return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
+    }
+
+
+    @DeleteMapping("/{ids}")
+    @ApiModelProperty("鍒犻櫎璁惧淇濆吇")
+    public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+        boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
         if (!b) {
             return AjaxResult.error("鍒犻櫎澶辫触");
         }
@@ -60,7 +81,7 @@
     }
 
     @PostMapping("export")
-    @ApiModelProperty("瀵煎嚭璁惧鎶ヤ慨")
+    @ApiModelProperty("瀵煎嚭璁惧淇濆吇")
     public void export(HttpServletResponse response, Long[] ids) {
         deviceMaintenanceService.export(response, ids);
     }

--
Gitblit v1.9.3