diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java index 43accc309..9f704bdc1 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java @@ -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); diff --git a/src/com/engine/salary/util/SalaryEntityUtil.java b/src/com/engine/salary/util/SalaryEntityUtil.java index f303259f5..bf6454655 100644 --- a/src/com/engine/salary/util/SalaryEntityUtil.java +++ b/src/com/engine/salary/util/SalaryEntityUtil.java @@ -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) {