From e83db15bc786503bbac7256fae18c7c253be1fe5 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 25 Aug 2023 15:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E3=80=81?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E7=BC=96=E8=BE=91=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=8E=A7=E5=88=B6=E4=BF=9D=E7=95=99=E4=BD=8D=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java | 1 + .../entity/salaryacct/dto/SalaryAcctResultDetailDTO.java | 3 +++ src/com/engine/salary/wrapper/SalaryArchiveWrapper.java | 1 + 3 files changed, 5 insertions(+) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 259f213e5..73558cd0b 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -510,6 +510,7 @@ public class SalaryAcctResultBO { .itemFormulaContent(itemFormulaContent) // .canEdit(Objects.equals(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getUseInEmployeeSalary).orElse(0), 0)) .canEdit(true) + .pattern(salarySobItemPO.getPattern()) .build(); } diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java index 1df7b8a14..1929494a9 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java @@ -68,6 +68,9 @@ public class SalaryAcctResultDetailDTO { //是否可编辑 private Boolean canEdit; + + // 保留小数位数 + private Integer pattern; } @Data diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index f7a8b277e..ff9147988 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -376,6 +376,7 @@ public class SalaryArchiveWrapper extends Service { salaryItemMap.put("name", s.getName()); salaryItemMap.put("value", optionalItem.isPresent() ? optionalItem.get().getItemValue() : ""); salaryItemMap.put("dataType", s.getDataType()); + salaryItemMap.put("pattern", s.getPattern()); salaryItems.add(salaryItemMap); });