diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java index 40fde19f7..870fc2c89 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java @@ -1,8 +1,8 @@ package com.engine.salary.entity.taxdeclaration.dto; +import com.engine.salary.annotation.TableTitle; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -17,26 +17,31 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class FailEmployeeListDTO { - //主键id") + //主键id @JsonSerialize(using = ToStringSerializer.class) private Long id; - //姓名") + //姓名 + @TableTitle(title = "姓名",dataIndex = "employeeName",key = "employeeName") private String employeeName; - //个税扣缴义务人id") + //个税扣缴义务人id @JsonSerialize(using = ToStringSerializer.class) private Long taxAgentId; - //个税扣缴义务人名称") + //个税扣缴义务人名称 + @TableTitle(title = "个税扣缴义务人名称",dataIndex = "taxAgentName",key = "taxAgentName") private String taxAgentName; - //证件号码") + //证件号码 + @TableTitle(title = "证件号码",dataIndex = "cardNum",key = "cardNum") private String cardNum; - //失败原因") + //失败原因 + @TableTitle(title = "失败原因",dataIndex = "errorMsg",key = "errorMsg") private String errorMsg; - //所得项目") + //所得项目 + @TableTitle(title = "所得项目",dataIndex = "incomeCategory",key = "incomeCategory") private String incomeCategory; } diff --git a/src/com/engine/salary/util/page/PageInfo.java b/src/com/engine/salary/util/page/PageInfo.java index 86f73f742..44676ad56 100644 --- a/src/com/engine/salary/util/page/PageInfo.java +++ b/src/com/engine/salary/util/page/PageInfo.java @@ -38,9 +38,17 @@ public class PageInfo extends com.github.pagehelper.PageInfo { this.columns = buildColumns(); } + public PageInfo(int pageNum, int pageSize, long total, List columns, List list) { + super(list); + super.setPageNum(pageNum); + super.setPageSize(pageSize); + super.setTotal(total); + this.columns = columns; + } + public List buildColumns() { - if(clazz==null){ + if (clazz == null) { return this.columns; } Field[] fields = clazz.getDeclaredFields(); diff --git a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java index 00d5c9674..dad092eb4 100644 --- a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java @@ -153,9 +153,12 @@ public class TaxDeclareRecordWrapper extends Service { // 查询个税申报表详情 PageInfo page = getTaxDeclarationValueService(user).listPageByTaxDeclarationIds(queryParam, Collections.singleton(queryParam.getTaxDeclarationId())); TaxDeclarationValueListDTO taxDeclarationValueListDTO = getTaxDeclarationValueService(user).convert2List(taxDeclaration, page.getList()); - PageInfo> dtoPage = SalaryPageUtil.buildPage(page.getPageNum(), page.getPageSize(), taxDeclarationValueListDTO.getData()); - dtoPage.setColumns(SalaryPageUtil.convertList(taxDeclarationValueListDTO.getColumns())); - dtoPage.setTotal(page.getTotal()); + PageInfo> dtoPage = new PageInfo<>( + page.getPageNum(), + page.getPageSize(), + page.getTotal(), + SalaryPageUtil.convertList(taxDeclarationValueListDTO.getColumns()), + taxDeclarationValueListDTO.getData()); return dtoPage; } @@ -192,7 +195,7 @@ public class TaxDeclareRecordWrapper extends Service { List taxDeclareFailPOPageInfo = getTaxDeclareFailService(user).listPageByTaxDeclareRecordIds(Collections.singleton(taxDeclareRecord.getId())); // 转换成dto List failEmployeeListDTOS = getTaxDeclareFailService(user).convert2FailEmployeeList(taxDeclareRecord, taxDeclareFailPOPageInfo); - PageInfo dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), failEmployeeListDTOS,FailEmployeeListDTO.class); + PageInfo dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), failEmployeeListDTOS, FailEmployeeListDTO.class); // 转成前端所需的格式 return dtoPage; }