From c16329fad94c7a783aae1fc204b9b9818dcf1d29 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期一, 31 三月 2025 11:04:48 +0800 Subject: [PATCH] 合同新增添加中标单关联,根据选择的中标单赋值乙方 中标单中标厂家改成下拉 验收单来源类型根据合同类型,查询条件和结果新增合同名称 --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InventoryFlowWaterController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InventoryFlowWaterController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InventoryFlowWaterController.java index 9583c9a..29894dc 100644 --- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InventoryFlowWaterController.java +++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InventoryFlowWaterController.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.InventoryFlowWaterQueryDTO; import com.by4cloud.platformx.device.entity.InventoryFlowWater; import com.by4cloud.platformx.device.service.InventoryFlowWaterService; import org.springframework.security.access.prepost.PreAuthorize; @@ -40,15 +41,14 @@ /** * 鍒嗛〉鏌ヨ * @param page 鍒嗛〉瀵硅薄 - * @param inventoryFlowWater 搴撳瓨娴佹按琛� + * @param queryDTO 搴撳瓨娴佹按琛� * @return */ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" ) @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('platformx_inventoryFlowWater_view')" ) - public R getInventoryFlowWaterPage(@ParameterObject Page page, @ParameterObject InventoryFlowWater inventoryFlowWater) { - LambdaQueryWrapper<InventoryFlowWater> wrapper = Wrappers.lambdaQuery(); - return R.ok(inventoryFlowWaterService.page(page, wrapper)); + public R getInventoryFlowWaterPage(@ParameterObject Page page, @ParameterObject InventoryFlowWaterQueryDTO queryDTO) { + return R.ok(inventoryFlowWaterService.pageNew(page, queryDTO)); } -- Gitblit v1.9.1