Skip to content

K
klck
Commit deff2ec5 authored by 位宇华's avatar 位宇华
Browse files
Options

中浩工资--代码提交

parent 26c6ab0e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java
View file @ deff2ec5
...@@ -57,9 +57,9 @@ public class CurrentRuleSalarySupport { ...@@ -57,9 +57,9 @@ public class CurrentRuleSalarySupport {
String mineCode = newRuleRequestModelList.get(0).getMineid(); String mineCode = newRuleRequestModelList.get(0).getMineid();
ReplaceSpace(newRuleRequestModelList); ReplaceSpace(newRuleRequestModelList);
List<SalaryExpenseSourceModel> sourceModels = salaryMapper.getSources(mineCode); List<SalaryExpenseSourceModel> sourceModels = salaryMapper.getSources(mineCode);
newRuleRequestModelList=newRuleRequestModelList.stream().filter(v->sourceModels.stream().anyMatch(source->StringUtils.equals(v.getRow(),source.getOrg()))).collect(Collectors.toList()); newRuleRequestModelList = newRuleRequestModelList.stream().filter(v -> sourceModels.stream().anyMatch(source -> StringUtils.equals(v.getRow(), source.getOrg()))).collect(Collectors.toList());
List<SalaryExcelModel> salaryExcelModelList = getSalaryMapping(newRuleRequestModelList); List<SalaryExcelModel> salaryExcelModelList = getSalaryMapping(newRuleRequestModelList);
salaryExcelModelList.forEach(v->v.setSumSalary(new BigDecimal(v.getSumSalary()).toPlainString())); salaryExcelModelList.forEach(v -> v.setSumSalary(new BigDecimal(v.getSumSalary()).toPlainString()));
return salaryExcelModelList; return salaryExcelModelList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment