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

免税收入

This commit is contained in:
钱涛 2025-07-01 18:37:50 +08:00
parent f5b1768438
commit cb02136ff6
40 changed files with 497 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resource/sqlupgrade/DM/sql202507010303.sql Normal file
View File

@ -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;
/

21
resource/sqlupgrade/DM/sql202507010403.sql Normal file
View File

@ -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;
/

21
resource/sqlupgrade/GS/sql202507010303.sql Normal file
View File

@ -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;
/

21
resource/sqlupgrade/GS/sql202507010403.sql Normal file
View File

@ -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;
/

21
resource/sqlupgrade/JC/sql202507010303.sql Normal file
View File

@ -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;
/

21
resource/sqlupgrade/JC/sql202507010403.sql Normal file
View File

@ -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;
/

7
resource/sqlupgrade/Mysql/sql202507010303.sql Normal file
View File

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

7
resource/sqlupgrade/Mysql/sql202507010403.sql Normal file
View File

@ -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;

20
resource/sqlupgrade/Oracle/sql202507010303.sql Normal file
View File

@ -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
/

14
resource/sqlupgrade/Oracle/sql202507010403.sql Normal file
View File

@ -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
/

20
resource/sqlupgrade/PG/sql202507010303.sql Normal file
View File

@ -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;
/

20
resource/sqlupgrade/PG/sql202507010403.sql Normal file
View File

@ -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;
/

20
resource/sqlupgrade/SQLServer/sql202507010303.sql Normal file
View File

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

14
resource/sqlupgrade/SQLServer/sql202507010403.sql Normal file
View File

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

21
resource/sqlupgrade/ST/sql202507010303.sql Normal file
View File

@ -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;
/

21
resource/sqlupgrade/ST/sql202507010403.sql Normal file
View File

@ -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;
/

11
src/com/engine/salary/entity/datacollection/dto/DerateDeductionListDTO.java
View File

@ -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;

17
src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java
View File

@ -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;

9
src/com/engine/salary/entity/datacollection/dto/FreeIncomeListDTO.java
View File

@ -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;

19
src/com/engine/salary/entity/datacollection/dto/GrantDonationListDTO.java
View File

@ -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;

13
src/com/engine/salary/entity/datacollection/dto/HealthInsuranceListDTO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/dto/OtherDerateDeductionListDTO.java
View File

@ -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;

11
src/com/engine/salary/entity/datacollection/dto/PersonalPensionListDTO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/param/DerateDeductionSaveParam.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/param/EndowmentInsuranceSaveParam.java
View File

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

6
src/com/engine/salary/entity/datacollection/param/FreeIncomeSaveParam.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/param/GrantDonationSaveParam.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/param/HealthInsuranceSaveParam.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/param/OtherDerateDeductionSaveParam.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/param/PersonalPensionSaveParam.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java
View File

@ -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;
/**
* 人员类型
*

7
src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java
View File

@ -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;

7
src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java
View File

@ -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;

21
src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java
View File

@ -322,9 +322,9 @@ public class TaxDeclarationRequest {
public static Map<String, Object> convert2flsdRequestParam(List<TaxReportColumnPO> taxReportColumns,
List<TaxDeclarationPO> taxDeclarations,
List<TaxDeclarationValuePO> taxDeclarationValues,
List<EmployeeDeclarePO> employeeDeclares) {
List<TaxDeclarationPO> taxDeclarations,
List<TaxDeclarationValuePO> taxDeclarationValues,
List<EmployeeDeclarePO> employeeDeclares) {
Map<String, Map<String, Object>> objRequestParam = Maps.newHashMap();
Map<String, List<Map<String, Object>>> listRequestParam = Maps.newHashMap();
Map<String, List<TaxReportColumnPO>> taxReportColumnMap = SalaryEntityUtil.group2Map(taxReportColumns, TaxReportColumnPO::getIncomeCategory);
@ -351,6 +351,21 @@ public class TaxDeclarationRequest {
employeeRequestParams.add(employeeRequestParam);
}
}
List<Map<String, Object>> paramMaps = new ArrayList<>();
Map<String, Object> 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<String, Object> requestParam = Maps.newHashMap();

15
src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml
View File

@ -17,6 +17,7 @@
<result column="tax_year_month" property="taxYearMonth"/>
<result column="tenant_key" property="tenantKey"/>
<result column="update_time" property="updateTime"/>
<result column="income_category" property="incomeCategory"/>
</resultMap>
<!-- 表字段 -->
@ -38,6 +39,7 @@
, t.tax_year_month
, t.tenant_key
, t.update_time
, t.income_category
</sql>
<!-- 查询全部 -->
@ -108,6 +110,9 @@
<if test="updateTime != null">
AND update_time = #{updateTime}
</if>
<if test="incomeCategory != null">
AND income_category = #{incomeCategory}
</if>
<if test="ids != null and ids.size()>0">
AND id IN
<foreach collection="ids" open="(" item="id" separator="," close=")">
@ -168,6 +173,9 @@
<if test="updateTime != null">
update_time,
</if>
<if test="incomeCategory != null">
income_category,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="createTime != null">
@ -215,6 +223,9 @@
<if test="updateTime != null">
#{updateTime},
</if>
<if test="incomeCategory != null">
#{incomeCategory},
</if>
</trim>
</insert>
@ -237,6 +248,7 @@
tax_year_month=#{taxYearMonth},
tenant_key=#{tenantKey},
update_time=#{updateTime},
income_category=#{incomeCategory},
</set>
WHERE id = #{id} AND delete_type = 0
</update>
@ -288,6 +300,9 @@
<if test="updateTime != null">
update_time=#{updateTime},
</if>
<if test="incomeCategory != null">
income_category=#{incomeCategory},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>

16
src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
View File

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