From e3cc5fb859a4e3c56c1dfa4d7892b233a30874fa Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 四月 2024 15:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
index 68d768e..7e2580d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.sql.Date;
import java.util.Map;
@RestController
@@ -47,9 +48,12 @@
}
@ApiOperation("鏌ヨ缁翠慨淇濆吇鏁版嵁鎺ュ彛")
- @PostMapping ("/selectMaintenance")
- public Result selectMaintenance() {
- return Result.seccess(deviceMaintenanceService.selectMaintenanceSv());
+ @PostMapping ("/selectMaintenance/{selectTime1}/{selectTime2}")
+ public Result selectMaintenance(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2
+ ) {
+ return Result.seccess(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
}
@@ -64,4 +68,17 @@
}
}
+ @ApiOperation("鏌ヨ璁惧绠＄悊鎺ュ彛")
+ @PostMapping ("/selectMachine")
+ public Result selectMachine() {
+ return Result.seccess(deviceMaintenanceService.selectMachineSv());
+ }
+
+ @ApiOperation("鏍规嵁Id鏌ヨ瀵瑰簲鏁版嵁鎺ュ彛")
+ @PostMapping ("/openSelectId/{id}")
+ public Result openSelectId(
+ @PathVariable String id){
+ return Result.seccess(deviceMaintenanceService.openSelectIdSv(id));
+
+ }
}
--
Gitblit v1.8.0