From dc0dc216eec524e67ce19f820d2501a3798fcfe0 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期五, 28 三月 2025 16:49:45 +0800 Subject: [PATCH] fix: 年度投资计划 --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java index 8a31ce0..ce4aa3b 100644 --- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java +++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java @@ -7,7 +7,10 @@ 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.ContractItemQueryDTO; +import com.by4cloud.platformx.device.entity.Contract; import com.by4cloud.platformx.device.entity.ContractItem; +import com.by4cloud.platformx.device.entity.Device; import com.by4cloud.platformx.device.service.ContractItemService; import org.springframework.security.access.prepost.PreAuthorize; import com.by4cloud.platformx.common.excel.annotation.ResponseExcel; @@ -40,15 +43,14 @@ /** * 鍒嗛〉鏌ヨ * @param page 鍒嗛〉瀵硅薄 - * @param contractItem 鍚堝悓鏄庣粏琛� + * @param * @return */ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" ) @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('platformx_contractItem_view')" ) - public R getContractItemPage(@ParameterObject Page page, @ParameterObject ContractItem contractItem) { - LambdaQueryWrapper<ContractItem> wrapper = Wrappers.lambdaQuery(); - return R.ok(contractItemService.page(page, wrapper)); + public R getContractItemPage(Page page,ContractItemQueryDTO queryDTO) { + return R.ok(contractItemService.pageNew(page, queryDTO)); } -- Gitblit v1.9.1