qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix申报表

This commit is contained in:
钱涛 2022-06-15 12:03:17 +08:00
parent baa06f4011
commit b42586600a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java
View File

@ -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")

2
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

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