From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index d3c19bb..1b43372 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -5,7 +5,8 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,48 +19,54 @@
@RequestMapping("/device/repair")
@RestController
@AllArgsConstructor
-public class DeviceRepairController {
+public class DeviceRepairController extends BaseController {
private IDeviceRepairService deviceRepairService;
@Operation(summary = "璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
- return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
+ public R<?> page(Page page , DeviceRepairDto deviceRepairDto) {
+ return R.ok(deviceRepairService.queryPage(page,deviceRepairDto));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧鎶ヤ慨")
- public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public R<?> add( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.saveDeviceRepair(deviceRepairDto);
}
@Operation(summary = "鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
- public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceRepairService.detailById(id));
+ public R<?> detail(@PathVariable Long id) {
+ return R.ok(deviceRepairService.detailById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧鎶ヤ慨")
- public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public R<?> update( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
- @PostMapping ("repair")
+ @PostMapping ("/repair")
@Operation(summary = "璁惧缁翠慨")
- public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
- return deviceRepairService.updateDeviceRepair(deviceRepairDto);
+ public R<?> repair( @RequestBody DeviceRepairDto deviceRepairDto) {
+ return deviceRepairService.confirmRepair(deviceRepairDto);
+ }
+
+ @PostMapping ("/acceptance")
+ @Operation(summary = "璁惧鎶ヤ慨楠屾敹瀹℃壒")
+ public R<?> acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
+ return deviceRepairService.approveRepairAcceptance(deviceRepairDto);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧鎶ヤ慨")
- public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ public R<?> delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("export")
--
Gitblit v1.9.3