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

Merge branch 'release/2.15.1.2407.01' into release/个税版本

This commit is contained in:
钱涛 2024-08-06 14:24:42 +08:00
parent 4b85b447c5 ff00de206c
commit 05a755c9b3
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.salaryacct.bo;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.engine.salary.annotation.SalaryFormulaVar;
import com.engine.salary.component.WeaTableColumnGroup;
@ -35,6 +36,7 @@ import org.springframework.beans.BeanUtils;
import weaver.general.Util;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@ -418,8 +420,9 @@ public class SalaryAcctResultBO {
// 薪资项目字段的字段类型
map.put(salaryItem.getId() + DATA_TYPE_SUFFIX, salaryItem.getDataType());
SalaryDataTypeEnum dataTypeEnum = SalaryDataTypeEnum.parseByValue(salaryItem.getDataType());
if (dataTypeEnum == SalaryDataTypeEnum.STRING) {
if (!StringUtils.equals(acctResultValue, excelResultValue)) {
if (dataTypeEnum == SalaryDataTypeEnum.NUMBER) {
if (NumberUtil.isNumber(acctResultValue) && NumberUtil.isNumber(excelResultValue)) {
if (new BigDecimal(acctResultValue).compareTo(new BigDecimal(excelResultValue)) != 0) {
different = true;
includeSalaryItemIds.add(salaryItem.getId());
}
@ -429,6 +432,12 @@ public class SalaryAcctResultBO {
includeSalaryItemIds.add(salaryItem.getId());
}
}
} else {
if (!StringUtils.equals(acctResultValue, excelResultValue)) {
different = true;
includeSalaryItemIds.add(salaryItem.getId());
}
}
}
// 主键id
map.put("id", salaryAcctEmployee.getId());