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

京福报表格式修改

This commit is contained in:
钱涛 2025-03-18 11:45:49 +08:00
parent 1aea37a581
commit 45154c3fbf
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
View File

@ -263,10 +263,14 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
String dataType = itemDataTypeMap.getOrDefault(l.getSalaryItemId(), "string");
SalaryDataTypeEnum typeEnum = SalaryDataTypeEnum.parseByValue(dataType);
String resultValue = l.getResultValue();
if (typeEnum == SalaryDataTypeEnum.NUMBER && NumberUtil.isNumber(resultValue)) {
map.put(l.getSalaryItemId() + "", Double.valueOf(resultValue));
if (needAdjustSalaryItemIds.contains(l.getSalaryItemId())) {
map.put(l.getSalaryItemId() + "", SalaryEntityUtil.removeLastZero(l.getResultValue()));
} else {
map.put(l.getSalaryItemId() + "", resultValue);
if (typeEnum == SalaryDataTypeEnum.NUMBER && NumberUtil.isNumber(resultValue)) {
map.put(l.getSalaryItemId() + "", Double.valueOf(resultValue));
} else {
map.put(l.getSalaryItemId() + "", resultValue);
}
}
});
acctResultValueMap.put(k, map);

5
src/com/engine/salary/util/SalaryEntityUtil.java
View File

@ -210,9 +210,10 @@ public class SalaryEntityUtil {
/**
* 进位规则
* @param newScale 小数位
*
* @param newScale 小数位
* @param rententionRule 进位规则
* @param value 值
* @param value 值
* @return
*/
public static BigDecimal carryRule(Integer newScale, Integer rententionRule, BigDecimal value) {