From c328f3908f6b2922c3a5adfce786aad25ba2fe1e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期日, 04 一月 2026 17:20:17 +0800
Subject: [PATCH] feat(production): 添加工资定额新增修改
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 11 ++++++++---
1 files changed, 8 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 0687aad..aa9e05b 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
@@ -23,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -39,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