From 7ed65656296a198162b91cdf311c197aebcff0e8 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 02 四月 2025 15:25:44 +0800
Subject: [PATCH] 台账 验收 新增名称字段对应 列表及条件搜索调整
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..f43eafa 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
@@ -52,9 +52,11 @@
@PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_view')" )
public R getDeviceLeasingLedgerPage(@ParameterObject Page page, @ParameterObject DeviceLeasingLedger deviceLeasingLedger) {
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.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerName()),DeviceLeasingLedger::getLedgerName,deviceLeasingLedger.getLedgerName());
+ wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
+ wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
+ wrapper.orderByDesc(DeviceLeasingLedger::getCreateTime);
+ return R.ok(deviceLeasingLedgerService.page(page, wrapper));
}
@@ -67,7 +69,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 +83,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 +141,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