From c21cb3d8cebd9cdef4df2efa372c5b9257c713e4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:40 +0800
Subject: [PATCH] feat(device,supply,satisfaction): 设备计划后端改造、耗材存放位置与满意度照片支持
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java
index 3de42ec..bc27f33 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java
@@ -7,7 +7,6 @@
import com.ruoyi.device.dto.DeviceMaintenancePlanDto;
import com.ruoyi.device.pojo.DeviceMaintenancePlan;
import com.ruoyi.device.pojo.DeviceMaintenancePlanDetails;
-import com.ruoyi.device.service.DeviceMaintenancePlanDetailsService;
import com.ruoyi.device.service.DeviceMaintenancePlanService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -16,6 +15,7 @@
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
import java.util.Map;
/**
@@ -32,9 +32,6 @@
public class DeviceMaintenancePlanController {
@Resource
private DeviceMaintenancePlanService deviceMaintenancePlanService;
-
- @Resource
- private DeviceMaintenancePlanDetailsService deviceMaintenancePlanDetailsService;
/**
* 鍒嗛〉鏌ヨ璁惧淇濆吇璁″垝
@@ -95,6 +92,15 @@
}
/**
+ * 淇濆吇璁″垝骞翠唤鍒楄〃锛堣嚜鍔ㄥ垹闄ゆ病鏈夋槑缁嗙殑绌哄勾浠借鍒掞級
+ */
+ @Operation(summary = "淇濆吇璁″垝骞翠唤鍒楄〃")
+ @GetMapping("/getPlanYears")
+ public Result<List<String>> getPlanYears() {
+ return Result.success(deviceMaintenancePlanService.getMaintenancePlanYears());
+ }
+
+ /**
* 璁惧淇濆吇璁″垝璇︽儏鍒楄〃锛堝惈鍒扮偣鏍囩孩锛�
*/
@Operation(summary = "璁惧淇濆吇璁″垝璇︽儏鍒楄〃")
@@ -109,7 +115,7 @@
@Operation(summary = "淇敼璁惧淇濆吇璁″垝璇︽儏")
@PostMapping("/updateMaintenancePlanDetail")
public Result updateMaintenancePlanDetail(@RequestBody DeviceMaintenancePlanDetails deviceMaintenancePlanDetails) {
- return Result.success(deviceMaintenancePlanDetailsService.updateById(deviceMaintenancePlanDetails));
+ return Result.success(deviceMaintenancePlanService.updateMaintenancePlanDetail(deviceMaintenancePlanDetails));
}
/**
@@ -118,7 +124,7 @@
@Operation(summary = "鍒犻櫎璁惧淇濆吇璁″垝璇︽儏")
@DeleteMapping("/delMaintenancePlanDetail")
public Result delMaintenancePlanDetail(Integer maintenancePlanDetailId) {
- return Result.success(deviceMaintenancePlanDetailsService.removeById(maintenancePlanDetailId));
+ return Result.success(deviceMaintenancePlanService.removeMaintenancePlanDetail(maintenancePlanDetailId));
}
/**
--
Gitblit v1.9.3