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/DeviceDemandTotalController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
index 914cdb9..5379c42 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
@@ -64,7 +64,6 @@
*/
@Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
@GetMapping("/{id}" )
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_view')" )
public R getById(@PathVariable("id" ) Long id) {
DeviceDemandTotal demandTotal = deviceDemandTotalService.getById(id);
QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
@@ -86,7 +85,15 @@
QueryWrapper<DeviceDemandTotal> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(DeviceDemandTotal::getPlanId,id);
- return R.ok(deviceDemandTotalService.list(wrapper));
+ List<DeviceDemandTotal> list = deviceDemandTotalService.list(wrapper);
+ for (DeviceDemandTotal deviceDemandTotal : list) {
+ QueryWrapper<DeviceDemandSub> wrapper1 = new QueryWrapper<>();
+ wrapper1.lambda()
+ .eq(DeviceDemandSub::getTotalId,deviceDemandTotal.getId());
+ List<DeviceDemandSub> list1 = deviceDemandSubService.list(wrapper1);
+ deviceDemandTotal.setSubList(list1);
+ }
+ return R.ok(list);
}
--
Gitblit v1.9.1