From 569483bbc66ad0b141fe946b2c19c0de83bccba4 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 12 二月 2026 15:50:18 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
index 2e0d744..b3b3aa7 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
@@ -10,6 +10,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @author :yys
* @date : 2025/8/8 9:55
@@ -23,8 +25,12 @@
@Override
- public IPage<CompensationPerformance> listPage(Page page, CompensationPerformance compensationPerformance) {
- IPage<CompensationPerformance> compensationPerformanceIPage = compensationPerformanceMapper.listPage(page, compensationPerformance);
- return compensationPerformanceIPage;
+ public IPage<CompensationPerformance> listPage(Page page, String staffName, String payDateStr) {
+ return compensationPerformanceMapper.listPage(page, staffName, payDateStr);
+ }
+
+ @Override
+ public List<CompensationPerformance> exportList() {
+ return compensationPerformanceMapper.exportList();
}
}
--
Gitblit v1.9.3