From bb1d7eeda426e66393cf4403cb3ef082db696bd9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 07 八月 2026 15:42:19 +0800
Subject: [PATCH] feat(report): 新增会计报表功能并完善设备维护和首页统计

---
 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 5442195..28e9b0d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -2,17 +2,18 @@
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceMaintenanceBatchCompleteDto;
 import com.ruoyi.device.dto.DeviceMaintenanceDto;
 import com.ruoyi.device.pojo.DeviceLedger;
 import com.ruoyi.device.pojo.DeviceMaintenance;
 import com.ruoyi.device.service.IDeviceLedgerService;
 import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -21,7 +22,7 @@
 @RestController
 @RequestMapping("/device/maintenance")
 @AllArgsConstructor
-public class DeviceMaintenanceController extends BaseController {
+public class DeviceMaintenanceController {
 
 
     private IDeviceMaintenanceService deviceMaintenanceService;
@@ -29,13 +30,13 @@
 
     @Operation(summary = "璁惧淇濆吇鍒楄〃")
     @GetMapping("/page")
-    public R<?> page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
-        return R.ok(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
+    public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
+        return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
     }
 
     @PostMapping()
     @Operation(summary = "娣诲姞璁惧淇濆吇")
-    public R<?> add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+    public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
         DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
         deviceMaintenance.setDeviceName(byId.getDeviceName());
         deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -44,13 +45,13 @@
 
     @Operation(summary = "鏍规嵁id鏌ヨ璁惧淇濆吇")
     @GetMapping("/{id}")
-    public R<?> detail(@PathVariable Long id) {
-        return R.ok(deviceMaintenanceService.detailById(id));
+    public AjaxResult detail(@PathVariable Long id) {
+        return AjaxResult.success(deviceMaintenanceService.detailById(id));
     }
 
     @PutMapping ()
     @Operation(summary = "淇敼璁惧淇濆吇")
-    public R<?> update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+    public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
         DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
         deviceMaintenance.setDeviceName(byId.getDeviceName());
         deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -59,19 +60,19 @@
 
     @PostMapping ("maintenance")
     @Operation(summary = "淇敼璁惧淇濆吇")
-    public R<?> maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+    public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
         return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
     }
 
 
     @DeleteMapping("/{ids}")
     @Operation(summary = "鍒犻櫎璁惧淇濆吇")
-    public R<?> delete(@PathVariable("ids") Long[] ids) {
+    public AjaxResult delete(@PathVariable("ids") Long[] ids) {
         boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
         if (!b) {
-            return R.fail("鍒犻櫎澶辫触");
+            return AjaxResult.error("鍒犻櫎澶辫触");
         }
-        return R.ok();
+        return AjaxResult.success();
     }
 
     @PostMapping("export")
@@ -80,5 +81,23 @@
         deviceMaintenanceService.export(response, ids);
     }
 
+    @PostMapping("/batchComplete")
+    @Operation(summary = "涓�閿繚鍏诲畬鎴�")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult batchComplete(@RequestBody DeviceMaintenanceBatchCompleteDto dto) {
+        return deviceMaintenanceService.batchComplete(dto);
+    }
+
+    @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