From f4af3fbde83f305f4f1c96154aaa95944ecd8276 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 28 十月 2026 17:42:31 +0800
Subject: [PATCH] feat(hrm): 新增「我的薪资」,员工可自助查看本人工资条
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java | 19 +++++++++
sql/mysql/hrm_my_payslip_init.sql | 45 ++++++++++++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 26 +++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java | 21 ++++++++++
4 files changed, 111 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/hrm_my_payslip_init.sql b/sql/mysql/hrm_my_payslip_init.sql
new file mode 100644
index 0000000..42baceb
--- /dev/null
+++ b/sql/mysql/hrm_my_payslip_init.sql
@@ -0,0 +1,45 @@
+-- =====================================================================
+-- 鎴戠殑钖祫锛堝憳宸ヨ嚜鍔╂煡鐪嬪伐璧勬潯锛夊垵濮嬪寲鑴氭湰
+--
+-- 鑳屾櫙锛氱郴缁熷師鍏堝彧鏈夈�岃柂閰牳绠� / 钖祫鍙戞斁銆嶄袱涓鐞嗙椤甸潰锛屼笖闇� hrm:salary:query
+-- 鏉冮檺鎵嶈兘璁块棶锛屾櫘閫氬憳宸ョ湅涓嶅埌鑷繁鐨勫伐璧勩�傛湰鑴氭湰鏂板涓�涓鎵�鏈変汉鍙鐨�
+-- 銆屾垜鐨勮柂璧勩�嶈彍鍗曪紝鍚庣瀵瑰簲 /hrm/salary/calculation/my-page 鎺ュ彛锛�
+-- 璇ユ帴鍙d笉鏍¢獙钖叕鏌ヨ鏉冮檺锛岀敱鏈嶅姟绔己鍒舵寜鐧诲綍浜鸿繃婊わ紝鍙兘鐪嬪埌鏈汉璁板綍銆�
+--
+-- 鐗规�э細鍙噸澶嶆墽琛岋紙鍏堟寜涓婚敭鍒犻櫎鍐嶆彃鍏ワ級
+-- =====================================================================
+
+-- ---------------------------------------------------------------------
+-- 1. 鑿滃崟锛氭垜鐨勮柂璧勶紙椤剁骇鑿滃崟锛屽鎵�鏈夌櫥褰曠敤鎴峰彲瑙侊級
+-- ---------------------------------------------------------------------
+DELETE FROM system_role_menu WHERE menu_id = 1065900;
+
+DELETE FROM system_menu WHERE id = 1065900;
+
+INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon,
+ component, component_name, status, visible, keep_alive, always_show,
+ creator, create_time, updater, update_time, deleted)
+VALUES (1065900, '鎴戠殑钖祫', '', 2, 60, 0, '/my-payslip', 'ep:money',
+ 'hrm/salary/my-payslip/index', 'MyPayslip', 0, b'1', b'1', b'1',
+ '1', NOW(), '1', NOW(), b'0');
+
+-- ---------------------------------------------------------------------
+-- 2. 鎺堟潈缁欐墍鏈夎鑹诧紙鍚悗缁柊澧炶鑹查渶鎵嬪姩鎺堟潈锛屾垨鍦ㄨ鑹茬鐞嗕腑鍕鹃�夛級
+-- ---------------------------------------------------------------------
+INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted)
+SELECT r.id, 1065900, '1', NOW(), '1', NOW(), b'0'
+FROM system_role r
+WHERE r.deleted = b'0';
+
+-- ---------------------------------------------------------------------
+-- 3. 楠岃瘉
+-- ---------------------------------------------------------------------
+SELECT m.id, m.name, m.path, m.component, m.type
+FROM system_menu m
+WHERE m.id = 1065900;
+
+SELECT r.id AS role_id, r.name AS role_name
+FROM system_role r
+JOIN system_role_menu rm ON rm.role_id = r.id AND rm.menu_id = 1065900
+WHERE r.deleted = b'0'
+ORDER BY r.id;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index b90e2bc..8604682 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -16,6 +16,7 @@
import cn.iocoder.yudao.module.hrm.service.salary.HrmSalaryCalculationService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,7 +32,9 @@
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.SALARY_CALCULATION_NOT_EXISTS;
@Tag(name = "绠$悊鍚庡彴 - HRM 钖叕鏍哥畻")
@RestController
@@ -46,6 +49,29 @@
@Resource
private DeptApi deptApi;
+ @GetMapping("/my-page")
+ @Operation(summary = "鑾峰緱鎴戠殑钖祫鏍哥畻鍒嗛〉")
+ public CommonResult<PageResult<HrmSalaryCalculationRespVO>> getMySalaryCalculationPage(@Valid HrmSalaryCalculationPageReqVO pageReqVO) {
+ // 鍙煡褰撳墠鐧诲綍浜鸿嚜宸辩殑钖祫锛屾棤闇�钖叕鏌ヨ鏉冮檺锛岀櫥褰曞嵆鍙闂�
+ PageResult<HrmSalaryCalculationDO> pageResult = salaryCalculationService
+ .getMySalaryCalculationPage(SecurityFrameworkUtils.getLoginUserId(), pageReqVO);
+ List<HrmSalaryCalculationRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmSalaryCalculationRespVO.class);
+ return success(new PageResult<>(list, pageResult.getTotal()));
+ }
+
+ @GetMapping("/my-get")
+ @Operation(summary = "鑾峰緱鎴戠殑钖祫鏍哥畻")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ public CommonResult<HrmSalaryCalculationRespVO> getMySalaryCalculation(@RequestParam("id") Long id) {
+ HrmSalaryCalculationDO calculation = salaryCalculationService
+ .getMySalaryCalculation(id, SecurityFrameworkUtils.getLoginUserId());
+ // 璁板綍涓嶅瓨鍦ㄣ�佹垨涓嶅睘浜庡綋鍓嶇櫥褰曚汉鏃剁粺涓�杩斿洖鈥滀笉瀛樺湪鈥濓紝閬垮厤娉勯湶浠栦汉钖祫鏄惁瀛樺湪
+ if (calculation == null) {
+ throw exception(SALARY_CALCULATION_NOT_EXISTS);
+ }
+ return success(BeanUtils.toBean(calculation, HrmSalaryCalculationRespVO.class));
+ }
+
@GetMapping("/page")
@Operation(summary = "鑾峰緱钖叕鏍哥畻鍒嗛〉")
@PreAuthorize("@ss.hasPermission('hrm:salary:query')")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java
index cf9d519..d34d5ba 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationService.java
@@ -19,6 +19,25 @@
PageResult<HrmSalaryCalculationDO> getSalaryCalculationPage(HrmSalaryCalculationPageReqVO pageReqVO);
/**
+ * 鑾峰緱銆屾垜鐨勩�嶈柂閰牳绠楀垎椤�
+ *
+ * 鍙繑鍥炲綋鍓嶇櫥褰曚汉鑷繁鐨勮柂璧勮褰曪紝蹇界暐璇锋眰鍙傛暟涓殑 userId銆乨eptId锛岄伩鍏嶈秺鏉冩煡鐪嬩粬浜哄伐璧�
+ *
+ * @param userId 褰撳墠鐧诲綍浜篒D
+ * @param pageReqVO 鏌ヨ鏉′欢锛堜粎 period銆乻tatus 绛夌敓鏁堬級
+ */
+ PageResult<HrmSalaryCalculationDO> getMySalaryCalculationPage(Long userId, HrmSalaryCalculationPageReqVO pageReqVO);
+
+ /**
+ * 鑾峰緱銆屾垜鐨勩�嶈柂閰牳绠�
+ *
+ * @param id 鏍哥畻ID
+ * @param userId 褰撳墠鐧诲綍浜篒D
+ * @return 鏍哥畻璁板綍锛涜褰曚笉瀛樺湪鎴栦笉灞炰簬璇ョ敤鎴锋椂杩斿洖 null
+ */
+ HrmSalaryCalculationDO getMySalaryCalculation(Long id, Long userId);
+
+ /**
* 鑾峰緱钖叕鏍哥畻
*/
HrmSalaryCalculationDO getSalaryCalculation(Long id);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
index 6cf8b19..9f9e1e4 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
@@ -114,6 +114,27 @@
}
@Override
+ public PageResult<HrmSalaryCalculationDO> getMySalaryCalculationPage(Long userId, HrmSalaryCalculationPageReqVO pageReqVO) {
+ // 寮哄埗闄愬畾涓哄綋鍓嶇櫥褰曚汉锛氬拷鐣ュ墠绔紶鍏ョ殑 userId / deptId锛岄槻姝㈣秺鏉冩煡鐪嬩粬浜哄伐璧�
+ pageReqVO.setUserId(userId);
+ pageReqVO.setDeptId(null);
+ return salaryCalculationMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public HrmSalaryCalculationDO getMySalaryCalculation(Long id, Long userId) {
+ HrmSalaryCalculationDO calculation = salaryCalculationMapper.selectById(id);
+ if (calculation == null) {
+ return null;
+ }
+ // 涓嶅睘浜庢湰浜虹殑璁板綍涓�寰嬭涓轰笉瀛樺湪锛岄伩鍏嶉�氳繃鐚� id 瓒婃潈鏌ョ湅浠栦汉宸ヨ祫
+ if (!java.util.Objects.equals(calculation.getUserId(), userId)) {
+ return null;
+ }
+ return calculation;
+ }
+
+ @Override
public HrmSalaryCalculationDO getSalaryCalculation(Long id) {
return salaryCalculationMapper.selectById(id);
}
--
Gitblit v1.9.3