From ce76bc8b430832e397187fa8b42ed439bfe6ae52 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 8 Dec 2022 15:42:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97list?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89?= =?UTF-8?q?=E5=8A=A1=E4=BA=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java | 1 + .../engine/salary/entity/salarysob/dto/SalarySobListDTO.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java index d97e2a868..e84a890ee 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java @@ -72,6 +72,7 @@ public class SalarySobBO { .id(salarySobPO.getId()) .name(salarySobPO.getName()) .taxAgentName(taxAgentIdTONameMap.get(salarySobPO.getTaxAgentId())) + .taxAgentId(salarySobPO.getTaxAgentId()) .salaryCycle(buildSalaryCycle(salarySobPO)) .disable(salarySobPO.getDisable()) .description(salarySobPO.getDescription()) diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java index 60e14ab24..cb100ef55 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java @@ -46,6 +46,9 @@ public class SalarySobListDTO { @TableTitle(title = "个税扣缴义务人", key = "taxAgentName", dataIndex = "taxAgentName") private String taxAgentName; + // 个税扣缴义务人ID + private Long taxAgentId; + @SalaryTableColumn(text = "薪资周期", width = "10%", column = "salaryCycle", transmethod = "com.engine.salary.transmethod.TransMethod.buildSalaryCycle", otherPara = "column:salaryCycleFromDay") @TableTitle(title = "薪资周期", key = "salaryCycle", dataIndex = "salaryCycle") private String salaryCycle;