xuemingqiang/jinbooks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

应发工资 = 工资+应增-应扣

Browse Source
This commit is contained in:
MaxKey
2025-06-15 18:36:06 +08:00
parent 271cf160d3
commit f142f7352c
11 changed files with 71 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jinbooks-ui/src/views/hr/calc-salary.vue
View File

@ -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">

4
jinbooks-ui/src/views/hr/calc-salary/edit.vue
View File

@ -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="基本工资">

6
jinbooks-ui/src/views/hr/salary-detail.vue
View File

@ -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">

19
jinbooks-ui/src/views/hr/salary-summary.vue
View File

@ -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">

4
jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
View File

@ -79,6 +79,10 @@ public class EmployeeSalary extends BaseEntity {
private BigDecimal personalTax;
/**
* 应发工资 = 工资+应增-应扣
*/
private BigDecimal payAmount;
private BigDecimal totalAmount;
private String bookId;

6
jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
View File

@ -83,7 +83,11 @@ public class EmployeeSalarySummary extends BaseEntity {
/*个税*/
private BigDecimal personalTax;
/**
* 应发工资 = 工资+应增-应扣
*/
private BigDecimal payAmount;
/*实发工资*/
private BigDecimal totalAmount;

8
jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
View File

@ -79,6 +79,14 @@ public class EmployeeSalaryTemp extends BaseEntity {
private BigDecimal personalTax;
/**
* 应发工资 = 工资+应增-应扣
*/
private BigDecimal payAmount;
/**
* 实发合计
*/
private BigDecimal totalAmount;
private String bookId;

2
jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
View File

@ -63,6 +63,8 @@ public class SalaryDetailChangeDto {
private BigDecimal personalTax;
private BigDecimal payAmount;
private BigDecimal totalAmount;
private String bookId;

23
jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
View File

@ -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);
}
}

2
jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalaryMapper.xml
View File

@ -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,

1
jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeSalarySummaryMapper.xml
View File

@ -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,