From 0b0b8419586505154a7e57e7c32c9a44329347ce Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 14:01:56 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_gybjyhglxt
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index 420ed9a..aa9e05b 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -41,14 +41,17 @@
@Override
public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {
-
- return deviceLedgerMapper.queryPage(page, deviceLedger);
+ IPage<DeviceLedgerDto> deviceLedgerDtoIPage = deviceLedgerMapper.queryPage(page, deviceLedger);
+ deviceLedgerDtoIPage.getRecords().forEach(c -> {
+ c.setStatus("1".equals(c.getStatus()) ? "姝ｅ父" : "鍋滅敤");
+ });
+ return deviceLedgerDtoIPage;
}
@Override
public AjaxResult saveDeviceLedger(DeviceLedger deviceLedger) {
LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
- deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceModel,deviceLedger.getDeviceModel());
+ deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceName,deviceLedger.getDeviceName());
if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
return AjaxResult.error("璁惧鍨嬪彿宸插瓨鍦�");
}
--
Gitblit v1.9.3