|
|
@@ -1531,8 +1531,6 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
|
|
|
salary.setCapitalIncrease(item.getCapitalIncrease());//增资
|
|
|
salary.setCode(item.getCode());//学历
|
|
|
salary.setEducationSalary(item.getEducationSalary());//学历工资
|
|
|
- salary.setSalaryBaseName(item.getSalaryBase());//工资基数标准
|
|
|
- salary.setSalaryBase(item.getSalaryBaseName());//工资基数
|
|
|
salary.setWorkloadSalaryCritertion(item.getWorkloadSalaryName());//工作量工资标准
|
|
|
salary.setVirtualWorkloadSalary(item.getVirtualWorkloadSalary());//虚拟工作量工资标准
|
|
|
salary.setDoubleCease(item.getDoubleCease());//双休日工作量工资标准
|
|
|
@@ -1569,6 +1567,14 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
|
|
|
salary.setAbsenteeism(BigDecimal.ZERO);//旷工
|
|
|
salary.setAppropriationProportion("");//拨付比例
|
|
|
salary.setImportedOrNot(0);//是否已导入出勤
|
|
|
+
|
|
|
+ //工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量标准+虚拟双休日工作量标准-日常考核工资标准+虚拟日常考核工资标准-学期绩效工资标准
|
|
|
+ BigDecimal salaryBase = salary.getSalaryWithdrawalStandard().subtract(salary.getRankWithdrawalStandard()).subtract(salary.getWorkloadSalaryCritertion())
|
|
|
+ .add(salary.getVirtualWorkloadSalary()).subtract(salary.getDoubleCease()).add(salary.getVirtualDoubleCease()).subtract(salary.getDailyAssessmentCriteria())
|
|
|
+ .add(salary.getVirtualDailyAssessmentCriteria()).subtract(salary.getTermPerformanceSalaryName());
|
|
|
+ salary.setSalaryBaseName(salaryBase);//工资基数标准
|
|
|
+ salary.setSalaryBase(salaryBase);//工资基数
|
|
|
+
|
|
|
SalaryItem selectOne = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salary.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
|
|
|
.eq("is_deleted", 0).eq("pid",salary.getPid()));
|
|
|
if (selectOne == null){
|
wangzhuo