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

核算信息快照

This commit is contained in:
钱涛 2024-06-27 16:10:30 +08:00
parent ea07fe1a59
commit 9c7c6de614
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
View File

@ -32,6 +32,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import java.lang.reflect.Field;
import java.math.BigDecimal;
@ -555,7 +556,7 @@ public class CalculateFormulaVarBO {
employeeMap.forEach((key, po) -> {
// 获取po的状态
if(po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) {
po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(po.getStatus())));
po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(po.getStatus(),"1"))));
}
List<FormulaVarValue> formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList());
Map<String, String> map = JsonUtil.parseMap(po, String.class);

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

@ -305,7 +305,7 @@ public class SalaryAcctResultBO {
} else if ("status".equals(salarySobEmpField.getFieldCode())) {
map.put("status", e.getStatus());
} else if ("statusName".equals(salarySobEmpField.getFieldCode())) {
map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(e.getStatus())));
map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(e.getStatus(),"1"))));
} else {
map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
}

1
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -389,7 +389,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
// List<Object> headerList = new ArrayList<>(weaTableColumns);
List<Object> headerList = new ArrayList<>(finalWeaTableColumns);
// 查询薪资核算结果
queryParam.setDynamicEmpInfo(true);
List<Map<String, Object>> resultMapList = getSalaryAcctResultService(user).listByParam(queryParam);