From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务  设备维修新增是否生成工单

---
 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.java
index 9220b00..3d54e29 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.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.ReceivingNoteItemQueryDTO;
 import com.by4cloud.platformx.device.entity.ReceivingNoteItem;
 import com.by4cloud.platformx.device.service.ReceivingNoteItemService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,15 +41,14 @@
     /**
      * 鍒嗛〉鏌ヨ
      * @param page 鍒嗛〉瀵硅薄
-     * @param receivingNoteItem 楠屾敹瀛愰」琛�
+     * @param queryDTO 楠屾敹瀛愰」琛�
      * @return
      */
     @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
     @GetMapping("/page" )
     @PreAuthorize("@pms.hasPermission('device_receivingNoteItem_view')" )
-    public R getReceivingNoteItemPage(@ParameterObject Page page, @ParameterObject ReceivingNoteItem receivingNoteItem) {
-        LambdaQueryWrapper<ReceivingNoteItem> wrapper = Wrappers.lambdaQuery();
-        return R.ok(receivingNoteItemService.page(page, wrapper));
+    public R getReceivingNoteItemPage(@ParameterObject Page page, @ParameterObject ReceivingNoteItemQueryDTO queryDTO) {
+        return R.ok(receivingNoteItemService.pageNew(page, queryDTO));
     }
 
 
@@ -116,4 +116,15 @@
     public List<ReceivingNoteItem> export(ReceivingNoteItem receivingNoteItem,Long[] ids) {
         return receivingNoteItemService.list(Wrappers.lambdaQuery(receivingNoteItem).in(ArrayUtil.isNotEmpty(ids), ReceivingNoteItem::getId, ids));
     }
+
+	/**
+	 * 鏍规嵁鍚堝悓鏌ヨ鍚堝悓鍐呯殑璁惧
+	 * @param contractId
+	 * @return
+	 */
+	@Operation(summary = "鏍规嵁鍚堝悓鏌ヨ鍚堝悓鍐呯殑璁惧" , description = "鏍规嵁鍚堝悓鏌ヨ鍚堝悓鍐呯殑璁惧")
+			@GetMapping("/getDeviceListByContractId/{contractId}")
+	public R getDeviceListByContractId(@PathVariable("contractId")Long contractId) {
+		return receivingNoteItemService.getDeviceListByContractId(contractId);
+	}
 }

--
Gitblit v1.9.1