From f142f7352c11d253ec056d091d08ad038bfc19b1 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 15 Jun 2025 18:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=8F=91=E5=B7=A5=E8=B5=84=20=3D=20?=
 =?UTF-8?q?=E5=B7=A5=E8=B5=84+=E5=BA=94=E5=A2=9E-=E5=BA=94=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jinbooks-ui/src/views/hr/calc-salary.vue      |  6 +++++
 jinbooks-ui/src/views/hr/calc-salary/edit.vue |  4 ++--
 jinbooks-ui/src/views/hr/salary-detail.vue    |  6 +++++
 jinbooks-ui/src/views/hr/salary-summary.vue   | 19 ++++++++++-----
 .../jinbooks/entity/hr/EmployeeSalary.java    |  4 ++++
 .../entity/hr/EmployeeSalarySummary.java      |  6 ++++-
 .../entity/hr/EmployeeSalaryTemp.java         |  8 +++++++
 .../entity/hr/dto/SalaryDetailChangeDto.java  |  2 ++
 .../impl/EmployeeSalaryTempServiceImpl.java   | 23 ++++++++++++++++++-
 .../mapper/xml/mysql/EmployeeSalaryMapper.xml |  2 ++
 .../xml/mysql/EmployeeSalarySummaryMapper.xml |  1 +
 11 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/jinbooks-ui/src/views/hr/calc-salary.vue b/jinbooks-ui/src/views/hr/calc-salary.vue
index 4b729e7..0fbfe7b 100644
--- a/jinbooks-ui/src/views/hr/calc-salary.vue
+++ b/jinbooks-ui/src/views/hr/calc-salary.vue
@@ -171,6 +171,12 @@
           <template #default="scope">
             {{ formatAmount(scope.row.taxDeduction) }}
           </template>
+        </el-table-column>
+         <el-table-column prop="payAmount" label="应发工资" align="right" width="110"
+                         :show-overflow-tooltip="true">
+          <template #default="scope">
+            {{ formatAmount(scope.row.payAmount) }}
+          </template>
         </el-table-column>
         <el-table-column prop="taxableWages" label="应税工资" align="right" width="110"
                          :show-overflow-tooltip="true">
diff --git a/jinbooks-ui/src/views/hr/calc-salary/edit.vue b/jinbooks-ui/src/views/hr/calc-salary/edit.vue
index 05f574f..89b1e57 100644
--- a/jinbooks-ui/src/views/hr/calc-salary/edit.vue
+++ b/jinbooks-ui/src/views/hr/calc-salary/edit.vue
@@ -49,14 +49,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <h4 class="section-title" style="color: dodgerblue">应发金额 {{(form.payBasic +
+        <h4 class="section-title" style="color: dodgerblue">工资金额 {{(form.payBasic +
             form.payPost +
             form.payMerit +
             form.laborFee +
             form.bonus +
             form.overtime +
             form.allowance +
-            form.backPay).toFixed(2)}}</h4>
+            form.backPay).toFixed(2)}} 应发金额 {{(form.payAmount||0.00).toFixed(2)}}</h4>
         <el-row :gutter="20">
           <el-col :span="span" v-if="form.employeeType !== 'PARTTIME'">
             <el-form-item label="基本工资">
diff --git a/jinbooks-ui/src/views/hr/salary-detail.vue b/jinbooks-ui/src/views/hr/salary-detail.vue
index 2b1742a..e7d6c30 100644
--- a/jinbooks-ui/src/views/hr/salary-detail.vue
+++ b/jinbooks-ui/src/views/hr/salary-detail.vue
@@ -187,6 +187,12 @@
             {{ formatAmount(scope.row.taxDeduction) }}
           </template>
         </el-table-column>
