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); });