From b905390623bcb63c291e4551ce85cfdfdf32597c Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Sat, 6 May 2023 09:50:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=9B=E5=BB=BA=E4=BA=BA=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/siaccount/InsuranceAccountDetailMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 6ec6e1bb1..4b8e67a38 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -160,10 +160,10 @@ AND t.payment_organization = #{param.paymentOrganization} - - AND - t.creator = #{param.creator} - + + + + From f4627b53f922cce9be4f5dfa0f2cb720237dc742 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 7 Jun 2023 12:23:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=E6=B2=A1=E6=9C=89=E5=85=AC=E5=BC=8Fid?= =?UTF-8?q?=E5=86=85=E5=AE=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java index 7066c4664..0dd6e8a14 100644 --- a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java +++ b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java @@ -155,6 +155,8 @@ public class SalaryItemBO { .dataType(Optional.ofNullable(salaryDataTypeEnum) .map(e -> SalaryI18nUtil.getI18nLabel(e.getLabelId(), e.getDefaultLabel())) .orElse(StringUtils.EMPTY)) + .formulaId(salaryItemPO.getFormulaId()) + .formulaContent(formulaMap.getOrDefault(salaryItemPO.getFormulaId(),"")) .taxDeclarationColumn(buildTaxDeclarationColumn(salaryItemPO.getCode())) .sortedIndex(salaryItemPO.getSortedIndex()) .description(salaryItemPO.getDescription())