From cc59b65bc63b839127c29775bcd410dd407de66d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 21 四月 2025 17:20:02 +0800
Subject: [PATCH] 设备采购计划与设备照片
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java
index c6e4689..c416bfb 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNote;
import com.by4cloud.platformx.device.service.ReceivingNoteService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 楠屾敹琛�
@@ -40,15 +40,14 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param receivingNote 楠屾敹琛�
+ * @param queryDTO 楠屾敹琛�
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('device_receivingNote_view')" )
- public R getReceivingNotePage(@ParameterObject Page page, @ParameterObject ReceivingNote receivingNote) {
- LambdaQueryWrapper<ReceivingNote> wrapper = Wrappers.lambdaQuery();
- return R.ok(receivingNoteService.page(page, wrapper));
+ public R getReceivingNotePage(@ParameterObject Page page, @ParameterObject ReceivingNoteQueryDTO queryDTO) {
+ return R.ok(receivingNoteService.pageNew(page, queryDTO));
}
@@ -61,7 +60,7 @@
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('device_receivingNote_view')" )
public R getById(@PathVariable("id" ) Long id) {
- return R.ok(receivingNoteService.getById(id));
+ return R.ok(receivingNoteService.getByIdDeep(id));
}
/**
@@ -74,7 +73,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('device_receivingNote_add')" )
public R save(@RequestBody ReceivingNote receivingNote) {
- return R.ok(receivingNoteService.save(receivingNote));
+ return receivingNoteService.saveDeep(receivingNote);
}
/**
@@ -87,7 +86,7 @@
@PutMapping
@PreAuthorize("@pms.hasPermission('device_receivingNote_edit')" )
public R updateById(@RequestBody ReceivingNote receivingNote) {
- return R.ok(receivingNoteService.updateById(receivingNote));
+ return R.ok(receivingNoteService.updateByIdDeep(receivingNote));
}
/**
--
Gitblit v1.9.1