From f81b963f9d1b7d4757446970830cb72264c6dc0c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 15:18:57 +0800
Subject: [PATCH] 九鸿:工资表按客户口径重构 + 修复考勤汇总生成、新增节假日报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java | 20 +
docs/sql/hrm_salary_jiuhong_structure.sql | 82 ++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 8
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java | 27 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceHolidaySaveReqVO.java | 4
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java | 4
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java | 15 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java | 120 +++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java | 72 +++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 30 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java | 133 +++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java | 6
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java | 218 ++++++++++++++--
13 files changed, 695 insertions(+), 44 deletions(-)
diff --git a/docs/sql/hrm_salary_jiuhong_structure.sql b/docs/sql/hrm_salary_jiuhong_structure.sql
new file mode 100644
index 0000000..4e2dbac
--- /dev/null
+++ b/docs/sql/hrm_salary_jiuhong_structure.sql
@@ -0,0 +1,82 @@
+-- 涔濇硴鍖栧伐宸ヨ祫琛ㄧ粨鏋勬墿灞�
+-- 1. 鍛樺伐妗f琛ュ厖銆屾爣鍑嗛」銆嶏細鏍囧噯宸ヨ祫銆佸矖浣嶅伐璧勩�佸姞鐝伐璧勬爣鍑嗭紙鍏�/灏忔椂锛夈�佸畨鍏ㄧ幆淇濆鏍囧噯銆佺哗鏁堟爣鍑�
+-- 2. 钖叕鏍哥畻锛堝伐璧勮〃锛夎ˉ鍏呭浘鐗囪姹傜殑鍏ㄩ儴鍒�
+-- 璇存槑锛歁ySQL 8.0 涓嶆敮鎸� ADD COLUMN IF NOT EXISTS锛岃繖閲岀敤瀛樺偍杩囩▼閫愬垪鍒ゆ柇鍚庢墽琛�
+
+DROP PROCEDURE IF EXISTS add_column_if_missing;
+DELIMITER $$
+CREATE PROCEDURE add_column_if_missing(IN tbl VARCHAR(64), IN col VARCHAR(64), IN ddl TEXT)
+BEGIN
+ IF (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = tbl AND column_name = col) = 0 THEN
+ SET @sql = ddl;
+ PREPARE st FROM @sql;
+ EXECUTE st;
+ DEALLOCATE PREPARE st;
+ END IF;
+END$$
+DELIMITER ;
+
+-- ---------- 鍛樺伐妗f锛氭爣鍑嗛」锛堟爣鍑嗗�肩敱鍛樺伐妗f缁存姢锛� ----------
+CALL add_column_if_missing('hrm_employee', 'standard_salary',
+ 'ALTER TABLE hrm_employee ADD COLUMN standard_salary DECIMAL(12,2) NULL COMMENT ''鏍囧噯宸ヨ祫'' AFTER base_salary');
+CALL add_column_if_missing('hrm_employee', 'post_salary',
+ 'ALTER TABLE hrm_employee ADD COLUMN post_salary DECIMAL(12,2) NULL COMMENT ''宀椾綅宸ヨ祫'' AFTER standard_salary');
+CALL add_column_if_missing('hrm_employee', 'overtime_hourly_rate',
+ 'ALTER TABLE hrm_employee ADD COLUMN overtime_hourly_rate DECIMAL(12,2) NULL COMMENT ''鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�'' AFTER post_salary');
+CALL add_column_if_missing('hrm_employee', 'safety_award_standard',
+ 'ALTER TABLE hrm_employee ADD COLUMN safety_award_standard DECIMAL(12,2) NULL COMMENT ''瀹夊叏鐜繚濂栨爣鍑�'' AFTER overtime_hourly_rate');
+CALL add_column_if_missing('hrm_employee', 'performance_standard',
+ 'ALTER TABLE hrm_employee ADD COLUMN performance_standard DECIMAL(12,2) NULL COMMENT ''缁╂晥鏍囧噯'' AFTER safety_award_standard');
+
+-- ---------- 钖叕鏍哥畻锛堝伐璧勮〃锛� ----------
+CALL add_column_if_missing('hrm_salary_calculation', 'standard_salary',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN standard_salary DECIMAL(12,2) NULL COMMENT ''鏍囧噯宸ヨ祫'' AFTER dept_id');
+CALL add_column_if_missing('hrm_salary_calculation', 'post_salary',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN post_salary DECIMAL(12,2) NULL COMMENT ''宀椾綅宸ヨ祫'' AFTER standard_salary');
+CALL add_column_if_missing('hrm_salary_calculation', 'overtime_hourly_rate',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN overtime_hourly_rate DECIMAL(12,2) NULL COMMENT ''鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�'' AFTER post_salary');
+CALL add_column_if_missing('hrm_salary_calculation', 'safety_award_standard',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN safety_award_standard DECIMAL(12,2) NULL COMMENT ''瀹夊叏鐜繚濂栨爣鍑�'' AFTER overtime_hourly_rate');
+CALL add_column_if_missing('hrm_salary_calculation', 'performance_standard',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN performance_standard DECIMAL(12,2) NULL COMMENT ''缁╂晥鏍囧噯'' AFTER safety_award_standard');
+CALL add_column_if_missing('hrm_salary_calculation', 'paid_attendance_days',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN paid_attendance_days DECIMAL(6,2) NULL COMMENT ''璁¤柂鍑哄嫟锛堝ぉ锛�'' AFTER work_days');
+CALL add_column_if_missing('hrm_salary_calculation', 'standard_work_hours',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN standard_work_hours DECIMAL(8,2) NULL COMMENT ''鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級'' AFTER paid_attendance_days');
+CALL add_column_if_missing('hrm_salary_calculation', 'legal_holiday_hours',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN legal_holiday_hours DECIMAL(8,2) NULL COMMENT ''娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級'' AFTER overtime_hours');
+CALL add_column_if_missing('hrm_salary_calculation', 'standard_attendance_pay',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN standard_attendance_pay DECIMAL(12,2) NULL COMMENT ''鏍囧噯鍑哄嫟宸ヨ祫'' AFTER legal_holiday_hours');
+CALL add_column_if_missing('hrm_salary_calculation', 'legal_holiday_pay',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN legal_holiday_pay DECIMAL(12,2) NULL COMMENT ''娉曞畾鍋囧伐璧�'' AFTER overtime_pay');
+CALL add_column_if_missing('hrm_salary_calculation', 'safety_award',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN safety_award DECIMAL(12,2) NULL COMMENT ''瀹夊叏鐜繚濂�'' AFTER legal_holiday_pay');
+CALL add_column_if_missing('hrm_salary_calculation', 'floating_performance_pay',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN floating_performance_pay DECIMAL(12,2) NULL COMMENT ''娴姩缁╂晥宸ヨ祫'' AFTER safety_award');
+CALL add_column_if_missing('hrm_salary_calculation', 'payable_salary',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN payable_salary DECIMAL(12,2) NULL COMMENT ''搴斾粯宸ヨ祫'' AFTER floating_performance_pay');
+CALL add_column_if_missing('hrm_salary_calculation', 'seniority_pay',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN seniority_pay DECIMAL(12,2) NULL COMMENT ''宸ラ緞宸ヨ祫'' AFTER payable_salary');
+CALL add_column_if_missing('hrm_salary_calculation', 'night_shift_allowance',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN night_shift_allowance DECIMAL(12,2) NULL COMMENT ''澶滅彮琛ュ姪'' AFTER seniority_pay');
+CALL add_column_if_missing('hrm_salary_calculation', 'education_allowance',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN education_allowance DECIMAL(12,2) NULL COMMENT ''瀛﹀巻琛ヨ创'' AFTER night_shift_allowance');
+CALL add_column_if_missing('hrm_salary_calculation', 'health_check_allowance',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN health_check_allowance DECIMAL(12,2) NULL COMMENT ''浣撴'' AFTER education_allowance');
+CALL add_column_if_missing('hrm_salary_calculation', 'excellent_employee_award',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN excellent_employee_award DECIMAL(12,2) NULL COMMENT ''浼樼鍛樺伐濂�'' AFTER health_check_allowance');
+CALL add_column_if_missing('hrm_salary_calculation', 'other_subsidy',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN other_subsidy DECIMAL(12,2) NULL COMMENT ''鍏朵粬琛ュ姪'' AFTER excellent_employee_award');
+CALL add_column_if_missing('hrm_salary_calculation', 'dept_performance',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN dept_performance DECIMAL(12,2) NULL COMMENT ''閮ㄩ棬缁╂晥'' AFTER other_subsidy');
+CALL add_column_if_missing('hrm_salary_calculation', 'addition_total',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN addition_total DECIMAL(12,2) NULL COMMENT ''鍔犻」鍚堣'' AFTER dept_performance');
+CALL add_column_if_missing('hrm_salary_calculation', 'missed_punch_deduction',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN missed_punch_deduction DECIMAL(12,2) NULL COMMENT ''婕忔墦鍗�'' AFTER addition_total');
+CALL add_column_if_missing('hrm_salary_calculation', 'late_early_deduction',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN late_early_deduction DECIMAL(12,2) NULL COMMENT ''杩熷埌鏃╅��'' AFTER missed_punch_deduction');
+CALL add_column_if_missing('hrm_salary_calculation', 'deduction_total',
+ 'ALTER TABLE hrm_salary_calculation ADD COLUMN deduction_total DECIMAL(12,2) NULL COMMENT ''鎵f鍚堣'' AFTER other_deduction');
+
+DROP PROCEDURE IF EXISTS add_column_if_missing;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceHolidaySaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceHolidaySaveReqVO.java
index 8f2fcb6..918502a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceHolidaySaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceHolidaySaveReqVO.java
@@ -26,8 +26,8 @@
@NotNull(message = "绫诲瀷涓嶈兘涓虹┖")
private Integer type;
- @Schema(description = "鏄惁娉曞畾鑺傚亣鏃ワ細0-鍚︼紝1-鏄�", example = "1")
- private Integer isLegal;
+ @Schema(description = "鏄惁娉曞畾鑺傚亣鏃ワ細false-鍚︼紝true-鏄紙鍏煎 0/1 鏁板瓧锛�", example = "true")
+ private Boolean isLegal;
@Schema(description = "澶囨敞", example = "鏄ヨ妭鍋囨湡")
private String remark;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
index 8706fc4..9ab2b40 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
@@ -116,6 +116,26 @@
@ExcelProperty("鍩烘湰宸ヨ祫")
private BigDecimal baseSalary;
+ @Schema(description = "鏍囧噯宸ヨ祫")
+ @ExcelProperty("鏍囧噯宸ヨ祫")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫")
+ @ExcelProperty("宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�")
+ @ExcelProperty("鍔犵彮宸ヨ祫鏍囧噯")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�")
+ @ExcelProperty("瀹夊叏鐜繚濂栨爣鍑�")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯")
+ @ExcelProperty("缁╂晥鏍囧噯")
+ private BigDecimal performanceStandard;
+
@Schema(description = "瑙掕壊ID鍒楄〃")
private List<Long> roleIds;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
index f0f0231..e78b451 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
@@ -90,6 +90,21 @@
@Schema(description = "鍩烘湰宸ヨ祫", example = "10000.00")
private BigDecimal baseSalary;
+ @Schema(description = "鏍囧噯宸ヨ祫", example = "8000.00")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫", example = "2000.00")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�", example = "45.98")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�", example = "500.00")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯", example = "1500.00")
+ private BigDecimal performanceStandard;
+
@Schema(description = "瑙掕壊ID鍒楄〃", example = "[1, 2]")
private List<Long> roleIds;
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..59a6c5d 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
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.hrm.controller.admin.salary;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -15,7 +17,9 @@
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
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.PostApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,6 +49,8 @@
private HrmEmployeeService employeeService;
@Resource
private DeptApi deptApi;
+ @Resource
+ private PostApi postApi;
@GetMapping("/page")
@Operation(summary = "鑾峰緱钖叕鏍哥畻鍒嗛〉")
@@ -84,11 +90,22 @@
.collect(Collectors.toSet());
Map<Long, DeptRespDTO> deptMap = CollUtil.isEmpty(deptIds) ? Collections.emptyMap() : deptApi.getDeptMap(deptIds);
+ // 鎵归噺鑾峰彇宀椾綅淇℃伅锛堝憳宸ヨ〃浠� JSON 鏁扮粍瀛楃涓蹭繚瀛樺矖浣� ID锛�
+ Set<Long> postIds = new HashSet<>();
+ for (HrmEmployeeDO employee : employeeMap.values()) {
+ if (StrUtil.isNotBlank(employee.getPostIds())) {
+ postIds.addAll(JSONUtil.toList(employee.getPostIds(), Long.class));
+ }
+ }
+ Map<Long, PostRespDTO> postMap = CollUtil.isEmpty(postIds) ? Collections.emptyMap() : postApi.getPostMap(postIds);
+
// 濉厖淇℃伅
for (HrmSalaryCalculationRespVO respVO : respList) {
HrmEmployeeDO employee = employeeMap.get(respVO.getUserId());
if (employee != null) {
respVO.setUserName(employee.getName());
+ respVO.setHireDate(employee.getHireDate());
+ respVO.setPostName(resolvePostName(employee, postMap));
}
DeptRespDTO dept = deptMap.get(respVO.getDeptId());
if (dept != null) {
@@ -97,6 +114,19 @@
}
}
+ /**
+ * 瑙f瀽鍛樺伐宀椾綅鍚嶇О锛堝涓矖浣嶇敤閫楀彿杩炴帴锛�
+ */
+ private String resolvePostName(HrmEmployeeDO employee, Map<Long, PostRespDTO> postMap) {
+ if (StrUtil.isBlank(employee.getPostIds()) || CollUtil.isEmpty(postMap)) {
+ return null;
+ }
+ return JSONUtil.toList(employee.getPostIds(), Long.class).stream()
+ .filter(postMap::containsKey)
+ .map(id -> postMap.get(id).getName())
+ .collect(Collectors.joining(","));
+ }
+
@GetMapping("/get")
@Operation(summary = "鑾峰緱钖叕鏍哥畻")
@Parameter(name = "id", description = "鏍哥畻ID", required = true)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
index 16836b7..e15afb1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Schema(description = "绠$悊鍚庡彴 - 钖叕鏍哥畻 Response VO")
@@ -41,6 +42,126 @@
@ExcelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
+ @Schema(description = "鍏ヨ亴鏃ユ湡")
+ @ExcelProperty("鍏ヨ亴鏃ユ湡")
+ private LocalDate hireDate;
+
+ @Schema(description = "宀椾綅鍚嶇О锛堝涓敤閫楀彿鍒嗛殧锛�")
+ @ExcelProperty("宀椾綅")
+ private String postName;
+
+ // ========== 涔濇硴宸ヨ祫琛細鏍囧噯椤癸紙鍙栬嚜鍛樺伐妗f锛� ==========
+
+ @Schema(description = "鏍囧噯宸ヨ祫")
+ @ExcelProperty("鏍囧噯宸ヨ祫")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫")
+ @ExcelProperty("宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�")
+ @ExcelProperty("鍔犵彮宸ヨ祫(鏍囧噯)")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�")
+ @ExcelProperty("瀹夊叏鐜繚濂�(鏍囧噯)")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯")
+ @ExcelProperty("缁╂晥(鏍囧噯)")
+ private BigDecimal performanceStandard;
+
+ // ========== 涔濇硴宸ヨ祫琛細鍑哄嫟涓庤钖� ==========
+
+ @Schema(description = "鏍囧噯鍑哄嫟澶╂暟")
+ @ExcelProperty("鏍囧噯鍑哄嫟澶╂暟")
+ private Integer workDays;
+
+ @Schema(description = "璁¤柂鍑哄嫟锛堝ぉ锛�")
+ @ExcelProperty("璁¤柂鍑哄嫟")
+ private BigDecimal paidAttendanceDays;
+
+ @Schema(description = "鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級")
+ @ExcelProperty("鏍囧噯鍑哄嫟鏃堕暱")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "鍔犵彮鏃堕暱锛堝皬鏃讹級")
+ @ExcelProperty("鍔犵彮鏃堕暱")
+ private BigDecimal overtimeHours;
+
+ @Schema(description = "娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級")
+ @ExcelProperty("娉曞畾鍋囨棩鏃堕暱")
+ private BigDecimal legalHolidayHours;
+
+ @Schema(description = "鏍囧噯鍑哄嫟宸ヨ祫")
+ @ExcelProperty("鏍囧噯鍑哄嫟宸ヨ祫")
+ private BigDecimal standardAttendancePay;
+
+ @Schema(description = "鍔犵彮宸ヨ祫")
+ @ExcelProperty("鍔犵彮宸ヨ祫")
+ private BigDecimal overtimePay;
+
+ @Schema(description = "娉曞畾鍋囧伐璧�")
+ @ExcelProperty("娉曞畾鍋囧伐璧�")
+ private BigDecimal legalHolidayPay;
+
+ @Schema(description = "瀹夊叏鐜繚濂�")
+ @ExcelProperty("瀹夊叏鐜繚濂�")
+ private BigDecimal safetyAward;
+
+ @Schema(description = "娴姩缁╂晥宸ヨ祫")
+ @ExcelProperty("娴姩缁╂晥宸ヨ祫")
+ private BigDecimal floatingPerformancePay;
+
+ @Schema(description = "搴斾粯宸ヨ祫")
+ @ExcelProperty("搴斾粯宸ヨ祫")
+ private BigDecimal payableSalary;
+
+ @Schema(description = "宸ラ緞宸ヨ祫")
+ @ExcelProperty("宸ラ緞宸ヨ祫")
+ private BigDecimal seniorityPay;
+
+ @Schema(description = "澶滅彮琛ュ姪")
+ @ExcelProperty("澶滅彮琛ュ姪")
+ private BigDecimal nightShiftAllowance;
+
+ @Schema(description = "瀛﹀巻琛ヨ创")
+ @ExcelProperty("瀛﹀巻琛ヨ创")
+ private BigDecimal educationAllowance;
+
+ @Schema(description = "浣撴")
+ @ExcelProperty("浣撴")
+ private BigDecimal healthCheckAllowance;
+
+ @Schema(description = "浼樼鍛樺伐濂�")
+ @ExcelProperty("浼樼鍛樺伐濂�")
+ private BigDecimal excellentEmployeeAward;
+
+ @Schema(description = "鍏朵粬琛ュ姪")
+ @ExcelProperty("鍏朵粬琛ュ姪")
+ private BigDecimal otherSubsidy;
+
+ @Schema(description = "閮ㄩ棬缁╂晥")
+ @ExcelProperty("閮ㄩ棬缁╂晥")
+ private BigDecimal deptPerformance;
+
+ @Schema(description = "鍔犻」鍚堣")
+ @ExcelProperty("鍔犻」鍚堣")
+ private BigDecimal additionTotal;
+
+ @Schema(description = "婕忔墦鍗�")
+ @ExcelProperty("婕忔墦鍗�")
+ private BigDecimal missedPunchDeduction;
+
+ @Schema(description = "杩熷埌鏃╅��")
+ @ExcelProperty("杩熷埌鏃╅��")
+ private BigDecimal lateEarlyDeduction;
+
+ @Schema(description = "鎵f鍚堣")
+ @ExcelProperty("鎵f鍚堣")
+ private BigDecimal deductionTotal;
+
@Schema(description = "鍩烘湰宸ヨ祫")
@ExcelProperty("鍩烘湰宸ヨ祫")
private BigDecimal baseSalary;
@@ -48,10 +169,6 @@
@Schema(description = "缁╂晥宸ヨ祫")
@ExcelProperty("缁╂晥宸ヨ祫")
private BigDecimal performanceSalary;
-
- @Schema(description = "鍔犵彮宸ヨ祫")
- @ExcelProperty("鍔犵彮宸ヨ祫")
- private BigDecimal overtimePay;
@Schema(description = "椁愯ˉ")
@ExcelProperty("椁愯ˉ")
@@ -88,14 +205,6 @@
@Schema(description = "瀹炲彂宸ヨ祫")
@ExcelProperty("瀹炲彂宸ヨ祫")
private BigDecimal actualSalary;
-
- @Schema(description = "鍑哄嫟澶╂暟")
- @ExcelProperty("鍑哄嫟澶╂暟")
- private Integer workDays;
-
- @Schema(description = "鍔犵彮鏃堕暱")
- @ExcelProperty("鍔犵彮鏃堕暱")
- private BigDecimal overtimeHours;
@Schema(description = "鎺掔彮鎬诲伐鏃�")
@ExcelProperty("鎺掔彮鎬诲伐鏃�")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
index 550c6c9..fe9aba6 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
@@ -41,6 +41,78 @@
@NotNull(message = "鍩烘湰宸ヨ祫涓嶈兘涓虹┖")
private BigDecimal baseSalary;
+ @Schema(description = "鏍囧噯宸ヨ祫")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯")
+ private BigDecimal performanceStandard;
+
+ @Schema(description = "璁¤柂鍑哄嫟锛堝ぉ锛�")
+ private BigDecimal paidAttendanceDays;
+
+ @Schema(description = "鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級")
+ private BigDecimal legalHolidayHours;
+
+ @Schema(description = "鏍囧噯鍑哄嫟宸ヨ祫")
+ private BigDecimal standardAttendancePay;
+
+ @Schema(description = "娉曞畾鍋囧伐璧�")
+ private BigDecimal legalHolidayPay;
+
+ @Schema(description = "瀹夊叏鐜繚濂�")
+ private BigDecimal safetyAward;
+
+ @Schema(description = "娴姩缁╂晥宸ヨ祫")
+ private BigDecimal floatingPerformancePay;
+
+ @Schema(description = "搴斾粯宸ヨ祫")
+ private BigDecimal payableSalary;
+
+ @Schema(description = "宸ラ緞宸ヨ祫")
+ private BigDecimal seniorityPay;
+
+ @Schema(description = "澶滅彮琛ュ姪")
+ private BigDecimal nightShiftAllowance;
+
+ @Schema(description = "瀛﹀巻琛ヨ创")
+ private BigDecimal educationAllowance;
+
+ @Schema(description = "浣撴")
+ private BigDecimal healthCheckAllowance;
+
+ @Schema(description = "浼樼鍛樺伐濂�")
+ private BigDecimal excellentEmployeeAward;
+
+ @Schema(description = "鍏朵粬琛ュ姪")
+ private BigDecimal otherSubsidy;
+
+ @Schema(description = "閮ㄩ棬缁╂晥")
+ private BigDecimal deptPerformance;
+
+ @Schema(description = "鍔犻」鍚堣")
+ private BigDecimal additionTotal;
+
+ @Schema(description = "婕忔墦鍗�")
+ private BigDecimal missedPunchDeduction;
+
+ @Schema(description = "杩熷埌鏃╅��")
+ private BigDecimal lateEarlyDeduction;
+
+ @Schema(description = "鎵f鍚堣")
+ private BigDecimal deductionTotal;
+
@Schema(description = "缁╂晥宸ヨ祫")
private BigDecimal performanceSalary;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java
index 56d350a..0177efd 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -43,7 +44,10 @@
/**
* 骞存湀锛屾牸寮忥細yyyy-MM
+ *
+ * year_month 鏄� MySQL 淇濈暀瀛楋紙INTERVAL 鍗曚綅锛夛紝涓嶅姞鍙嶅紩鍙蜂細鎶� SQL 璇硶閿欒
*/
+ @TableField("`year_month`")
private String yearMonth;
/**
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
index b784f3d..26849d0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
@@ -160,6 +160,33 @@
private BigDecimal baseSalary;
/**
+ * 鏍囧噯宸ヨ祫
+ *
+ * 鐢ㄤ簬宸ヨ祫琛細鏍囧噯鍑哄嫟宸ヨ祫 = 鏍囧噯宸ヨ祫 梅 鏍囧噯鍑哄嫟澶╂暟 脳 璁¤柂鍑哄嫟
+ */
+ private BigDecimal standardSalary;
+
+ /**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�
+ */
+ private BigDecimal overtimeHourlyRate;
+
+ /**
+ * 瀹夊叏鐜繚濂栨爣鍑�
+ */
+ private BigDecimal safetyAwardStandard;
+
+ /**
+ * 缁╂晥鏍囧噯
+ */
+ private BigDecimal performanceStandard;
+
+ /**
* 瑙掕壊ID鍒楄〃
*
* 鐢ㄤ簬鍒嗛厤绯荤粺鐢ㄦ埛瑙掕壊锛孞SON 鏍煎紡瀛樺偍
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
index 2f19cc4..9f158f5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
@@ -53,6 +53,126 @@
private Long deptId;
/**
+ * 鏍囧噯宸ヨ祫
+ */
+ private BigDecimal standardSalary;
+
+ /**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�
+ */
+ private BigDecimal overtimeHourlyRate;
+
+ /**
+ * 瀹夊叏鐜繚濂栨爣鍑�
+ */
+ private BigDecimal safetyAwardStandard;
+
+ /**
+ * 缁╂晥鏍囧噯
+ */
+ private BigDecimal performanceStandard;
+
+ /**
+ * 璁¤柂鍑哄嫟锛堝ぉ锛�
+ */
+ private BigDecimal paidAttendanceDays;
+
+ /**
+ * 鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級
+ */
+ private BigDecimal standardWorkHours;
+
+ /**
+ * 娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級
+ */
+ private BigDecimal legalHolidayHours;
+
+ /**
+ * 鏍囧噯鍑哄嫟宸ヨ祫
+ */
+ private BigDecimal standardAttendancePay;
+
+ /**
+ * 娉曞畾鍋囧伐璧�
+ */
+ private BigDecimal legalHolidayPay;
+
+ /**
+ * 瀹夊叏鐜繚濂�
+ */
+ private BigDecimal safetyAward;
+
+ /**
+ * 娴姩缁╂晥宸ヨ祫
+ */
+ private BigDecimal floatingPerformancePay;
+
+ /**
+ * 搴斾粯宸ヨ祫
+ */
+ private BigDecimal payableSalary;
+
+ /**
+ * 宸ラ緞宸ヨ祫
+ */
+ private BigDecimal seniorityPay;
+
+ /**
+ * 澶滅彮琛ュ姪
+ */
+ private BigDecimal nightShiftAllowance;
+
+ /**
+ * 瀛﹀巻琛ヨ创
+ */
+ private BigDecimal educationAllowance;
+
+ /**
+ * 浣撴
+ */
+ private BigDecimal healthCheckAllowance;
+
+ /**
+ * 浼樼鍛樺伐濂�
+ */
+ private BigDecimal excellentEmployeeAward;
+
+ /**
+ * 鍏朵粬琛ュ姪
+ */
+ private BigDecimal otherSubsidy;
+
+ /**
+ * 閮ㄩ棬缁╂晥
+ */
+ private BigDecimal deptPerformance;
+
+ /**
+ * 鍔犻」鍚堣
+ */
+ private BigDecimal additionTotal;
+
+ /**
+ * 婕忔墦鍗�
+ */
+ private BigDecimal missedPunchDeduction;
+
+ /**
+ * 杩熷埌鏃╅��
+ */
+ private BigDecimal lateEarlyDeduction;
+
+ /**
+ * 鎵f鍚堣
+ */
+ private BigDecimal deductionTotal;
+
+ /**
* 鍩烘湰宸ヨ祫
*/
private BigDecimal baseSalary;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
index 0981a6a..9b9a63d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
@@ -35,9 +35,8 @@
// 鏍¢獙鏃ユ湡鏄惁宸插瓨鍦ㄩ厤缃�
validateAttendanceHolidayDateExists(createReqVO.getDate());
HrmAttendanceHolidayDO attendanceHoliday = BeanUtils.toBean(createReqVO, HrmAttendanceHolidayDO.class);
- if (attendanceHoliday.getIsLegal() == null) {
- attendanceHoliday.setIsLegal(0);
- }
+ // VO 渚х敤 Boolean 鍏煎鍓嶇鍕鹃�夋鐨� true/false锛岃惤搴撶粺涓�涓� 0/1
+ attendanceHoliday.setIsLegal(Boolean.TRUE.equals(createReqVO.getIsLegal()) ? 1 : 0);
attendanceHolidayMapper.insert(attendanceHoliday);
return attendanceHoliday.getId();
}
@@ -51,6 +50,7 @@
validateAttendanceHolidayDateExists(updateReqVO.getDate());
}
HrmAttendanceHolidayDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceHolidayDO.class);
+ updateObj.setIsLegal(Boolean.TRUE.equals(updateReqVO.getIsLegal()) ? 1 : 0);
attendanceHolidayMapper.updateById(updateObj);
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
index eefe7a7..05ad5f0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
@@ -340,6 +340,14 @@
@Override
public List<HrmEmployeeDO> getEmployeeList(Collection<Long> ids) {
+ // ids 涓� null 鏃惰〃绀烘煡璇㈠叏閮ㄥ憳宸ワ紙鑰冨嫟姹囨�汇�佽柂閰牳绠楃瓑鎵归噺鍦烘櫙渚濊禆姝よ涔夛級锛�
+ // 鏄惧紡浼犲叆绌洪泦鍚堟椂杩斿洖绌猴紝閬垮厤璇煡鍏ㄥ憳
+ if (ids == null) {
+ return employeeMapper.selectList(null);
+ }
+ if (ids.isEmpty()) {
+ return Collections.emptyList();
+ }
return employeeMapper.selectByIds(ids);
}
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 c2b563e..edc86ab 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
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmSalaryCalculationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmLeaveApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmOvertimeApplicationDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmEmployeeScheduleDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmShiftDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
@@ -21,6 +22,7 @@
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmEmployeeScheduleMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmShiftMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmOvertimeApplicationMapper;
+import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceRecordMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmEmployeeSalaryMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmEmployeeSocialSecurityMapper;
@@ -32,6 +34,7 @@
import cn.iocoder.yudao.module.hrm.dal.mysql.salary.HrmSalaryStructureMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceClockTypeEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmOvertimeTypeEnum;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -110,6 +113,8 @@
private HrmEmployeeScheduleMapper employeeScheduleMapper;
@Resource
private HrmShiftMapper shiftMapper;
+ @Resource
+ private HrmAttendanceRecordMapper attendanceRecordMapper;
@Override
public PageResult<HrmSalaryCalculationDO> getSalaryCalculationPage(HrmSalaryCalculationPageReqVO pageReqVO) {
@@ -235,17 +240,65 @@
BigDecimal mealAllowance = employeeSalary.getMealAllowance() != null ? employeeSalary.getMealAllowance() : BigDecimal.ZERO;
BigDecimal transportAllowance = employeeSalary.getTransportAllowance() != null ? employeeSalary.getTransportAllowance() : BigDecimal.ZERO;
BigDecimal otherAllowance = employeeSalary.getOtherAllowance() != null ? employeeSalary.getOtherAllowance() : BigDecimal.ZERO;
- OvertimeSalary overtimeSalary = calculateOvertimeSalary(employee, employeeSalary, period, baseSalary);
- BigDecimal overtimePay = overtimeSalary.pay();
- // 鎸夋帓鐝疮璁″嚭鍕ゅぉ鏁颁笌鎺掔彮鎬诲伐鏃讹紙鏃犳帓鐝椂鍑哄嫟澶╂暟鍥為��榛樿 22锛�
+ // ========== 涔濇硴宸ヨ祫琛細鏍囧噯椤瑰彇鑷憳宸ユ。妗� ==========
+ BigDecimal standardSalary = nvl(employee.getStandardSalary());
+ BigDecimal postSalary = nvl(employee.getPostSalary());
+ BigDecimal overtimeHourlyRate = employee.getOvertimeHourlyRate();
+ BigDecimal safetyAwardStandard = nvl(employee.getSafetyAwardStandard());
+ BigDecimal performanceStandard = nvl(employee.getPerformanceStandard());
+ // 鏍囧噯宸ヨ祫鏈崟鐙淮鎶ゆ椂锛屾寜銆屽熀鏈伐璧� + 宀椾綅宸ヨ祫銆嶅悎鎴�
+ if (standardSalary.signum() == 0 && (baseSalary.signum() > 0 || postSalary.signum() > 0)) {
+ standardSalary = baseSalary.add(postSalary);
+ }
+
+ // 鎸夋帓鐝疮璁″簲鍑哄嫟澶╂暟涓庢爣鍑嗗伐鏃讹紙鏃犳帓鐝椂鍥為�� 22 澶� 脳 8 灏忔椂锛�
ScheduleStat scheduleStat = calculateScheduleStat(employeeId, period);
Integer workDays = scheduleStat.scheduledDays() > 0 ? scheduleStat.scheduledDays() : 22;
BigDecimal totalWorkHours = scheduleStat.totalWorkHours();
+ BigDecimal standardWorkHours = scheduleStat.scheduledDays() > 0
+ ? scheduleStat.totalWorkHours()
+ : BigDecimal.valueOf(workDays).multiply(BigDecimal.valueOf(8));
- // 搴斿彂宸ヨ祫鎬婚
- BigDecimal totalIncome = baseSalary.add(performanceSalary).add(mealAllowance)
- .add(transportAllowance).add(otherAllowance).add(overtimePay);
+ // 璁¤柂鍑哄嫟 = 鏍囧噯鍑哄嫟澶╂暟 - 缂哄嫟澶╂暟锛堣�冨嫟璁板綍涓己鍗$殑澶╂暟锛屾寜澶╁幓閲嶏級
+ int absentDays = countAbsentDays(employeeId, period);
+ BigDecimal paidAttendanceDays = BigDecimal.valueOf(Math.max(workDays - absentDays, 0));
+
+ // 鍔犵彮宸ヨ祫 / 娉曞畾鍋囧伐璧勶紙鍔犵彮宸ヨ祫鏍囧噯涓虹┖鏃跺洖閫�鍒� 鍩烘湰宸ヨ祫 / 21.75 / 8 脳 鍊嶇巼锛�
+ OvertimeSalary overtimeSalary = calculateOvertimeSalary(employee, employeeSalary, period, baseSalary, overtimeHourlyRate);
+ BigDecimal overtimeHours = overtimeSalary.hours();
+ BigDecimal overtimePay = overtimeSalary.pay();
+ BigDecimal legalHolidayHours = overtimeSalary.legalHolidayHours();
+ BigDecimal legalHolidayPay = overtimeSalary.legalHolidayPay();
+
+ // 鍑哄嫟鎶樼畻姣斾緥锛岀敤浜庢寜瀹為檯璁¤柂鍑哄嫟鎶樼畻鏍囧噯椤�
+ BigDecimal attendanceRatio = workDays > 0
+ ? paidAttendanceDays.divide(BigDecimal.valueOf(workDays), 6, RoundingMode.HALF_UP)
+ : BigDecimal.ZERO;
+ BigDecimal standardAttendancePay = standardSalary.multiply(attendanceRatio).setScale(2, RoundingMode.HALF_UP);
+ BigDecimal safetyAward = safetyAwardStandard.multiply(attendanceRatio).setScale(2, RoundingMode.HALF_UP);
+ BigDecimal floatingPerformancePay = performanceStandard.multiply(attendanceRatio).setScale(2, RoundingMode.HALF_UP);
+
+ // 搴斾粯宸ヨ祫 = 鏍囧噯鍑哄嫟宸ヨ祫 + 鍔犵彮宸ヨ祫 + 娉曞畾鍋囧伐璧� + 瀹夊叏鐜繚濂� + 娴姩缁╂晥宸ヨ祫
+ BigDecimal payableSalary = standardAttendancePay.add(overtimePay).add(legalHolidayPay)
+ .add(safetyAward).add(floatingPerformancePay);
+
+ // 鍔犻」锛堝伐榫勫伐璧�/澶滅彮琛ュ姪/瀛﹀巻琛ヨ创/浣撴/浼樼鍛樺伐濂�/鍏朵粬琛ュ姪/閮ㄩ棬缁╂晥锛変笌鎵i」
+ // 锛堟紡鎵撳崱/杩熷埌鏃╅��/鍏朵粬鎵f锛夌敓鎴愭椂榛樿涓� 0锛屾牳绠楅〉鍙墜宸ヨ皟鏁村悗淇濆瓨
+ BigDecimal seniorityPay = BigDecimal.ZERO;
+ BigDecimal nightShiftAllowance = BigDecimal.ZERO;
+ BigDecimal educationAllowance = BigDecimal.ZERO;
+ BigDecimal healthCheckAllowance = BigDecimal.ZERO;
+ BigDecimal excellentEmployeeAward = BigDecimal.ZERO;
+ BigDecimal otherSubsidy = BigDecimal.ZERO;
+ BigDecimal deptPerformance = BigDecimal.ZERO;
+ BigDecimal additionTotal = BigDecimal.ZERO;
+ BigDecimal missedPunchDeduction = BigDecimal.ZERO;
+ BigDecimal lateEarlyDeduction = BigDecimal.ZERO;
+ BigDecimal deductionTotal = BigDecimal.ZERO;
+
+ // 璁$◣鍙e緞锛氬簲浠樺伐璧� + 鍔犻」鍚堣 - 鎵f鍚堣
+ BigDecimal totalIncome = payableSalary.add(additionTotal).subtract(deductionTotal);
// 鑾峰彇绀句繚鍩烘暟锛氬憳宸ョぞ淇濇。妗� > 鏂规榛樿缂磋垂鍩烘暟 > 鍛樺伐鍩烘湰宸ヨ祫
BigDecimal socialSecurityBase = (socialSecurity != null && socialSecurity.getSocialSecurityBase() != null)
@@ -284,8 +337,8 @@
// 鍏Н閲戞墸闄� = 鍩烘暟 脳 鍏Н閲戜釜浜烘瘮渚�
BigDecimal housingFundDeduction = housingFundBase.multiply(housingFundPersonalRatio).setScale(2, RoundingMode.HALF_UP);
- // 璁$畻璇峰亣鎵f
- BigDecimal leaveDeduction = calculateLeaveDeduction(employee, period, baseSalary);
+ // 璇峰亣鎵f锛氭柊鐗堝伐璧勮〃鎸夈�岃钖嚭鍕ゃ�嶆姌鍑忔爣鍑嗗嚭鍕ゅ伐璧勶紝涓嶅啀鍗曠嫭閲嶅鎵d竴娆★紝淇濈暀瀛楁鍏煎鏃ф暟鎹�
+ BigDecimal leaveDeduction = BigDecimal.ZERO;
// 璁$畻涓◣鎵i櫎
// 搴旂撼绋庢墍寰楅 = 搴斿彂宸ヨ祫 - 绀句繚鎵i櫎 - 鍏Н閲戞墸闄� - 璧峰緛鐐�(5000)
@@ -301,15 +354,43 @@
BigDecimal otherDeduction = BigDecimal.ZERO;
- // 璁$畻瀹炲彂宸ヨ祫 = 搴斿彂 - 鎵i櫎
- BigDecimal totalDeduction = socialSecurityDeduction.add(housingFundDeduction)
- .add(taxDeduction).add(otherDeduction).add(leaveDeduction);
- BigDecimal actualSalary = totalIncome.subtract(totalDeduction);
+ // 绋庡悗宸ヨ祫 = 搴斾粯宸ヨ祫 + 鍔犻」鍚堣 - 鎵f鍚堣 - 绀句繚 - 鍏Н閲� - 涓◣
+ BigDecimal actualSalary = payableSalary.add(additionTotal).subtract(deductionTotal)
+ .subtract(socialSecurityDeduction).subtract(housingFundDeduction)
+ .subtract(taxDeduction);
return HrmSalaryCalculationDO.builder()
.period(period)
.userId(employeeId) // 浣跨敤鍛樺伐ID
.deptId(employee.getDeptId())
+ // 涔濇硴宸ヨ祫琛細鏍囧噯椤�
+ .standardSalary(standardSalary)
+ .postSalary(postSalary)
+ .overtimeHourlyRate(overtimeHourlyRate)
+ .safetyAwardStandard(safetyAwardStandard)
+ .performanceStandard(performanceStandard)
+ // 涔濇硴宸ヨ祫琛細鍑哄嫟涓庤钖�
+ .paidAttendanceDays(paidAttendanceDays)
+ .standardWorkHours(standardWorkHours)
+ .legalHolidayHours(legalHolidayHours)
+ .standardAttendancePay(standardAttendancePay)
+ .legalHolidayPay(legalHolidayPay)
+ .safetyAward(safetyAward)
+ .floatingPerformancePay(floatingPerformancePay)
+ .payableSalary(payableSalary)
+ // 涔濇硴宸ヨ祫琛細鍔犻」 / 鎵i」
+ .seniorityPay(seniorityPay)
+ .nightShiftAllowance(nightShiftAllowance)
+ .educationAllowance(educationAllowance)
+ .healthCheckAllowance(healthCheckAllowance)
+ .excellentEmployeeAward(excellentEmployeeAward)
+ .otherSubsidy(otherSubsidy)
+ .deptPerformance(deptPerformance)
+ .additionTotal(additionTotal)
+ .missedPunchDeduction(missedPunchDeduction)
+ .lateEarlyDeduction(lateEarlyDeduction)
+ .deductionTotal(deductionTotal)
+ // 鍏煎鏃у瓧娈�
.baseSalary(baseSalary)
.performanceSalary(performanceSalary)
.overtimePay(overtimePay)
@@ -323,7 +404,7 @@
.leaveDeduction(leaveDeduction)
.actualSalary(actualSalary)
.workDays(workDays) // 鎸夋帓鐝疮璁″簲鍑哄嫟澶╂暟锛屾棤鎺掔彮鏃跺洖閫� 22
- .overtimeHours(overtimeSalary.hours())
+ .overtimeHours(overtimeHours)
.totalWorkHours(totalWorkHours)
.status(0) // 寰呯‘璁�
.build();
@@ -406,19 +487,24 @@
}
/**
- * 姹囨�诲綋鏈堝鎵归�氳繃鐨勫姞鐝敵璇枫�傚皬鏃跺伐璧勬寜鍩烘湰宸ヨ祫 / 21.75 / 8 璁$畻锛�
- * 宸ヤ綔鏃ラ粯璁� 1.5 鍊嶃�佷紤鎭棩榛樿 2 鍊嶃�佹硶瀹氳妭鍋囨棩榛樿 3 鍊嶏紝鍧囧彲鐢辫柂閰粨鏋勮鐩栥��
+ * 姹囨�诲綋鏈堝鎵归�氳繃鐨勫姞鐝敵璇枫��
+ *
+ * 鍛樺伐妗f缁存姢浜嗐�屽姞鐝伐璧勬爣鍑嗭紙鍏�/灏忔椂锛夈�嶆椂锛氬姞鐝伐璧� = 鍔犵彮鏃堕暱 脳 鍗曚环锛�
+ * 娉曞畾鍋囧伐璧� = 娉曞畾鍋囨棩鏃堕暱 脳 鍗曚环 脳 娉曞畾鑺傚亣鏃ュ�嶇巼锛堥粯璁� 3锛夈��
+ * 鏈淮鎶ゅ崟浠锋椂鍥為��鏃у彛寰勶細鍩烘湰宸ヨ祫 / 21.75 / 8 脳 鍚勭被鍨嬪�嶇巼銆�
+ *
+ * 娉曞畾鑺傚亣鏃ュ姞鐝崟鐙粺璁★紝涓嶈鍏ャ�屽姞鐝椂闀裤�嶅垪锛岄伩鍏嶄笌銆屾硶瀹氬亣宸ヨ祫銆嶉噸澶嶈钖��
*/
private OvertimeSalary calculateOvertimeSalary(HrmEmployeeDO employee, HrmEmployeeSalaryDO employeeSalary,
- String period, BigDecimal baseSalary) {
+ String period, BigDecimal baseSalary, BigDecimal overtimeHourlyRate) {
if (employee.getUserId() == null) {
- return new OvertimeSalary(BigDecimal.ZERO, BigDecimal.ZERO);
+ return OvertimeSalary.EMPTY;
}
YearMonth month = YearMonth.parse(period);
List<HrmOvertimeApplicationDO> applications = overtimeApplicationMapper.selectApprovedByUserAndDateRange(
employee.getUserId(), month.atDay(1), month.atEndOfMonth());
if (CollUtil.isEmpty(applications)) {
- return new OvertimeSalary(BigDecimal.ZERO, BigDecimal.ZERO);
+ return OvertimeSalary.EMPTY;
}
Long structureId = employeeSalary.getSalaryStructureId() != null
? employeeSalary.getSalaryStructureId() : employee.getSalaryStructureId();
@@ -429,29 +515,62 @@
? structure.getRestDayOvertimePayRatio() : HrmOvertimeTypeEnum.REST_DAY.getSalaryMultiplier();
BigDecimal legalHolidayMultiplier = structure != null && structure.getLegalHolidayOvertimePayRatio() != null
? structure.getLegalHolidayOvertimePayRatio() : HrmOvertimeTypeEnum.LEGAL_HOLIDAY.getSalaryMultiplier();
- BigDecimal hourlySalary = baseSalary.divide(new BigDecimal("21.75"), 8, RoundingMode.HALF_UP)
- .divide(new BigDecimal("8"), 8, RoundingMode.HALF_UP);
+ BigDecimal hourlySalary = overtimeHourlyRate != null && overtimeHourlyRate.signum() > 0
+ ? overtimeHourlyRate
+ : baseSalary.divide(new BigDecimal("21.75"), 8, RoundingMode.HALF_UP)
+ .divide(new BigDecimal("8"), 8, RoundingMode.HALF_UP);
BigDecimal totalHours = BigDecimal.ZERO;
BigDecimal totalPay = BigDecimal.ZERO;
+ BigDecimal legalHolidayHours = BigDecimal.ZERO;
+ BigDecimal legalHolidayPay = BigDecimal.ZERO;
for (HrmOvertimeApplicationDO application : applications) {
BigDecimal hours = application.getDuration() == null ? BigDecimal.ZERO : application.getDuration();
HrmOvertimeTypeEnum type = HrmOvertimeTypeEnum.valueOfType(application.getOvertimeType());
if (type == null || hours.signum() <= 0) {
continue;
}
- BigDecimal multiplier = switch (type) {
- case WORKDAY -> workdayMultiplier;
- case REST_DAY -> restDayMultiplier;
- case LEGAL_HOLIDAY -> legalHolidayMultiplier;
- };
+ if (type == HrmOvertimeTypeEnum.LEGAL_HOLIDAY) {
+ legalHolidayHours = legalHolidayHours.add(hours);
+ legalHolidayPay = legalHolidayPay.add(hourlySalary.multiply(hours).multiply(legalHolidayMultiplier));
+ continue;
+ }
+ BigDecimal multiplier = type == HrmOvertimeTypeEnum.WORKDAY ? workdayMultiplier : restDayMultiplier;
totalHours = totalHours.add(hours);
totalPay = totalPay.add(hourlySalary.multiply(hours).multiply(multiplier));
}
return new OvertimeSalary(totalHours.setScale(1, RoundingMode.HALF_UP),
- totalPay.setScale(2, RoundingMode.HALF_UP));
+ totalPay.setScale(2, RoundingMode.HALF_UP),
+ legalHolidayHours.setScale(1, RoundingMode.HALF_UP),
+ legalHolidayPay.setScale(2, RoundingMode.HALF_UP));
}
- private record OvertimeSalary(BigDecimal hours, BigDecimal pay) {}
+ /**
+ * 缁熻褰撴湀鑰冨嫟璁板綍涓己鍗$殑澶╂暟锛堝悓涓�鏃ユ湡澶氭缂哄崱鍙畻涓�澶╋級
+ */
+ private int countAbsentDays(Long employeeId, String period) {
+ YearMonth month = YearMonth.parse(period);
+ List<HrmAttendanceRecordDO> records = attendanceRecordMapper.selectListByUserIdAndDateBetween(
+ employeeId, month.atDay(1), month.atEndOfMonth());
+ if (CollUtil.isEmpty(records)) {
+ return 0;
+ }
+ return (int) records.stream()
+ .filter(record -> HrmAttendanceClockTypeEnum.MISSING.getType().equals(record.getClockInType())
+ || HrmAttendanceClockTypeEnum.MISSING.getType().equals(record.getClockOutType()))
+ .map(HrmAttendanceRecordDO::getDate)
+ .distinct()
+ .count();
+ }
+
+ private static BigDecimal nvl(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
+
+ private record OvertimeSalary(BigDecimal hours, BigDecimal pay,
+ BigDecimal legalHolidayHours, BigDecimal legalHolidayPay) {
+ private static final OvertimeSalary EMPTY = new OvertimeSalary(
+ BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO);
+ }
private record ScheduleStat(int scheduledDays, BigDecimal totalWorkHours) {}
@@ -594,6 +713,7 @@
@Transactional(rollbackFor = Exception.class)
public void saveSalaryCalculationList(List<HrmSalaryCalculationDO> calculationList) {
for (HrmSalaryCalculationDO calculation : calculationList) {
+ normalizeSalaryTotals(calculation);
if (calculation.getId() == null) {
// 鏂板璁板綍锛岀敓鎴愭牳绠楀崟鍙�
String no = noRedisDAO.generateSalaryCalculationNo();
@@ -611,6 +731,50 @@
}
/**
+ * 淇濆瓨鍓嶆寜涔濇硴宸ヨ祫琛ㄥ彛寰勯噸绠楀悎璁★紝閬垮厤鍓嶇婕忕畻鎴栨棫瀹㈡埛绔紶鍏ヤ笉涓�鑷寸殑鍚堣鍊笺��
+ *
+ * 鍔犻」鍚堣 = 宸ラ緞宸ヨ祫 + 澶滅彮琛ュ姪 + 瀛﹀巻琛ヨ创 + 浣撴 + 浼樼鍛樺伐濂� + 鍏朵粬琛ュ姪 + 閮ㄩ棬缁╂晥
+ * 鎵f鍚堣 = 婕忔墦鍗� + 杩熷埌鏃╅�� + 鍏朵粬鎵f
+ * 绋庡悗宸ヨ祫 = 搴斾粯宸ヨ祫 + 鍔犻」鍚堣 - 鎵f鍚堣 - 绀句繚 - 鍏Н閲� - 涓◣
+ *
+ * 浠呭綋鏈璁板綍甯︽湁銆屽簲浠樺伐璧勩�嶆椂閲嶇畻锛涘彧鏈夋棫瀛楁鐨勮�佹暟鎹繚鎸佸師鏍凤紝閬垮厤鎶婃湭缁存姢鐨勬柊瀛楁娓呮垚 0銆�
+ */
+ private void normalizeSalaryTotals(HrmSalaryCalculationDO calculation) {
+ if (calculation.getPayableSalary() == null) {
+ return;
+ }
+ // 搴斾粯宸ヨ祫 = 鏍囧噯鍑哄嫟宸ヨ祫 + 鍔犵彮宸ヨ祫 + 娉曞畾鍋囧伐璧� + 瀹夊叏鐜繚濂� + 娴姩缁╂晥宸ヨ祫
+ // 浠呭綋鏈璁板綍甯︽柊鐗堟爣鍑嗛」鏃堕噸绠楋紝閬垮厤鏃ф暟鎹紙鏃犺繖浜涘垪锛夎娓呴浂
+ if (calculation.getStandardAttendancePay() != null) {
+ calculation.setPayableSalary(nvl(calculation.getStandardAttendancePay())
+ .add(nvl(calculation.getOvertimePay()))
+ .add(nvl(calculation.getLegalHolidayPay()))
+ .add(nvl(calculation.getSafetyAward()))
+ .add(nvl(calculation.getFloatingPerformancePay()))
+ .setScale(2, RoundingMode.HALF_UP));
+ }
+ BigDecimal additionTotal = nvl(calculation.getSeniorityPay())
+ .add(nvl(calculation.getNightShiftAllowance()))
+ .add(nvl(calculation.getEducationAllowance()))
+ .add(nvl(calculation.getHealthCheckAllowance()))
+ .add(nvl(calculation.getExcellentEmployeeAward()))
+ .add(nvl(calculation.getOtherSubsidy()))
+ .add(nvl(calculation.getDeptPerformance()));
+ BigDecimal deductionTotal = nvl(calculation.getMissedPunchDeduction())
+ .add(nvl(calculation.getLateEarlyDeduction()))
+ .add(nvl(calculation.getOtherDeduction()));
+ calculation.setAdditionTotal(additionTotal.setScale(2, RoundingMode.HALF_UP));
+ calculation.setDeductionTotal(deductionTotal.setScale(2, RoundingMode.HALF_UP));
+ calculation.setActualSalary(calculation.getPayableSalary()
+ .add(calculation.getAdditionTotal())
+ .subtract(calculation.getDeductionTotal())
+ .subtract(nvl(calculation.getSocialSecurityDeduction()))
+ .subtract(nvl(calculation.getHousingFundDeduction()))
+ .subtract(nvl(calculation.getTaxDeduction()))
+ .setScale(2, RoundingMode.HALF_UP));
+ }
+
+ /**
* 鍐呴儴鐢熸垚鍙戞斁鍙拌处鏂规硶锛堜緵鑷姩鐢熸垚璋冪敤锛�
*/
private void generatePaymentInternal(String period, List<HrmSalaryCalculationDO> calculationList) {
--
Gitblit v1.9.3