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 | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 31c2f0e..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("璁惧鍨嬪彿宸插瓨鍦�");
}
@@ -61,14 +64,6 @@
@Override
public AjaxResult updateDeviceLedger(DeviceLedger deviceLedger) {
- if (ObjectUtils.isNotNull(deviceLedger.getStartRuntimeTime()) && ObjectUtils.isNotNull(deviceLedger.getEndRuntimeTime())){
- //璁＄畻杩愯鏃堕暱
- long start = deviceLedger.getStartRuntimeTime().toEpochSecond(ZoneOffset.UTC) * 1000;
- long end = deviceLedger.getEndRuntimeTime().toEpochSecond(ZoneOffset.UTC) * 1000;
- long diffMillis = Math.abs(end - start);
- double time = diffMillis / (1000.0 * 60 * 60);// 姣 -> 绉� -> 鍒嗛挓 -> 灏忔椂
- deviceLedger.setRuntimeDuration(time+"h");
- }
if (this.updateById(deviceLedger)) {
return AjaxResult.success();
}
--
Gitblit v1.9.3