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/ContractController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
index 4bbec76..8d8d98c 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
@@ -57,6 +57,7 @@
wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType());
wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName());
wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber());
+ wrapper.orderByDesc(Contract::getCreateTime);
return R.ok(contractService.page(page, wrapper));
}
@@ -126,4 +127,26 @@
public List<Contract> export(Contract contract,Long[] ids) {
return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids));
}
+
+ /**
+ * 瀹℃壒閫氳繃鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "瀹℃壒閫氳繃鍚堝悓" , description = "瀹℃壒閫氳繃鍚堝悓" )
+ @GetMapping("/approved/{id}" )
+ public R approved(@PathVariable("id" ) Long id) {
+ return R.ok(contractService.approved(id));
+ }
+
+ /**
+ * 鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�
+ * @return R
+ */
+ @Operation(summary = "鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�" , description = "鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�" )
+ @GetMapping("/getApprovedContractList" )
+ public R getApprovedContractList() {
+ return R.ok(contractService.getApprovedContractList());
+ }
+
}
--
Gitblit v1.9.1