From f02b5af51f2fcfaae5b04e4c12078ec0da578f7e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 14 七月 2025 13:03:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 3 +++
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 9 +++++++++
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java | 2 +-
src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java | 3 +++
5 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 6f9e6a6..2a288e4 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -123,6 +123,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct) {
+ //鏈紑绁ㄦ暟閲�+閲戦
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
int result;
Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
if (salesLedgerProduct.getId() == null) {
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java
index f5a0087..3cca995 100644
--- a/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java
@@ -18,4 +18,7 @@
IPage<StaffJoinLeaveRecord> staffJoinLeaveRecordListPage(Page page, @Param("staffJoinLeaveRecord") StaffJoinLeaveRecord staffJoinLeaveRecord);
List<StaffJoinLeaveRecord> staffJoinLeaveRecordList(@Param("staffJoinLeaveRecord") StaffJoinLeaveRecord staffJoinLeaveRecord);
+
+ List<StaffJoinLeaveRecord> staffOnJobList();
+
}
diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index 8893835..d32c69c 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -18,5 +18,5 @@
void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
- List<StaffOnJob> staffOnJobList();
+ List<StaffJoinLeaveRecord> staffOnJobList();
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 3a07854..8aaa840 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -51,8 +51,8 @@
}
@Override
- public List<StaffOnJob> staffOnJobList() {
- return staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffState,1));
+ public List<StaffJoinLeaveRecord> staffOnJobList() {
+ return staffJoinLeaveRecordMapper.staffOnJobList();
}
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index be3c392..82b7609 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -22,4 +22,13 @@
AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
</if>
</select>
+ <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
+ select *
+ from (select *,
+ ROW_NUMBER() over (PARTITION BY staff_no ORDER BY create_time DESC ) as rn
+ from staff_join_leave_record
+ where staff_state = 1) t
+ where rn = 1
+
+ </select>
</mapper>
--
Gitblit v1.9.3