From 6305d0c86c23e9a583e8ca798645885d167f4dc5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 17:20:58 +0800
Subject: [PATCH] feat:1.销售台账导出按照查询条件 2.导出订单和产品明细
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index d6aadd1..51c1d37 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -10,7 +10,6 @@
import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -39,7 +38,8 @@
@PostMapping()
@ApiOperation("娣诲姞璁惧鎶ヤ慨")
public AjaxResult add(@RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.saveDeviceRepair(deviceRepair);
+ Long id = deviceRepairService.saveDeviceRepair(deviceRepair);
+ return AjaxResult.success("娣诲姞鎴愬姛", id);
}
@ApiOperation("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@@ -52,19 +52,28 @@
@PutMapping()
@ApiOperation("淇敼璁惧鎶ヤ慨")
public AjaxResult update(@RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.updateDeviceRepair(deviceRepair);
+ deviceRepairService.updateDeviceRepair(deviceRepair);
+ return AjaxResult.success();
}
@PostMapping("repair")
@ApiOperation("璁惧缁翠慨")
public AjaxResult repair(@RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.updateDeviceRepair(deviceRepair);
+ deviceRepairService.submitDeviceMaintain(deviceRepair);
+ return AjaxResult.success();
+ }
+
+ @PostMapping("acceptance")
+ @ApiOperation("璁惧鎶ヤ慨楠屾敹")
+ public AjaxResult acceptance(@RequestBody DeviceRepair deviceRepair) {
+ deviceRepairService.acceptDeviceRepair(deviceRepair);
+ return AjaxResult.success();
}
@DeleteMapping("/{ids}")
@ApiOperation("鍒犻櫎璁惧鎶ヤ慨")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
- boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
+ boolean b = deviceRepairService.deleteRepairAndFiles(Arrays.asList(ids));
if (!b) {
return AjaxResult.error("鍒犻櫎澶辫触");
}
@@ -78,9 +87,9 @@
}
@PostMapping("/uploadFile")
- @ApiOperation("璁惧淇濅慨-闄勪欢涓婁紶")
- public AjaxResult uploadFile(MultipartFile file, Long deviceRepairId) {
- deviceRepairService.uploadFile(file, deviceRepairId);
+ @ApiOperation("璁惧淇濅慨-闄勪欢涓婁紶锛坒ileType: 14璁惧闂 15缁翠慨瀹屾垚锛�")
+ public AjaxResult uploadFile(MultipartFile file, Long deviceRepairId, Integer fileType) {
+ deviceRepairService.uploadFile(file, deviceRepairId, fileType);
return AjaxResult.success();
}
--
Gitblit v1.9.3