From 5b4f11e9cf5eec732c739c0658efd1d0f105e359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 14 May 2025 10:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E5=BC=80=EF=BC=8C=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8A=E6=9C=88=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salarysob/bo/SalarySobItemAggregateBO.java | 2 +- .../engine/salary/entity/salarysob/dto/SalarySobItemDTO.java | 2 +- .../salary/entity/salarysob/dto/SalarySobItemFormDTO.java | 2 +- .../engine/salary/service/impl/SalarySobItemServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java index aa3704a3f..cec33f280 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java @@ -135,7 +135,7 @@ public class SalarySobItemAggregateBO { .pattern(Optional.ofNullable(salarySobItemPO.getPattern()).orElse(salaryItemPO.getPattern())) .name(salaryItemPO.getName()) .itemHide(salarySobItemPO.getItemHide()) - .quote(salarySobItemPO.getQuote() == null ? 0 : salarySobItemPO.getQuote()) + .quote(salarySobItemPO.getQuote() == null ? "0" : salarySobItemPO.getQuote().toString()) .formulaId(salarySobItemPO.getFormulaId()) .formulaContent(formulaMap.getOrDefault(salarySobItemPO.getFormulaId(), "")) .originFormulaContent(valueType == SalaryValueTypeEnum.FORMULA.getValue() ? formulaMap.getOrDefault(salarySobItemPO.getFormulaId(), "") : "") diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java index 3ebbae8ee..746b639d0 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java @@ -100,7 +100,7 @@ public class SalarySobItemDTO { @JsonSerialize(using = ToStringSerializer.class) private Long itemHide; - private Integer quote; + private String quote; /** * 进位规则 diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemFormDTO.java index 3a9fd2a27..407071c88 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemFormDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemFormDTO.java @@ -38,7 +38,7 @@ public class SalarySobItemFormDTO { //核算时隐藏") @DataCheck(require = true, runtime = {RuntimeTypeEnum.UPDATE}, message = "核算时隐藏不允许为空") private Integer itemHide; - private Integer quote; + private String quote; //字段类型 /** diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index 693d4bc53..93ee72046 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -600,7 +600,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe .setId(salarySobItemPO.getId()) .setName(salaryItemPO.getName()) .setItemHide(salarySobItemPO.getItemHide() == null ? 0 : Integer.parseInt(salarySobItemPO.getItemHide().toString())) - .setQuote(salarySobItemPO.getItemHide() == null ? 0 : salarySobItemPO.getQuote()) + .setQuote(salarySobItemPO.getItemHide() == null ? "0" : salarySobItemPO.getQuote().toString()) .setDataType(salaryItemPO.getDataType()) .setRoundingMode(salarySobItemPO.getRoundingMode() == null ? salaryItemPO.getRoundingMode() : salarySobItemPO.getRoundingMode()) .setPattern(salarySobItemPO.getPattern() == null ? salaryItemPO.getPattern() : salarySobItemPO.getPattern())