From d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:23:30 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 7f2caf2..46b2577 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -637,9 +637,9 @@
.eq(ShippingInfo::getSalesLedgerProductId, product.getId())
.orderByDesc(ShippingInfo::getCreateTime)
.last("limit 1"));
- product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
- product.setShippingDate(shippingInfo.getShippingDate());
if (shippingInfo != null) {
+ product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
+ product.setShippingDate(shippingInfo.getShippingDate());
product.setShippingStatus(shippingInfo.getStatus());
}
}
@@ -687,8 +687,10 @@
return 0;
}
// 鍒犻櫎閿�鍞鐞嗘暟鎹�
+ // 浜у搧瀛愯〃閿�鍞�/閲囪喘鍏辩敤锛屼笖涓昏〃 id 鍙兘鐩稿悓锛屽繀椤绘寜 type 鍖哄垎锛屽惁鍒欎細璇垹閲囪喘鍙拌处鐨勪骇鍝佹暟鎹�
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList)
+ .eq(SalesLedgerProduct::getType, 1)
.select(SalesLedgerProduct::getId);
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(queryWrapper);
--
Gitblit v1.9.3