+        <el-table-column prop="payAmount" label="应发工资" align="center" width="110"
+                         :show-overflow-tooltip="true">
+          <template #default="scope">
+            {{ formatAmount(scope.row.payAmount) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="taxableWages" label="应税工资" align="center" width="110"
                          :show-overflow-tooltip="true">
           <template #default="scope">
diff --git a/jinbooks-ui/src/views/hr/salary-summary.vue b/jinbooks-ui/src/views/hr/salary-summary.vue
index f4bcb4b..15d7d72 100644
--- a/jinbooks-ui/src/views/hr/salary-summary.vue
+++ b/jinbooks-ui/src/views/hr/salary-summary.vue
@@ -162,12 +162,19 @@
                     {{ formatAmount(scope.row.taxDeduction) }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="taxableWages" label="应税工资" align="center" width="110"
-                                 :show-overflow-tooltip="true">
-                  <template #default="scope">
-                    {{ formatAmount(scope.row.taxableWages) }}
-                  </template>
-                </el-table-column>-->
+                -->
+        <el-table-column prop="payAmount" label="应发工资" align="right" width="110"
+                         :show-overflow-tooltip="true">
+          <template #default="scope">
+            {{ formatAmount(scope.row.payAmount) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="taxableWages" label="应税工资" align="center" width="110"
+                          :show-overflow-tooltip="true">
+          <template #default="scope">
+            {{ formatAmount(scope.row.taxableWages) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="totalAmount" label="实发合计" align="center" width="110"
                          :show-overflow-tooltip="true">
           <template #default="scope">
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
index 2155923..bde3592 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
@@ -79,6 +79,10 @@ public class EmployeeSalary extends BaseEntity {
 
     private BigDecimal personalTax;
 
+    /**
+     * 应发工资 = 工资+应增-应扣
+     */
+    private BigDecimal payAmount;
     private BigDecimal totalAmount;
 
     private String bookId;
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
index c822411..f7a7420 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
@@ -83,7 +83,11 @@ public class EmployeeSalarySummary extends BaseEntity {
 
     /*个税*/
     private BigDecimal personalTax;
-
+    /**
+     * 应发工资 = 工资+应增-应扣
+     */
+    private BigDecimal payAmount;
+    
     /*实发工资*/
     private BigDecimal totalAmount;
 
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
index 8659ecb..0bb0a74 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
@@ -79,6 +79,14 @@ public class EmployeeSalaryTemp extends BaseEntity {
 
     private BigDecimal personalTax;
 
+    /**
+     * 应发工资 = 工资+应增-应扣
+     */
+    private BigDecimal payAmount;
+    
+    /**
+     * 实发合计
+     */
     private BigDecimal totalAmount;
 
     private String bookId;
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
index d5e39ba..a6b5aa4 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
@@ -63,6 +63,8 @@ public class SalaryDetailChangeDto {
 
     private BigDecimal personalTax;
 
+    private BigDecimal payAmount;
+    
     private BigDecimal totalAmount;
 
     private String bookId;
diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
index 3f7ddb1..71b75a9 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
@@ -461,6 +461,18 @@ public class EmployeeSalaryTempServiceImpl extends ServiceImpl<EmployeeSalaryTem
 		                .add(seriousMedicalBusiness);
 		        employeeSalary.setBusinessSocialInsurance(socialInsuranceBusiness);
 		        employeeSalary.setBusinessProvidentFund(providentFundSupBusinessFee);
+		        //应发工资 = 工资+应增-应扣
+		        employeeSalary.setPayAmount(
+		        		employee.getPayBasic()
+		                .add(BigDecimalUtils.safeAdd(employee.getPayPost()))
+		                .add(BigDecimalUtils.safeAdd(employee.getPayMerit()))
+		                .add(BigDecimalUtils.safeAdd(employeeSalary.getBonus()))
+		                .add(BigDecimalUtils.safeAdd(employeeSalary.getOvertime()))
+		                .add(BigDecimalUtils.safeAdd(employeeSalary.getAllowance()))
+		                .add(BigDecimalUtils.safeAdd(employeeSalary.getBackPay()))
+		                .subtract(BigDecimalUtils.safeAdd(employeeSalary.getAttendance()))
+		                .subtract(BigDecimalUtils.safeAdd(employeeSalary.getOtherDeductions()))
+		        		);
 		        //计算总工资(不含税)
 		        BigDecimal totalAmount = employee.getPayBasic()
 		                .add(BigDecimalUtils.safeAdd(employee.getPayPost()))
@@ -501,7 +513,16 @@ public class EmployeeSalaryTempServiceImpl extends ServiceImpl<EmployeeSalaryTem
                 BigDecimal taxableWages = laborFee.multiply(new BigDecimal("0.8"));
                 employeeSalary.setTaxableWages(taxableWages);
             }
-
+            	
+            employeeSalary.setPayAmount(
+            		laborFee
+	                .add(BigDecimalUtils.safeAdd(employeeSalary.getBonus()))
+	                .add(BigDecimalUtils.safeAdd(employeeSalary.getOvertime()))
+	                .add(BigDecimalUtils.safeAdd(employeeSalary.getAllowance()))
+	                .add(BigDecimalUtils.safeAdd(employeeSalary.getBackPay()))
+	                .subtract(BigDecimalUtils.safeAdd(employeeSalary.getAttendance()))
+	                .subtract(BigDecimalUtils.safeAdd(employeeSalary.getOtherDeductions()))
+	        		);
         	 employeeSalary.setTotalAmount(laborFee);
         }
     }
diff --git a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalaryMapper.xml b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalaryMapper.xml
index 43ac5a8..06cc992 100644
--- a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalaryMapper.xml
+++ b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalaryMapper.xml
@@ -45,6 +45,7 @@
             SUM(attendance) AS attendance,
             SUM(other_deductions) AS other_deductions,
             SUM(personal_tax) AS personal_tax,
+            SUM(pay_amount) AS pay_amount,
             SUM(total_amount) AS total_amount,
             SUM(business_social_insurance) AS business_social_insurance,
             SUM(business_provident_fund) AS business_provident_fund,
@@ -80,6 +81,7 @@
             SUM(attendance) AS attendance,
             SUM(other_deductions) AS other_deductions,
             SUM(personal_tax) AS personal_tax,
+            SUM(pay_amount) AS pay_amount,
             SUM(total_amount) AS total_amount,
             SUM(business_social_insurance) AS business_social_insurance,
             SUM(business_provident_fund) AS business_provident_fund,
diff --git a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalarySummaryMapper.xml b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalarySummaryMapper.xml
index 562c156..1e5d93d 100644
--- a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalarySummaryMapper.xml
+++ b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalarySummaryMapper.xml
@@ -20,6 +20,7 @@
             SUM(attendance) AS attendance,
             SUM(other_deductions) AS other_deductions,
             SUM(personal_tax) AS personal_tax,
+            SUM(pay_amount) AS pay_amount,
             SUM(total_amount) AS total_amount,
             SUM(business_social_insurance) AS business_social_insurance,
             SUM(business_provident_fund) AS business_provident_fund,