qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01

This commit is contained in:
Harryxzy 2023-03-28 13:40:12 +08:00
parent 95cf271c80 952a8e845c
commit d99e6147d3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -2859,7 +2859,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
for(String numKey : numKeys){
BigDecimal value = new BigDecimal(0);
for(Map<String, Object> record : records){
value = value.add( new BigDecimal(record.get(numKey) == null ? "0" : record.get(numKey).toString()) );
BigDecimal addValue = null;
if(record.get(numKey) == null || !StringUtils.isNumeric(record.get(numKey).toString())){
addValue = new BigDecimal(0);
}else{
addValue = new BigDecimal(record.get(numKey).toString());
}
value = value.add(addValue);
}
sumRow.put(numKey,value);
}