From cb02136ff6d61b832c5e6246571ba41bc22cd73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 1 Jul 2025 18:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E7=A8=8E=E6=94=B6=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202507010303.sql | 21 +++++++++++++++++++ resource/sqlupgrade/DM/sql202507010403.sql | 21 +++++++++++++++++++ resource/sqlupgrade/GS/sql202507010303.sql | 21 +++++++++++++++++++ resource/sqlupgrade/GS/sql202507010403.sql | 21 +++++++++++++++++++ resource/sqlupgrade/JC/sql202507010303.sql | 21 +++++++++++++++++++ resource/sqlupgrade/JC/sql202507010403.sql | 21 +++++++++++++++++++ resource/sqlupgrade/Mysql/sql202507010303.sql | 7 +++++++ resource/sqlupgrade/Mysql/sql202507010403.sql | 7 +++++++ .../sqlupgrade/Oracle/sql202507010303.sql | 20 ++++++++++++++++++ .../sqlupgrade/Oracle/sql202507010403.sql | 14 +++++++++++++ resource/sqlupgrade/PG/sql202507010303.sql | 20 ++++++++++++++++++ resource/sqlupgrade/PG/sql202507010403.sql | 20 ++++++++++++++++++ .../sqlupgrade/SQLServer/sql202507010303.sql | 20 ++++++++++++++++++ .../sqlupgrade/SQLServer/sql202507010403.sql | 14 +++++++++++++ resource/sqlupgrade/ST/sql202507010303.sql | 21 +++++++++++++++++++ resource/sqlupgrade/ST/sql202507010403.sql | 21 +++++++++++++++++++ .../dto/DerateDeductionListDTO.java | 11 +++++++--- .../dto/EndowmentInsuranceListDTO.java | 17 +++++++++------ .../datacollection/dto/FreeIncomeListDTO.java | 9 ++++++-- .../dto/GrantDonationListDTO.java | 19 ++++++++++------- .../dto/HealthInsuranceListDTO.java | 13 ++++++++---- .../dto/OtherDerateDeductionListDTO.java | 7 ++++++- .../dto/PersonalPensionListDTO.java | 11 +++++++--- .../param/DerateDeductionSaveParam.java | 7 +++++++ .../param/EndowmentInsuranceSaveParam.java | 7 +++++++ .../param/FreeIncomeSaveParam.java | 6 ++++++ .../param/GrantDonationSaveParam.java | 7 +++++++ .../param/HealthInsuranceSaveParam.java | 7 +++++++ .../param/OtherDerateDeductionSaveParam.java | 7 +++++++ .../param/PersonalPensionSaveParam.java | 7 +++++++ .../datacollection/po/DerateDeductionPO.java | 7 +++++++ .../po/EndowmentInsurancePO.java | 7 +++++++ .../datacollection/po/FreeIncomePO.java | 7 +++++++ .../datacollection/po/GrantDonationPO.java | 7 +++++++ .../datacollection/po/HealthInsurancePO.java | 7 +++++++ .../po/OtherDerateDeductionPO.java | 7 +++++++ .../datacollection/po/PersonalPensionPO.java | 7 +++++++ .../bo/TaxDeclarationRequest.java | 21 ++++++++++++++++--- .../datacollection/FreeIncomeMapper.xml | 15 +++++++++++++ .../impl/OtherDeductionServiceImpl.java | 16 ++++++++++++++ 40 files changed, 497 insertions(+), 29 deletions(-) create mode 100644 resource/sqlupgrade/DM/sql202507010303.sql create mode 100644 resource/sqlupgrade/DM/sql202507010403.sql create mode 100644 resource/sqlupgrade/GS/sql202507010303.sql create mode 100644 resource/sqlupgrade/GS/sql202507010403.sql create mode 100644 resource/sqlupgrade/JC/sql202507010303.sql create mode 100644 resource/sqlupgrade/JC/sql202507010403.sql create mode 100644 resource/sqlupgrade/Mysql/sql202507010303.sql create mode 100644 resource/sqlupgrade/Mysql/sql202507010403.sql create mode 100644 resource/sqlupgrade/Oracle/sql202507010303.sql create mode 100644 resource/sqlupgrade/Oracle/sql202507010403.sql create mode 100644 resource/sqlupgrade/PG/sql202507010303.sql create mode 100644 resource/sqlupgrade/PG/sql202507010403.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202507010303.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202507010403.sql create mode 100644 resource/sqlupgrade/ST/sql202507010303.sql create mode 100644 resource/sqlupgrade/ST/sql202507010403.sql diff --git a/resource/sqlupgrade/DM/sql202507010303.sql b/resource/sqlupgrade/DM/sql202507010303.sql new file mode 100644 index 000000000..a25d13d65 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202507010303.sql @@ -0,0 +1,21 @@ +ALTER TABLE hrsa_free_income ADD income_category int; +/ + +ALTER TABLE hrsa_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_endowment_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_grant_donation ADD income_category int; +/ + +ALTER TABLE hrsa_health_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_personal_pension ADD income_category int; +/ + diff --git a/resource/sqlupgrade/DM/sql202507010403.sql b/resource/sqlupgrade/DM/sql202507010403.sql new file mode 100644 index 000000000..69d97a34e --- /dev/null +++ b/resource/sqlupgrade/DM/sql202507010403.sql @@ -0,0 +1,21 @@ +update hrsa_free_income set income_category = 1; +/ + +update hrsa_derate_deduction set income_category = 1; +/ + +update hrsa_endowment_insurance set income_category = 1; +/ + +update hrsa_grant_donation set income_category = 1; +/ + +update hrsa_health_insurance set income_category = 1; +/ + +update hrsa_other_derate_deduction set income_category = 1; +/ + +update hrsa_personal_pension set income_category = 1; +/ + diff --git a/resource/sqlupgrade/GS/sql202507010303.sql b/resource/sqlupgrade/GS/sql202507010303.sql new file mode 100644 index 000000000..a25d13d65 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202507010303.sql @@ -0,0 +1,21 @@ +ALTER TABLE hrsa_free_income ADD income_category int; +/ + +ALTER TABLE hrsa_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_endowment_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_grant_donation ADD income_category int; +/ + +ALTER TABLE hrsa_health_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_personal_pension ADD income_category int; +/ + diff --git a/resource/sqlupgrade/GS/sql202507010403.sql b/resource/sqlupgrade/GS/sql202507010403.sql new file mode 100644 index 000000000..69d97a34e --- /dev/null +++ b/resource/sqlupgrade/GS/sql202507010403.sql @@ -0,0 +1,21 @@ +update hrsa_free_income set income_category = 1; +/ + +update hrsa_derate_deduction set income_category = 1; +/ + +update hrsa_endowment_insurance set income_category = 1; +/ + +update hrsa_grant_donation set income_category = 1; +/ + +update hrsa_health_insurance set income_category = 1; +/ + +update hrsa_other_derate_deduction set income_category = 1; +/ + +update hrsa_personal_pension set income_category = 1; +/ + diff --git a/resource/sqlupgrade/JC/sql202507010303.sql b/resource/sqlupgrade/JC/sql202507010303.sql new file mode 100644 index 000000000..a25d13d65 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202507010303.sql @@ -0,0 +1,21 @@ +ALTER TABLE hrsa_free_income ADD income_category int; +/ + +ALTER TABLE hrsa_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_endowment_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_grant_donation ADD income_category int; +/ + +ALTER TABLE hrsa_health_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_personal_pension ADD income_category int; +/ + diff --git a/resource/sqlupgrade/JC/sql202507010403.sql b/resource/sqlupgrade/JC/sql202507010403.sql new file mode 100644 index 000000000..69d97a34e --- /dev/null +++ b/resource/sqlupgrade/JC/sql202507010403.sql @@ -0,0 +1,21 @@ +update hrsa_free_income set income_category = 1; +/ + +update hrsa_derate_deduction set income_category = 1; +/ + +update hrsa_endowment_insurance set income_category = 1; +/ + +update hrsa_grant_donation set income_category = 1; +/ + +update hrsa_health_insurance set income_category = 1; +/ + +update hrsa_other_derate_deduction set income_category = 1; +/ + +update hrsa_personal_pension set income_category = 1; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202507010303.sql b/resource/sqlupgrade/Mysql/sql202507010303.sql new file mode 100644 index 000000000..8b3a971e8 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202507010303.sql @@ -0,0 +1,7 @@ +ALTER TABLE hrsa_free_income ADD COLUMN income_category int(0); +ALTER TABLE hrsa_derate_deduction ADD COLUMN income_category int(0); +ALTER TABLE hrsa_endowment_insurance ADD COLUMN income_category int(0); +ALTER TABLE hrsa_grant_donation ADD COLUMN income_category int(0); +ALTER TABLE hrsa_health_insurance ADD COLUMN income_category int(0); +ALTER TABLE hrsa_other_derate_deduction ADD COLUMN income_category int(0); +ALTER TABLE hrsa_personal_pension ADD COLUMN income_category int(0); \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/sql202507010403.sql b/resource/sqlupgrade/Mysql/sql202507010403.sql new file mode 100644 index 000000000..d6247eefc --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202507010403.sql @@ -0,0 +1,7 @@ +update hrsa_free_income set income_category = 1; +update hrsa_derate_deduction set income_category = 1; +update hrsa_endowment_insurance set income_category = 1; +update hrsa_grant_donation set income_category = 1; +update hrsa_health_insurance set income_category = 1; +update hrsa_other_derate_deduction set income_category = 1; +update hrsa_personal_pension set income_category = 1; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202507010303.sql b/resource/sqlupgrade/Oracle/sql202507010303.sql new file mode 100644 index 000000000..7cfc02c85 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202507010303.sql @@ -0,0 +1,20 @@ +ALTER TABLE hrsa_free_income ADD income_category int +/ + +ALTER TABLE hrsa_derate_deduction ADD income_category int +/ + +ALTER TABLE hrsa_endowment_insurance ADD income_category int +/ + +ALTER TABLE hrsa_grant_donation ADD income_category int +/ + +ALTER TABLE hrsa_health_insurance ADD income_category int +/ + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int +/ + +ALTER TABLE hrsa_personal_pension ADD income_category int +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202507010403.sql b/resource/sqlupgrade/Oracle/sql202507010403.sql new file mode 100644 index 000000000..4eff5bab6 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202507010403.sql @@ -0,0 +1,14 @@ +update hrsa_free_income set income_category = 1 +/ +update hrsa_derate_deduction set income_category = 1 +/ +update hrsa_endowment_insurance set income_category = 1 +/ +update hrsa_grant_donation set income_category = 1 +/ +update hrsa_health_insurance set income_category = 1 +/ +update hrsa_other_derate_deduction set income_category = 1 +/ +update hrsa_personal_pension set income_category = 1 +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202507010303.sql b/resource/sqlupgrade/PG/sql202507010303.sql new file mode 100644 index 000000000..f54b534b9 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202507010303.sql @@ -0,0 +1,20 @@ +ALTER TABLE hrsa_free_income ADD income_category int; +/ + +ALTER TABLE hrsa_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_endowment_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_grant_donation ADD income_category int; +/ + +ALTER TABLE hrsa_health_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_personal_pension ADD income_category int; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202507010403.sql b/resource/sqlupgrade/PG/sql202507010403.sql new file mode 100644 index 000000000..f5ebbdb76 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202507010403.sql @@ -0,0 +1,20 @@ +update hrsa_free_income set income_category = 1; +/ + +update hrsa_derate_deduction set income_category = 1; +/ + +update hrsa_endowment_insurance set income_category = 1; +/ + +update hrsa_grant_donation set income_category = 1; +/ + +update hrsa_health_insurance set income_category = 1; +/ + +update hrsa_other_derate_deduction set income_category = 1; +/ + +update hrsa_personal_pension set income_category = 1; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202507010303.sql b/resource/sqlupgrade/SQLServer/sql202507010303.sql new file mode 100644 index 000000000..9ca6c463d --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202507010303.sql @@ -0,0 +1,20 @@ +ALTER TABLE hrsa_free_income ADD income_category int +GO + +ALTER TABLE hrsa_derate_deduction ADD income_category int +GO + +ALTER TABLE hrsa_endowment_insurance ADD income_category int +GO + +ALTER TABLE hrsa_grant_donation ADD income_category int +GO + +ALTER TABLE hrsa_health_insurance ADD income_category int +GO + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int +GO + +ALTER TABLE hrsa_personal_pension ADD income_category int +GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202507010403.sql b/resource/sqlupgrade/SQLServer/sql202507010403.sql new file mode 100644 index 000000000..99fc8e409 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202507010403.sql @@ -0,0 +1,14 @@ +update hrsa_free_income set income_category = 1 +GO +update hrsa_derate_deduction set income_category = 1 +GO +update hrsa_endowment_insurance set income_category = 1 +GO +update hrsa_grant_donation set income_category = 1 +GO +update hrsa_health_insurance set income_category = 1 +GO +update hrsa_other_derate_deduction set income_category = 1 +GO +update hrsa_personal_pension set income_category = 1 +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202507010303.sql b/resource/sqlupgrade/ST/sql202507010303.sql new file mode 100644 index 000000000..a25d13d65 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202507010303.sql @@ -0,0 +1,21 @@ +ALTER TABLE hrsa_free_income ADD income_category int; +/ + +ALTER TABLE hrsa_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_endowment_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_grant_donation ADD income_category int; +/ + +ALTER TABLE hrsa_health_insurance ADD income_category int; +/ + +ALTER TABLE hrsa_other_derate_deduction ADD income_category int; +/ + +ALTER TABLE hrsa_personal_pension ADD income_category int; +/ + diff --git a/resource/sqlupgrade/ST/sql202507010403.sql b/resource/sqlupgrade/ST/sql202507010403.sql new file mode 100644 index 000000000..69d97a34e --- /dev/null +++ b/resource/sqlupgrade/ST/sql202507010403.sql @@ -0,0 +1,21 @@ +update hrsa_free_income set income_category = 1; +/ + +update hrsa_derate_deduction set income_category = 1; +/ + +update hrsa_endowment_insurance set income_category = 1; +/ + +update hrsa_grant_donation set income_category = 1; +/ + +update hrsa_health_insurance set income_category = 1; +/ + +update hrsa_other_derate_deduction set income_category = 1; +/ + +update hrsa_personal_pension set income_category = 1; +/ + diff --git a/src/com/engine/salary/entity/datacollection/dto/DerateDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/DerateDeductionListDTO.java index c0751492b..dc2ec8f44 100644 --- a/src/com/engine/salary/entity/datacollection/dto/DerateDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/DerateDeductionListDTO.java @@ -82,17 +82,22 @@ public class DerateDeductionListDTO { @TableTitle(title = "证件号码", dataIndex = "idNo", key = "idNo") private String idNo; - @ExcelProperty(index = 6) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + + + @ExcelProperty(index = 7) @TableTitle(title = "减免事项", dataIndex = "derateItem", key = "derateItem") private String derateItem; - @ExcelProperty(index = 7) + @ExcelProperty(index = 8) @TableTitle(title = "减免性质", dataIndex = "derateProperty", key = "derateProperty") @ElogTransform(name = "减免性质") private String derateProperty; - @ExcelProperty(index = 8) + @ExcelProperty(index = 9) @TableTitle(title = "减免金额", dataIndex = "derateAmount", key = "derateAmount") @ElogTransform(name = "减免金额") private String derateAmount; diff --git a/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java b/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java index 4b48e20bc..d56a961ae 100644 --- a/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java @@ -81,28 +81,33 @@ public class EndowmentInsuranceListDTO { @TableTitle(title = "证件号码", dataIndex = "idNo", key = "idNo") private String idNo; - @ExcelProperty(index = 6) + @ExcelProperty(index = 7) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + + @ExcelProperty(index = 8) @TableTitle(title = "申报扣除月份", dataIndex = "deductionMonth", key = "deductionMonth") @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") private Date deductionMonth; - @ExcelProperty(index = 7) + @ExcelProperty(index = 9) @TableTitle(title = "税延养老账户编号", dataIndex = "accountNumber", key = "accountNumber") private String accountNumber; - @ExcelProperty(index = 8) + @ExcelProperty(index = 10) @TableTitle(title = "报税校验码", dataIndex = "checkCode", key = "checkCode") private String checkCode; - @ExcelProperty(index = 9) + @ExcelProperty(index = 11) @TableTitle(title = "年度保费", dataIndex = "yearPremium", key = "yearPremium") private String yearPremium; - @ExcelProperty(index = 10) + @ExcelProperty(index = 12) @TableTitle(title = "月度保费", dataIndex = "monthPremium", key = "monthPremium") private String monthPremium; - @ExcelProperty(index = 11) + @ExcelProperty(index = 13) @TableTitle(title = "本期扣除金额", dataIndex = "currentDeduction", key = "currentDeduction") private String currentDeduction; diff --git a/src/com/engine/salary/entity/datacollection/dto/FreeIncomeListDTO.java b/src/com/engine/salary/entity/datacollection/dto/FreeIncomeListDTO.java index 698dcbde0..d6ae1ada7 100644 --- a/src/com/engine/salary/entity/datacollection/dto/FreeIncomeListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/FreeIncomeListDTO.java @@ -84,14 +84,19 @@ public class FreeIncomeListDTO { @ExcelProperty(index = 6) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + + @ExcelProperty(index = 7) @TableTitle(title = "免税事项", dataIndex = "freeItem", key = "freeItem") private String freeItem; - @ExcelProperty(index = 7) + @ExcelProperty(index = 8) @TableTitle(title = "免税性质", dataIndex = "freeProperty", key = "freeProperty") private String freeProperty; - @ExcelProperty(index = 8) + @ExcelProperty(index = 9) @TableTitle(title = "免税金额", dataIndex = "freeAmount", key = "freeAmount") @Encrypt private String freeAmount; diff --git a/src/com/engine/salary/entity/datacollection/dto/GrantDonationListDTO.java b/src/com/engine/salary/entity/datacollection/dto/GrantDonationListDTO.java index f38aa7181..a6a26aaf1 100644 --- a/src/com/engine/salary/entity/datacollection/dto/GrantDonationListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/GrantDonationListDTO.java @@ -88,33 +88,38 @@ public class GrantDonationListDTO { @ExcelProperty(index = 5) private String idNo; - @ExcelProperty(index = 6) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + + + @ExcelProperty(index = 7) @TableTitle(title = "受赠单位名称", dataIndex = "recipientName", key = "recipientName") private String recipientName; - @ExcelProperty(index = 7) + @ExcelProperty(index = 8) @TableTitle(title = "受赠单位纳税人识别号", dataIndex = "taxCode", key = "taxCode") private String taxCode; - @ExcelProperty(index = 8) + @ExcelProperty(index = 9) @TableTitle(title = "捐赠凭证号", dataIndex = "donationNumber", key = "donationNumber") private String donationNumber; - @ExcelProperty(index = 9) + @ExcelProperty(index = 10) @TableTitle(title = "捐赠日期", dataIndex = "donateDate", key = "donateDate") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date donateDate; - @ExcelProperty(index = 10) + @ExcelProperty(index = 11) @TableTitle(title = "捐赠金额", dataIndex = "donateAmount", key = "donateAmount") private String donateAmount; - @ExcelProperty(index = 11) + @ExcelProperty(index = 12) @TableTitle(title = "扣除比例", dataIndex = "deductionProportion", key = "deductionProportion") private String deductionProportion; - @ExcelProperty(index = 12) + @ExcelProperty(index = 13) @TableTitle(title = "实际扣除金额", dataIndex = "actualDeduction", key = "actualDeduction") private String actualDeduction; diff --git a/src/com/engine/salary/entity/datacollection/dto/HealthInsuranceListDTO.java b/src/com/engine/salary/entity/datacollection/dto/HealthInsuranceListDTO.java index 890682379..6f2393a9e 100644 --- a/src/com/engine/salary/entity/datacollection/dto/HealthInsuranceListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/HealthInsuranceListDTO.java @@ -85,23 +85,28 @@ public class HealthInsuranceListDTO { private String idNo; @ExcelProperty(index = 6) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + + @ExcelProperty(index = 7) @TableTitle(title = "税优识别码", dataIndex = "identificationNumber", key = "identificationNumber") private String identificationNumber; - @ExcelProperty(index = 7) + @ExcelProperty(index = 8) @TableTitle(title = "保单生效日期", dataIndex = "effectiveDate", key = "effectiveDate") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date effectiveDate; - @ExcelProperty(index = 8) + @ExcelProperty(index = 9) @TableTitle(title = "年度保费", dataIndex = "yearPremium", key = "yearPremium") private String yearPremium; - @ExcelProperty(index = 9) + @ExcelProperty(index = 10) @TableTitle(title = "月度保费", dataIndex = "monthPremium", key = "monthPremium") private String monthPremium; - @ExcelProperty(index = 10) + @ExcelProperty(index = 11) @TableTitle(title = "本期扣除金额", dataIndex = "currentDeduction", key = "currentDeduction") private String currentDeduction; diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDerateDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDerateDeductionListDTO.java index d4d292a14..216b5ab7a 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDerateDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDerateDeductionListDTO.java @@ -85,10 +85,15 @@ public class OtherDerateDeductionListDTO { private String idNo; @ExcelProperty(index = 6) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + + @ExcelProperty(index = 7) @TableTitle(title = "减免税额", dataIndex = "otherDeduction", key = "otherDeduction") private String otherDeduction; - @ExcelProperty(index = 7) + @ExcelProperty(index = 8) @TableTitle(title = "备注", dataIndex = "remark", key = "remark") private String remark; diff --git a/src/com/engine/salary/entity/datacollection/dto/PersonalPensionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/PersonalPensionListDTO.java index d4f28e78b..eafeae03e 100644 --- a/src/com/engine/salary/entity/datacollection/dto/PersonalPensionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/PersonalPensionListDTO.java @@ -83,6 +83,11 @@ public class PersonalPensionListDTO { @TableTitle(title = "证件号码", dataIndex = "idNo", key = "idNo") private String idNo; + @ExcelProperty(index = 6) + @TableTitle(title = "所得项目", dataIndex = "incomeCategoryName", key = "incomeCategoryName") + private String incomeCategoryName; + private Integer incomeCategory; + //缴费月度 private Date payMonth; @@ -91,17 +96,17 @@ public class PersonalPensionListDTO { private Integer voucherType; //凭证类别名称 - @ExcelProperty(index = 6) + @ExcelProperty(index = 7) @TableTitle(title = "凭证类型", dataIndex = "voucherTypeName", key = "voucherTypeName") private String voucherTypeName; //凭证编码 - @ExcelProperty(index = 7) + @ExcelProperty(index = 8) @TableTitle(title = "凭证编码", dataIndex = "voucherNo", key = "voucherNo") private String voucherNo; //缴费金额 - @ExcelProperty(index = 8) + @ExcelProperty(index = 9) @TableTitle(title = "缴费金额", dataIndex = "payAmount", key = "payAmount") private String payAmount; diff --git a/src/com/engine/salary/entity/datacollection/param/DerateDeductionSaveParam.java b/src/com/engine/salary/entity/datacollection/param/DerateDeductionSaveParam.java index cd70723d3..196da93c3 100644 --- a/src/com/engine/salary/entity/datacollection/param/DerateDeductionSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/DerateDeductionSaveParam.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.param; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,6 +27,12 @@ public class DerateDeductionSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + //减免事项 private String derateItem; diff --git a/src/com/engine/salary/entity/datacollection/param/EndowmentInsuranceSaveParam.java b/src/com/engine/salary/entity/datacollection/param/EndowmentInsuranceSaveParam.java index f86c8603b..044e92295 100644 --- a/src/com/engine/salary/entity/datacollection/param/EndowmentInsuranceSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/EndowmentInsuranceSaveParam.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.param; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; @@ -30,6 +31,12 @@ public class EndowmentInsuranceSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + //申报扣除月份 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") diff --git a/src/com/engine/salary/entity/datacollection/param/FreeIncomeSaveParam.java b/src/com/engine/salary/entity/datacollection/param/FreeIncomeSaveParam.java index 216f2e3a5..213a3391d 100644 --- a/src/com/engine/salary/entity/datacollection/param/FreeIncomeSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/FreeIncomeSaveParam.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.param; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,6 +27,11 @@ public class FreeIncomeSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; //免税事项 private String freeItem; diff --git a/src/com/engine/salary/entity/datacollection/param/GrantDonationSaveParam.java b/src/com/engine/salary/entity/datacollection/param/GrantDonationSaveParam.java index ec98e212b..47ef897ca 100644 --- a/src/com/engine/salary/entity/datacollection/param/GrantDonationSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/GrantDonationSaveParam.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.param; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,6 +27,12 @@ public class GrantDonationSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + //受赠单位名称 private String recipientName; diff --git a/src/com/engine/salary/entity/datacollection/param/HealthInsuranceSaveParam.java b/src/com/engine/salary/entity/datacollection/param/HealthInsuranceSaveParam.java index 13c8a9030..971fc5ccb 100644 --- a/src/com/engine/salary/entity/datacollection/param/HealthInsuranceSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/HealthInsuranceSaveParam.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.param; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,6 +29,12 @@ public class HealthInsuranceSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + //税优识别码 private String identificationNumber; diff --git a/src/com/engine/salary/entity/datacollection/param/OtherDerateDeductionSaveParam.java b/src/com/engine/salary/entity/datacollection/param/OtherDerateDeductionSaveParam.java index ab4114d6e..8aa1c17d9 100644 --- a/src/com/engine/salary/entity/datacollection/param/OtherDerateDeductionSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/OtherDerateDeductionSaveParam.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.param; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,6 +27,12 @@ public class OtherDerateDeductionSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + //减免税额 private String otherDeduction; diff --git a/src/com/engine/salary/entity/datacollection/param/PersonalPensionSaveParam.java b/src/com/engine/salary/entity/datacollection/param/PersonalPensionSaveParam.java index ecd0f92c5..ad7ceea3f 100644 --- a/src/com/engine/salary/entity/datacollection/param/PersonalPensionSaveParam.java +++ b/src/com/engine/salary/entity/datacollection/param/PersonalPensionSaveParam.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.param; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.datacollection.EnumDeductionDataSource; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -31,6 +32,12 @@ public class PersonalPensionSaveParam { //主表数据Id private Long mainId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + //缴费月度 private Date payMonth; diff --git a/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java index 5d94d3627..226f05848 100644 --- a/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -42,6 +43,12 @@ public class DerateDeductionPO{ @ElogTransform(name = "个税扣缴义务人") private Long taxAgentId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + @ElogTransform(name = "减免事项") private String derateItem; diff --git a/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java b/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java index 9bb444ebe..6718ee753 100644 --- a/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java +++ b/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -41,6 +42,12 @@ public class EndowmentInsurancePO { @ElogTransform(name = "个税扣缴义务人ID") private Long taxAgentId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + @ElogTransform(name = "申报扣除月份") private Date deductionMonth; diff --git a/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java b/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java index 085b7f751..96c39dfc6 100644 --- a/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java +++ b/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -52,6 +53,12 @@ public class FreeIncomePO { @ElogTransform(name = "归档状态 0未归档 1已归档") private Integer fileStatus; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + /** * 人员类型 * diff --git a/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java b/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java index f65f73caa..6cce0fb66 100644 --- a/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java +++ b/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -38,6 +39,12 @@ public class GrantDonationPO { @ElogTransform(name = "个税扣缴义务人") private Long taxAgentId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + @ElogTransform(name = "受赠单位名称") private String recipientName; diff --git a/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java b/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java index 86152ffef..7ecad5ab7 100644 --- a/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java +++ b/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -40,6 +41,12 @@ public class HealthInsurancePO { @ElogTransform(name = "个税扣缴义务人") private Long taxAgentId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + @ElogTransform(name = "税优识别码") private String identificationNumber; diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java index 74f403bab..c0ff75f42 100644 --- a/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -40,6 +41,12 @@ public class OtherDerateDeductionPO { @ElogTransform(name = "个税扣缴义务人") private Long taxAgentId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + @ElogTransform(name = "减免税额") private String otherDeduction; diff --git a/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java b/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java index 766ad4783..b60bda6fd 100644 --- a/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java @@ -3,6 +3,7 @@ package com.engine.salary.entity.datacollection.po; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.datacollection.EnumDeductionDataSource; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -45,6 +46,12 @@ public class PersonalPensionPO{ @ElogTransform(name = "个税扣缴义务人") private Long taxAgentId; + /** + * 所得项目 + * @see IncomeCategoryEnum + */ + private Integer incomeCategory; + @ElogTransform(name = "凭证类别") private Integer voucherType; diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java index 1dbb8de4b..b9f2a3544 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java @@ -322,9 +322,9 @@ public class TaxDeclarationRequest { public static Map convert2flsdRequestParam(List taxReportColumns, - List taxDeclarations, - List taxDeclarationValues, - List employeeDeclares) { + List taxDeclarations, + List taxDeclarationValues, + List employeeDeclares) { Map> objRequestParam = Maps.newHashMap(); Map>> listRequestParam = Maps.newHashMap(); Map> taxReportColumnMap = SalaryEntityUtil.group2Map(taxReportColumns, TaxReportColumnPO::getIncomeCategory); @@ -351,6 +351,21 @@ public class TaxDeclarationRequest { employeeRequestParams.add(employeeRequestParam); } } + List> paramMaps = new ArrayList<>(); + Map map = new HashMap<>(); + // 姓名 + map.put("xm", "测试孔霖"); + // 证件类型 + map.put("zzlx", CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()); + // 证件号码 + map.put("zzhm", "828888194106301018"); + // 所得项目 + map.put("sdxm", "上市公司股息红利所得（沪市、深市、创业板）"); + map.put("jmsx", "上市公司股息红利差别化征税"); + map.put("jmxz", "其他"); + map.put("sjkcje", "1000"); + paramMaps.add(map); + listRequestParam.put("msfblb", paramMaps); } Map requestParam = Maps.newHashMap(); diff --git a/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml b/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml index 87ed57c0c..6f1f5b3f6 100644 --- a/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml @@ -17,6 +17,7 @@ + @@ -38,6 +39,7 @@ , t.tax_year_month , t.tenant_key , t.update_time + , t.income_category @@ -108,6 +110,9 @@ AND update_time = #{updateTime} + + AND income_category = #{incomeCategory} + AND id IN @@ -168,6 +173,9 @@ update_time, + + income_category, + @@ -215,6 +223,9 @@ #{updateTime}, + + #{incomeCategory}, + @@ -237,6 +248,7 @@ tax_year_month=#{taxYearMonth}, tenant_key=#{tenantKey}, update_time=#{updateTime}, + income_category=#{incomeCategory}, WHERE id = #{id} AND delete_type = 0 @@ -288,6 +300,9 @@ update_time=#{updateTime}, + + income_category=#{incomeCategory}, + WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index b2d7cc2d0..ef78ab4c2 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -22,6 +22,7 @@ import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.datacollection.TaxFreeTypeEnum; +import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.*; @@ -2446,6 +2447,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction dto.setMobile(employee.getMobile()); dto.setJobNum(employee.getWorkcode()); dto.setIdNo(employee.getIdNo()); + dto.setIncomeCategoryName(IncomeCategoryEnum.parseByValue(po.getIncomeCategory()).getDefaultLabel()); return dto; }).collect(Collectors.toList()); return listDTOS; @@ -2734,6 +2736,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .freeItem(param.getFreeItem()) .freeProperty(param.getFreeProperty()) .freeAmount(param.getFreeAmount()) @@ -2753,6 +2756,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setFreeItem(param.getFreeItem()); po.setFreeProperty(param.getFreeProperty()); po.setFreeAmount(param.getFreeAmount()); @@ -2781,6 +2785,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .deductionMonth(param.getDeductionMonth()) .accountNumber(param.getAccountNumber()) .checkCode(param.getCheckCode()) @@ -2803,6 +2808,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setDeductionMonth(param.getDeductionMonth()); po.setAccountNumber(param.getAccountNumber()); po.setCheckCode(param.getCheckCode()); @@ -2834,6 +2840,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .recipientName(param.getRecipientName()) .taxCode(param.getTaxCode()) .donationNumber(param.getDonationNumber()) @@ -2857,6 +2864,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setRecipientName(param.getRecipientName()); po.setTaxCode(param.getTaxCode()); po.setDonationNumber(param.getDonationNumber()); @@ -2889,6 +2897,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .identificationNumber(param.getIdentificationNumber()) .effectiveDate(param.getEffectiveDate()) .yearPremium(param.getYearPremium()) @@ -2910,6 +2919,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setIdentificationNumber(param.getIdentificationNumber()); po.setEffectiveDate(param.getEffectiveDate()); po.setYearPremium(param.getYearPremium()); @@ -2940,6 +2950,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .otherDeduction(param.getOtherDeduction()) .remark(param.getRemark()) .fileStatus(1) @@ -2958,6 +2969,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setOtherDeduction(param.getOtherDeduction()); po.setRemark(param.getRemark()); @@ -2985,6 +2997,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .derateAmount(param.getDerateAmount()) .derateItem(param.getDerateItem()) .derateProperty(param.getDerateProperty()) @@ -3004,6 +3017,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setDerateAmount(param.getDerateAmount()); po.setDerateItem(param.getDerateItem()); po.setDerateProperty(param.getDerateProperty()); @@ -3032,6 +3046,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .taxYearMonth(deductionPO.getDeclareMonth()) .employeeId(deductionPO.getEmployeeId()) .taxAgentId(deductionPO.getTaxAgentId()) + .incomeCategory(param.getIncomeCategory()) .voucherTypeName(param.getVoucherTypeName()) .voucherNo(param.getVoucherNo()) .payAmount(param.getPayAmount()) @@ -3051,6 +3066,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } po.setUpdateTime(now); + po.setIncomeCategory(param.getIncomeCategory()); po.setVoucherTypeName(param.getVoucherTypeName()); po.setVoucherNo(param.getVoucherNo()); po.setPayAmount(param.getPayAmount());