From ed01d6fd55fb112631034617d973d6e90499aaca Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 二月 2026 10:01:26 +0800
Subject: [PATCH] fix: 人员薪资导出接口缺少部门、岗位名称
---
src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java | 6 ++++++
src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml | 12 ++++++++++++
src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java | 11 ++++++++++-
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 2 +-
src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java | 8 ++++++++
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index c90c5de..f6eee0f 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -82,7 +82,7 @@
@Log(title = "瀵煎嚭钖祫绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
- List<CompensationPerformance> list = compensationPerformanceService.list();
+ List<CompensationPerformance> list = compensationPerformanceService.exportList();
ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
util.exportExcel(response, list, "瀵煎嚭钖祫绠＄悊鍒楄〃");
}
diff --git a/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java b/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java
index 22d64a7..394ab03 100644
--- a/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java
+++ b/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java
@@ -6,6 +6,8 @@
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @author :yys
* @date : 2025/8/8 9:54
@@ -18,7 +20,14 @@
* @param page 鍒嗛〉
* @param staffName 鍛樺伐濮撳悕
* @param payDateStr 钖祫鏃ユ湡
- * @return
+ * @return 鏌ヨ鐨勪汉鍛樿柂璧勪俊鎭�
*/
IPage<CompensationPerformance> listPage(Page page, @Param("staffName") String staffName, @Param("payDateStr") String payDateStr);
+
+ /**
+ * 瀵煎嚭浜哄憳钖祫
+ *
+ * @return 浜哄憳钖祫淇℃伅
+ */
+ List<CompensationPerformance> exportList();
}
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java b/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
index fbd110b..a7af9a4 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
+import java.util.List;
+
/**
* @author :yys
* @date : 2025/8/8 9:55
@@ -21,4 +23,10 @@
*/
IPage<CompensationPerformance> listPage(Page page, String staffName, String payDateStr);
+ /**
+ * 瀵煎嚭浜哄憳鏂板
+ *
+ * @return 浜哄憳钖祫
+ */
+ List<CompensationPerformance> exportList();
}
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 33d8c87..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
@@ -27,4 +29,8 @@
return compensationPerformanceMapper.listPage(page, staffName, payDateStr);
}
+ @Override
+ public List<CompensationPerformance> exportList() {
+ return compensationPerformanceMapper.exportList();
+ }
}
diff --git a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
index 6071266..a784c99 100644
--- a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
+++ b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
@@ -22,4 +22,16 @@
</where>
ORDER BY cp.pay_date DESC, cp.id DESC
</select>
+
+ <select id="exportList" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
+ SELECT cp.*,
+ soj.staff_name AS staffName,
+ sp.post_name AS postName,
+ sd.dept_name AS deptName
+ FROM compensation_performance cp
+ LEFT JOIN staff_on_job soj ON soj.id = cp.staff_id
+ LEFT JOIN sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN sys_dept sd ON sd.dept_id = soj.sys_dept_id
+ ORDER BY cp.pay_date DESC, cp.id DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3