hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理1

Browse Source
This commit is contained in:
andy 2026-05-12 10:06:54 +08:00
parent 6b43aa02ae
commit 0a87b28282
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
evo-admin/src/main/java/com/evo/finance/processor/impl/MonthlySalaryStrategyExchangeProcessor.java
View File

@ -121,6 +121,9 @@ public class MonthlySalaryStrategyExchangeProcessor implements SalaryCalculation
rzSalaryDetail.setBjAmount(gs); rzSalaryDetail.setBjAmount(gs);
} }
if(sysStaff.getName().equals("史国臣")){
System.out.println("11111");
}
BigDecimal basic = new BigDecimal("0"); BigDecimal basic = new BigDecimal("0");
Long basicHour = 0l; Long basicHour = 0l;
@ -132,7 +135,7 @@ public class MonthlySalaryStrategyExchangeProcessor implements SalaryCalculation
} }
if(basicHour.compareTo(0l)> 0){ if(basicHour.compareTo(0l)> 0){
//存在工伤假, 需要计算 //存在工伤假, 需要计算
basic = rzSalaryDetail.getBasicSalary().divide(new BigDecimal(ParamUtils.getMonthWorkDayNum(DateUtils.getYear(rzSalaryDetail.getMonth()), DateUtils.getMonth(rzSalaryDetail.getMonth()))),2, RoundingMode.HALF_UP).multiply(new BigDecimal(total8Hour).divide(Constants.DAY_WORK_HOUR,2,RoundingMode.HALF_UP)); basic = rzSalaryDetail.getBasicSalary().divide(new BigDecimal(ParamUtils.getMonthWorkDayNum(DateUtils.getYear(rzSalaryDetail.getMonth()), DateUtils.getMonth(rzSalaryDetail.getMonth()))),2, RoundingMode.HALF_UP).multiply(new BigDecimal(basicHour).divide(Constants.DAY_WORK_HOUR,2,RoundingMode.HALF_UP));
// rzSalaryDetail.setMonthSalary(rzSalaryDetail.getMonthSalary().add(gs)); // rzSalaryDetail.setMonthSalary(rzSalaryDetail.getMonthSalary().add(gs));
// rzSalaryDetail.setBjAmount(DataUtils.findDefaultValue(rzSalaryDetail.getBjAmount(), DataUtils.DEFAULT_VALUE).add(basic)); // rzSalaryDetail.setBjAmount(DataUtils.findDefaultValue(rzSalaryDetail.getBjAmount(), DataUtils.DEFAULT_VALUE).add(basic));