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/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