From 45154c3fbfbd5c0a5e068c71e1a7851dd75588bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 18 Mar 2025 11:45:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E7=A6=8F=E6=8A=A5=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryStatisticsEmployeeServiceImpl.java | 10 +++++++--- src/com/engine/salary/util/SalaryEntityUtil.java | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) 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) {