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/DeviceLeasingLedgerController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
index 6c6d1ab..8495ef1 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
@@ -54,7 +54,8 @@
LambdaQueryWrapper<DeviceLeasingLedger> wrapper = Wrappers.lambdaQuery();
wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
- return R.ok(deviceLeasingLedgerService.page(page, wrapper));
+ wrapper.orderByDesc(DeviceLeasingLedger::getCreateTime);
+ return R.ok(deviceLeasingLedgerService.page(page, wrapper));
}
@@ -67,7 +68,7 @@
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_view')" )
public R getById(@PathVariable("id" ) Long id) {
- return R.ok(deviceLeasingLedgerService.getById(id));
+ return R.ok(deviceLeasingLedgerService.getByIdDeep(id));
}
/**
@@ -81,7 +82,7 @@
@PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_add')" )
public R save(@RequestBody DeviceLeasingLedger deviceLeasingLedger) {
deviceLeasingLedger.setLedgerCode(maxSizeService.nextNo(MaxSizeContant.LEDGER_CODE));
- return R.ok(deviceLeasingLedgerService.save(deviceLeasingLedger));
+ return deviceLeasingLedgerService.saveDeep(deviceLeasingLedger);
}
/**
@@ -139,4 +140,13 @@
public R getDeviceSelectList(@PathVariable("ledgerId")Long ledgerId) {
return R.ok(deviceLeasingLedgerService.getDeviceSelectList(ledgerId));
}
+
+ /**
+ * 鍙拌处涓澶囧簭鍒楀彿涓嬫媺涓嬫媺
+ */
+ @Operation(summary = "鍙拌处鏄庣粏涓澶囧簭鍒楀彿涓嬫媺",description = "鍙拌处鏄庣粏涓澶囧簭鍒楀彿涓嬫媺涓嬫媺")
+ @GetMapping("/getLedgerDeviceList/{deviceId}")
+ public R getLedgerDeviceList(@PathVariable("deviceId")Long deviceId) {
+ return R.ok(deviceLeasingLedgerService.getLedgerDeviceList(deviceId));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1