|
|
@@ -1522,7 +1522,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
|
|
|
salary.setEducationSalary(item.getEducationSalary());//学历工资
|
|
|
salary.setSalaryBaseName(item.getSalaryBaseName());//工资基数标准
|
|
|
salary.setSalaryBase(item.getSalaryBase());//工资基数
|
|
|
- salary.setWorkloadSalaryCritertion(item.getWorkloadSalaryName().subtract(item.getVirtualWorkloadSalary()));//工作量工资标准
|
|
|
+ salary.setWorkloadSalaryCritertion(item.getWorkloadSalaryName());//工作量工资标准
|
|
|
salary.setVirtualWorkloadSalary(item.getVirtualWorkloadSalary());//虚拟工作量工资标准
|
|
|
salary.setDoubleCease(item.getDoubleCease());//双休日工作量工资标准
|
|
|
salary.setVirtualDoubleCease(item.getVirtualDoubleCease());//虚拟双休日工作量工资标准
|