From b42586600a7d00074eaf5bdf1f78202fc8690290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 15 Jun 2022 12:03:17 +0800 Subject: [PATCH] =?UTF-8?q?fix=E7=94=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxdeclaration/dto/TaxDeclarationWageListDTO.java | 6 +++--- .../salary/service/impl/SalaryAcctResultServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java index b6aaac452..7cb5ad3cb 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java @@ -38,15 +38,15 @@ public class TaxDeclarationWageListDTO { private String jobNum; @SalaryTableColumn(text = "姓名", width = "10%", column = "username") - @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") + @TableTitle(title = "姓名", dataIndex = "username", key = "username") private String username; @SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType") - @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") + @TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType") private String cardType; @SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum") - + @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum") private String cardNum; @SalaryTableColumn(text = "本期收入", width = "10%", column = "income") diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index fe72d1017..9b473da72 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -568,6 +568,6 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe if (CollectionUtils.isEmpty(salaryAcctRecordIds)) { return Collections.emptyList(); } - return getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctRecordIds(salaryAcctRecordIds).taxAgentIds(taxAgentIds).build()); + return SalaryAcctResultPOEncrypt.decryptList(getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctRecordIds(salaryAcctRecordIds).taxAgentIds(taxAgentIds).build())); } }