From 51df7aac3c2264151f8dcdb6386f8563ba4483cf Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 25 三月 2025 14:43:14 +0800
Subject: [PATCH] 合同及明细 验收单及明细 中标通知书

---
 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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..c8a7142 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));
     }
 
 

--
Gitblit v1.9.1