From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index ba8de8b..1fd1c04 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -4,8 +4,7 @@
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.service.DeviceDefectRecordService;
-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 lombok.AllArgsConstructor;
@@ -15,35 +14,35 @@
@RequestMapping("/defect")
@AllArgsConstructor
@RestController
-public class DeviceDefectRecordController extends BaseController {
+public class DeviceDefectRecordController {
private DeviceDefectRecordService deviceDefectRecordService;
@Operation(summary = "璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
- return R.ok(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
+ public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
+ return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
@Operation(summary = "璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
- public R<?> find(@PathVariable Long deviceLedgerId) {
+ public AjaxResult find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(deviceLedgerId);
- return R.ok(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
+ return AjaxResult.success(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
}
@PostMapping("/add")
@Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
- public R<?> add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return R.ok(deviceDefectRecordService.add(deviceDefectRecord));
+ public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
@Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
- public R<?> update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return R.ok(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
+ public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
- public R<?> delete(@PathVariable Long id) {
- return R.ok(deviceDefectRecordService.removeById(id));
+ public AjaxResult delete(@PathVariable Long id) {
+ return AjaxResult.success(deviceDefectRecordService.removeById(id));
}
}
--
Gitblit v1.9.3