From f0efc10af370936b4db47b8428eb1ca4686431f9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 06 八月 2026 15:11:56 +0800
Subject: [PATCH] feat(home): 添加报表日期范围筛选功能并完善设备维护管理

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

diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index e53953d..d776137 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -34,7 +34,7 @@
 
     @PostMapping()
     @Operation(summary = "娣诲姞璁惧淇濆吇")
-    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());
@@ -49,7 +49,7 @@
 
     @PutMapping ()
     @Operation(summary = "淇敼璁惧淇濆吇")
-    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());
@@ -58,7 +58,7 @@
 
     @PostMapping ("maintenance")
     @Operation(summary = "淇敼璁惧淇濆吇")
-    public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
+    public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
         return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
     }
 
@@ -79,5 +79,16 @@
         deviceMaintenanceService.export(response, ids);
     }
 
+    @PutMapping("/complete/{id}")
+    @Operation(summary = "淇濆吇瀹屾垚")
+    public AjaxResult complete(@PathVariable Long id) {
+        return deviceMaintenanceService.complete(id);
+    }
+
+    @PutMapping("/batchComplete")
+    @Operation(summary = "涓�閿繚鍏诲畬鎴�")
+    public AjaxResult batchComplete(String dateStr) {
+        return deviceMaintenanceService.batchComplete(dateStr);
+    }
 
 }

--
Gitblit v1.9.3