优化工资计算逻辑

2025-03-13 15:32:52 +08:00
parent 222ebb07dc
commit bc2ce25f2a
10 changed files with 74 additions and 12 deletions
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMapper.xml
@@ -32,7 +32,6 @@
            os.salary_id,
            os.user_id,
            os.pay_time,
-            os.base_salary,
            (
          COALESCE(SUM(
            CASE
@@ -44,7 +43,8 @@
            ) AS real_salary,
            osi.salary_item_id,
            osi.sign_time,
-            su.nick_name
+            su.nick_name,
+            labor_cost as base_salary
            FROM oa_salary os
            LEFT JOIN oa_salary_item osi
            ON osi.salary_id = os.salary_id