From 3e17b898ed5c4a62fbad777f39c3f89953345ff2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 七月 2026 16:38:42 +0800
Subject: [PATCH] 修改工资计算
---
src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
index 22c1b25..8a266ef 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
@@ -47,11 +47,33 @@
@Schema(description = "閮ㄩ棬鍚嶇О")
private String deptName;
+ @Schema(description = "鍏ュ徃鏃ユ湡")
+ @TableField(exist = false)
+ private String entryDate;
+
@Schema(description = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
@Schema(description = "鍏ㄥ嫟濂栭噾")
private BigDecimal attendanceBonus;
+
+ @Schema(description = "鍑哄嫟澶╂暟")
+ private Integer workDays;
+
+ @Schema(description = "浜嬪亣")
+ private BigDecimal personalLeave;
+
+ @Schema(description = "鐥呭亣")
+ private BigDecimal sickLeave;
+
+ @Schema(description = "涓у亣")
+ private BigDecimal bereavementLeave;
+
+ @Schema(description = "濠氬亣")
+ private BigDecimal marriageLeave;
+
+ @Schema(description = "娲ヨ创")
+ private BigDecimal allowance;
@Schema(description = "璁′欢宸ヨ祫")
private BigDecimal pieceSalary;
@@ -59,20 +81,11 @@
@Schema(description = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
- @Schema(description = "鏈堝伐浣滄棩澶╂暟")
- private Integer monthWorkDays;
-
- @Schema(description = "鏈堟爣鍑嗗伐鏃�")
- private BigDecimal standardHours;
-
@Schema(description = "鏈堟椂闂村悎璁�")
private BigDecimal monthTimeTotal;
@Schema(description = "鎶樺悎鍊嶆暟")
private BigDecimal conversionRatio;
-
- @Schema(description = "宸ュ簭鎶樼畻宸ユ椂")
- private BigDecimal convertedWorkHours;
@Schema(description = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
--
Gitblit v1.9.3