From 8b749305a8e8c3f4bf669f6980edf2bbb7bfa9c7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..019de96 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
@@ -6,9 +6,11 @@
import com.ruoyi.compensationperformance.mapper.CompensationPerformanceMapper;
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.compensationperformance.service.CompensationPerformanceService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author :yys
@@ -16,15 +18,19 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class CompensationPerformanceServiceImpl extends ServiceImpl<CompensationPerformanceMapper, CompensationPerformance> implements CompensationPerformanceService {
- @Autowired
- private CompensationPerformanceMapper compensationPerformanceMapper;
+ private final CompensationPerformanceMapper compensationPerformanceMapper;
@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