diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java index 419f8f1e0..9f151ed02 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java @@ -84,11 +84,24 @@ public class TaxDeclarationWageListDTO { @ExcelHead(title = "住房公积金", dataIndex = "housingProvidentFund") private String housingProvidentFund; + /** + * @param null: + * @return null + * @author 赵鹏 + * @description TODO 修改个税申报表详情列表 字段顺序: + * 累计子女教育、累计继续教育、累计住房贷款利息、累计住房租金、累计赡养老人、累计婴幼儿照护费用、企业(职业)年金、累计个人养老金; + * @date 2025/12/5 005 上午 10:32 + */ @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") @ExcelHead(title = "累计子女教育", dataIndex = "addUpChildEducation") private String addUpChildEducation; + @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") + @ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation") + private String addUpContinuingEducation; + @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") @ExcelHead(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest") @@ -98,37 +111,33 @@ public class TaxDeclarationWageListDTO { @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") @ExcelHead(title = "累计住房租金", dataIndex = "addUpHousingRent") private String addUpHousingRent; - - @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") - @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") - @ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation") - private String addUpContinuingEducation; - @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") @ExcelHead(title = "累计赡养老人", dataIndex = "addUpSupportElderly") private String addUpSupportElderly; - @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") - @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") - @ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical") - private String addUpIllnessMedical; - - @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare") - @TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") - @ExcelHead(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare") + @SalaryTableColumn(text = "累计婴幼儿照护费用", width = "10%", column = "addUpInfantCare") + @TableTitle(title = "累计婴幼儿照护费用", dataIndex = "addUpInfantCare", key = "addUpInfantCare") + @ExcelHead(title = "累计婴幼儿照护费用", dataIndex = "addUpInfantCare") private String addUpInfantCare; - @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") - @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") - @ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension") - private String addUpPrivatePension; - @SalaryTableColumn(text = "企业(职业)年金", width = "10%", column = "annuity") @TableTitle(title = "企业(职业)年金", dataIndex = "annuity", key = "annuity") @ExcelHead(title = "企业(职业)年金", dataIndex = "annuity") private String annuity; + @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") + @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") + @ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension") + private String addUpPrivatePension; + + // TODO ============================== edit end ====================================== + + // 删除 累计大病医疗 +// @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") +// @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") +// @ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical") + private String addUpIllnessMedical; @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance") @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance") @ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance")