From 8c83e8ed6cf92a71e123f7ca0572a4005a5d4a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 16 Dec 2024 17:48:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=8D=E7=A8=8E=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E3=80=81=E5=95=86=E4=B8=9A=E5=81=A5=E5=BA=B7=E4=BF=9D?= =?UTF-8?q?=E9=99=A9=E3=80=81=E7=A8=8E=E5=BB=B6=E5=85=BB=E8=80=81=E4=BF=9D?= =?UTF-8?q?=E9=99=A9=E3=80=81=E5=87=86=E4=BA=88=E6=89=A3=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E6=8D=90=E8=B5=A0=E9=A2=9D=E3=80=81=E5=87=8F=E5=85=8D=E7=A8=8E?= =?UTF-8?q?=E9=A2=9D=E3=80=81=E5=85=B6=E4=BB=96=E9=99=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202412160303.sql | 122 +++++ resource/sqlupgrade/DM/sql202412160403.sql | 18 + resource/sqlupgrade/GS/sql202412160303.sql | 122 +++++ resource/sqlupgrade/GS/sql202412160403.sql | 18 + resource/sqlupgrade/JC/sql202412160303.sql | 122 +++++ resource/sqlupgrade/JC/sql202412160403.sql | 18 + resource/sqlupgrade/Mysql/sql202412160303.sql | 132 ++++++ resource/sqlupgrade/Mysql/sql202412160403.sql | 12 + .../sqlupgrade/Oracle/sql202412160303.sql | 127 ++++++ .../sqlupgrade/Oracle/sql202412160403.sql | 12 + resource/sqlupgrade/PG/sql202412160303.sql | 125 ++++++ resource/sqlupgrade/PG/sql202412160403.sql | 12 + .../sqlupgrade/SQLServer/sql202412160303.sql | 126 ++++++ .../sqlupgrade/SQLServer/sql202412160403.sql | 12 + resource/sqlupgrade/ST/sql202412160303.sql | 122 +++++ resource/sqlupgrade/ST/sql202412160403.sql | 18 + .../dto/OtherDeductionRecordDTO.java | 1 + .../datacollection/po/DerateDeductionPO.java | 77 ++++ .../po/EndowmentInsurancePO.java | 86 ++++ .../datacollection/po/FreeIncomePO.java | 75 ++++ .../datacollection/po/GrantDonationPO.java | 87 ++++ .../datacollection/po/HealthInsurancePO.java | 81 ++++ .../datacollection/po/OtherDeductionPO.java | 17 + .../po/OtherDerateDeductionPO.java | 74 ++++ .../datacollection/po/PersonalPensionPO.java | 92 ++++ .../bo/TaxDeclarationRequest.java | 2 + .../EnumDeductionDataSource.java | 70 +++ .../EndowmentInsuranceMapper.java | 73 +++ .../EndowmentInsuranceMapper.xml | 360 +++++++++++++++ .../datacollection/FreeIncomeMapper.java | 72 +++ .../datacollection/FreeIncomeMapper.xml | 315 +++++++++++++ .../datacollection/GrantDonationMapper.java | 73 +++ .../datacollection/GrantDonationMapper.xml | 375 ++++++++++++++++ .../datacollection/HealthInsuranceMapper.java | 73 +++ .../datacollection/HealthInsuranceMapper.xml | 345 +++++++++++++++ .../OtherDerateDeductionMapper.java | 79 ++++ .../OtherDerateDeductionMapper.xml | 417 ++++++++++++++++++ 37 files changed, 3962 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202412160303.sql create mode 100644 resource/sqlupgrade/DM/sql202412160403.sql create mode 100644 resource/sqlupgrade/GS/sql202412160303.sql create mode 100644 resource/sqlupgrade/GS/sql202412160403.sql create mode 100644 resource/sqlupgrade/JC/sql202412160303.sql create mode 100644 resource/sqlupgrade/JC/sql202412160403.sql create mode 100644 resource/sqlupgrade/Mysql/sql202412160303.sql create mode 100644 resource/sqlupgrade/Mysql/sql202412160403.sql create mode 100644 resource/sqlupgrade/Oracle/sql202412160303.sql create mode 100644 resource/sqlupgrade/Oracle/sql202412160403.sql create mode 100644 resource/sqlupgrade/PG/sql202412160303.sql create mode 100644 resource/sqlupgrade/PG/sql202412160403.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202412160303.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202412160403.sql create mode 100644 resource/sqlupgrade/ST/sql202412160303.sql create mode 100644 resource/sqlupgrade/ST/sql202412160403.sql create mode 100644 src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java create mode 100644 src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java create mode 100644 src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java create mode 100644 src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java create mode 100644 src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java create mode 100644 src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java create mode 100644 src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java create mode 100644 src/com/engine/salary/enums/datacollection/EnumDeductionDataSource.java create mode 100644 src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.java create mode 100644 src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml create mode 100644 src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.java create mode 100644 src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml create mode 100644 src/com/engine/salary/mapper/datacollection/GrantDonationMapper.java create mode 100644 src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml create mode 100644 src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.java create mode 100644 src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml create mode 100644 src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.java create mode 100644 src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml diff --git a/resource/sqlupgrade/DM/sql202412160303.sql b/resource/sqlupgrade/DM/sql202412160303.sql new file mode 100644 index 000000000..76dc4c94e --- /dev/null +++ b/resource/sqlupgrade/DM/sql202412160303.sql @@ -0,0 +1,122 @@ +create table hrsa_other_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + other_deduction varchar2(50), + remark varchar2(255) +); +/ + +create table hrsa_health_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + identification_number varchar2(255), + effective_date date, + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50) +); +/ + +create table hrsa_grant_donation +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + recipient_name varchar2(255), + tax_code varchar2(255), + donation_number varchar2(255), + donate_date date, + donate_amount varchar2(50), + deduction_proportion varchar2(10), + actual_deduction varchar2(50) +); +/ + +create table hrsa_endowment_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + account_number varchar2(255), + check_code varchar2(255), + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50), + deduction_month date +); +/ + +create table hrsa_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + derate_item varchar2(255), + derate_property varchar2(255), + derate_amount varchar2(255) +); +/ + +create table hrsa_free_income +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + free_item varchar2(255), + free_property varchar2(255), + free_amount varchar2(255) +); +/ + diff --git a/resource/sqlupgrade/DM/sql202412160403.sql b/resource/sqlupgrade/DM/sql202412160403.sql new file mode 100644 index 000000000..07a4c3c3b --- /dev/null +++ b/resource/sqlupgrade/DM/sql202412160403.sql @@ -0,0 +1,18 @@ +alter table hrsa_derate_deduction add employee_type int; +/ + +alter table hrsa_endowment_insurance add employee_type int; +/ + +alter table hrsa_free_income add employee_type int; +/ + +alter table hrsa_grant_donation add employee_type int; +/ + +alter table hrsa_health_insurance add employee_type int; +/ + +alter table hrsa_other_derate_deduction add employee_type int; +/ + diff --git a/resource/sqlupgrade/GS/sql202412160303.sql b/resource/sqlupgrade/GS/sql202412160303.sql new file mode 100644 index 000000000..76dc4c94e --- /dev/null +++ b/resource/sqlupgrade/GS/sql202412160303.sql @@ -0,0 +1,122 @@ +create table hrsa_other_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + other_deduction varchar2(50), + remark varchar2(255) +); +/ + +create table hrsa_health_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + identification_number varchar2(255), + effective_date date, + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50) +); +/ + +create table hrsa_grant_donation +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + recipient_name varchar2(255), + tax_code varchar2(255), + donation_number varchar2(255), + donate_date date, + donate_amount varchar2(50), + deduction_proportion varchar2(10), + actual_deduction varchar2(50) +); +/ + +create table hrsa_endowment_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + account_number varchar2(255), + check_code varchar2(255), + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50), + deduction_month date +); +/ + +create table hrsa_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + derate_item varchar2(255), + derate_property varchar2(255), + derate_amount varchar2(255) +); +/ + +create table hrsa_free_income +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + free_item varchar2(255), + free_property varchar2(255), + free_amount varchar2(255) +); +/ + diff --git a/resource/sqlupgrade/GS/sql202412160403.sql b/resource/sqlupgrade/GS/sql202412160403.sql new file mode 100644 index 000000000..07a4c3c3b --- /dev/null +++ b/resource/sqlupgrade/GS/sql202412160403.sql @@ -0,0 +1,18 @@ +alter table hrsa_derate_deduction add employee_type int; +/ + +alter table hrsa_endowment_insurance add employee_type int; +/ + +alter table hrsa_free_income add employee_type int; +/ + +alter table hrsa_grant_donation add employee_type int; +/ + +alter table hrsa_health_insurance add employee_type int; +/ + +alter table hrsa_other_derate_deduction add employee_type int; +/ + diff --git a/resource/sqlupgrade/JC/sql202412160303.sql b/resource/sqlupgrade/JC/sql202412160303.sql new file mode 100644 index 000000000..76dc4c94e --- /dev/null +++ b/resource/sqlupgrade/JC/sql202412160303.sql @@ -0,0 +1,122 @@ +create table hrsa_other_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + other_deduction varchar2(50), + remark varchar2(255) +); +/ + +create table hrsa_health_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + identification_number varchar2(255), + effective_date date, + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50) +); +/ + +create table hrsa_grant_donation +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + recipient_name varchar2(255), + tax_code varchar2(255), + donation_number varchar2(255), + donate_date date, + donate_amount varchar2(50), + deduction_proportion varchar2(10), + actual_deduction varchar2(50) +); +/ + +create table hrsa_endowment_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + account_number varchar2(255), + check_code varchar2(255), + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50), + deduction_month date +); +/ + +create table hrsa_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + derate_item varchar2(255), + derate_property varchar2(255), + derate_amount varchar2(255) +); +/ + +create table hrsa_free_income +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + free_item varchar2(255), + free_property varchar2(255), + free_amount varchar2(255) +); +/ + diff --git a/resource/sqlupgrade/JC/sql202412160403.sql b/resource/sqlupgrade/JC/sql202412160403.sql new file mode 100644 index 000000000..07a4c3c3b --- /dev/null +++ b/resource/sqlupgrade/JC/sql202412160403.sql @@ -0,0 +1,18 @@ +alter table hrsa_derate_deduction add employee_type int; +/ + +alter table hrsa_endowment_insurance add employee_type int; +/ + +alter table hrsa_free_income add employee_type int; +/ + +alter table hrsa_grant_donation add employee_type int; +/ + +alter table hrsa_health_insurance add employee_type int; +/ + +alter table hrsa_other_derate_deduction add employee_type int; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202412160303.sql b/resource/sqlupgrade/Mysql/sql202412160303.sql new file mode 100644 index 000000000..c10d7fee8 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202412160303.sql @@ -0,0 +1,132 @@ +create table hrsa_other_derate_deduction +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + main_id bigint comment '主表数据id' , + tax_year_month date comment '税款所属期' , + employee_id bigint comment '人员id' , + tax_agent_id bigint comment '个税扣缴义务人id' , + file_status int comment '归档状态 0未归档 1已归档' , + other_deduction varchar(50) comment '其他减免税额' , + remark varchar(255) comment '备注' +) +; + + +create table hrsa_health_insurance +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + main_id bigint comment '主表数据id' , + tax_year_month date comment '税款所属期' , + employee_id bigint comment '人员id' , + tax_agent_id bigint comment '个税扣缴义务人id' , + file_status int comment '归档状态 0未归档 1已归档' , + identification_number varchar(255) comment '税优识别码' , + effective_date date comment '保单生效日期' , + year_premium varchar(50) comment '年度保费' , + month_premium varchar(50) comment '月度保费' , + current_deduction varchar(50) comment '本期扣除金额' +) +; + + +create table hrsa_grant_donation +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + main_id bigint comment '主表数据id' , + tax_year_month date comment '税款所属期' , + employee_id bigint comment '人员id' , + tax_agent_id bigint comment '个税扣缴义务人id' , + file_status int comment '归档状态 0未归档 1已归档' , + recipient_name varchar(255) comment '受赠单位名称' , + tax_code varchar(255) comment '受赠单位纳税人识别号' , + donation_number varchar(255) comment '捐赠凭证号' , + donate_date date comment '捐赠日期' , + donate_amount varchar(50) comment '捐赠金额' , + deduction_proportion varchar(10) comment '扣除比例' , + actual_deduction varchar(50) comment '实际扣除金额' +) +; + + + +create table hrsa_endowment_insurance +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + main_id bigint comment '主表数据id' , + tax_year_month date comment '税款所属期' , + employee_id bigint comment '人员id' , + tax_agent_id bigint comment '个税扣缴义务人id' , + file_status int comment '归档状态 0未归档 1已归档' , + account_number varchar(255) comment '税延养老账户编号' , + check_code varchar(255) comment '报税校验码' , + year_premium varchar(50) comment '年度保费' , + month_premium varchar(50) comment '月度保费' , + current_deduction varchar(50) comment '本期扣除金额' , + deduction_month date comment '申请扣除月份' +) +; + + +create table hrsa_derate_deduction +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + main_id bigint comment '主表数据id' , + tax_year_month date comment '税款所属期' , + employee_id bigint comment '人员id' , + tax_agent_id bigint comment '个税扣缴义务人id' , + file_status int comment '归档状态 0未归档 1已归档' , + derate_item varchar(255) comment '减免事项' , + derate_property varchar(255) comment '减免性质' , + derate_amount varchar(255) comment '减免税额' +) +; + + + +create table hrsa_free_income +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + main_id bigint comment '主表数据id' , + tax_year_month date comment '税款所属期' , + employee_id bigint comment '人员id' , + tax_agent_id bigint comment '个税扣缴义务人id' , + file_status int comment '归档状态 0未归档 1已归档' , + free_item varchar(255) comment '免税事项' , + free_property varchar(255) comment '免税性质' , + free_amount varchar(255) comment '免税金额' +) +; + + + + diff --git a/resource/sqlupgrade/Mysql/sql202412160403.sql b/resource/sqlupgrade/Mysql/sql202412160403.sql new file mode 100644 index 000000000..601430556 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202412160403.sql @@ -0,0 +1,12 @@ +alter table hrsa_derate_deduction add employee_type int +; +alter table hrsa_endowment_insurance add employee_type int +; +alter table hrsa_free_income add employee_type int +; +alter table hrsa_grant_donation add employee_type int +; +alter table hrsa_health_insurance add employee_type int +; +alter table hrsa_other_derate_deduction add employee_type int +; diff --git a/resource/sqlupgrade/Oracle/sql202412160303.sql b/resource/sqlupgrade/Oracle/sql202412160303.sql new file mode 100644 index 000000000..e5f509f83 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202412160303.sql @@ -0,0 +1,127 @@ +create table hrsa_other_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + other_deduction varchar2(50), + remark varchar2(255) +) +/ + + +create table hrsa_health_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + identification_number varchar2(255), + effective_date date, + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50) +) +/ + + + +create table hrsa_grant_donation +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + recipient_name varchar2(255), + tax_code varchar2(255), + donation_number varchar2(255), + donate_date date, + donate_amount varchar2(50), + deduction_proportion varchar2(10), + actual_deduction varchar2(50) +) +/ + + +create table hrsa_endowment_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + account_number varchar2(255), + check_code varchar2(255), + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50), + deduction_month date +) +/ + + +create table hrsa_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + derate_item varchar2(255), + derate_property varchar2(255), + derate_amount varchar2(255) +) +/ + + +create table hrsa_free_income +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + free_item varchar2(255), + free_property varchar2(255), + free_amount varchar2(255) +) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202412160403.sql b/resource/sqlupgrade/Oracle/sql202412160403.sql new file mode 100644 index 000000000..b17420382 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202412160403.sql @@ -0,0 +1,12 @@ +alter table hrsa_derate_deduction add employee_type int +/ +alter table hrsa_endowment_insurance add employee_type int +/ +alter table hrsa_free_income add employee_type int +/ +alter table hrsa_grant_donation add employee_type int +/ +alter table hrsa_health_insurance add employee_type int +/ +alter table hrsa_other_derate_deduction add employee_type int +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202412160303.sql b/resource/sqlupgrade/PG/sql202412160303.sql new file mode 100644 index 000000000..214e842a1 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202412160303.sql @@ -0,0 +1,125 @@ +create table hrsa_other_derate_deduction +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + main_id bigint, + tax_year_month date, + employee_id bigint, + tax_agent_id bigint, + file_status int, + other_deduction varchar(50), + remark varchar(255) +); +/ + +create table hrsa_health_insurance +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + main_id bigint, + tax_year_month date, + employee_id bigint, + tax_agent_id bigint, + file_status int, + identification_number varchar(255), + effective_date date, + year_premium varchar(50), + month_premium varchar(50), + current_deduction varchar(50) +); +/ + + +create table hrsa_grant_donation +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + main_id bigint, + tax_year_month date, + employee_id bigint, + tax_agent_id bigint, + file_status int, + recipient_name varchar(255), + tax_code varchar(255), + donation_number varchar(255), + donate_date date, + donate_amount varchar(50), + deduction_proportion varchar(10), + actual_deduction varchar(50) +); +/ + + +create table hrsa_endowment_insurance +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + main_id bigint, + tax_year_month date, + employee_id bigint, + tax_agent_id bigint, + file_status int, + account_number varchar(255), + check_code varchar(255), + year_premium varchar(50), + month_premium varchar(50), + current_deduction varchar(50), + deduction_month date +); +/ + + +create table hrsa_derate_deduction +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + main_id bigint, + tax_year_month date, + employee_id bigint, + tax_agent_id bigint, + file_status int, + derate_item varchar(255), + derate_property varchar(255), + derate_amount varchar(255) +); +/ + + +create table hrsa_free_income +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + main_id bigint, + tax_year_month date, + employee_id bigint, + tax_agent_id bigint, + file_status int, + free_item varchar(255), + free_property varchar(255), + free_amount varchar(255) +); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202412160403.sql b/resource/sqlupgrade/PG/sql202412160403.sql new file mode 100644 index 000000000..89d123c70 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202412160403.sql @@ -0,0 +1,12 @@ +alter table hrsa_derate_deduction add employee_type int; +/ +alter table hrsa_endowment_insurance add employee_type int; +/ +alter table hrsa_free_income add employee_type int; +/ +alter table hrsa_grant_donation add employee_type int; +/ +alter table hrsa_health_insurance add employee_type int; +/ +alter table hrsa_other_derate_deduction add employee_type int; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202412160303.sql b/resource/sqlupgrade/SQLServer/sql202412160303.sql new file mode 100644 index 000000000..de7f1091f --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202412160303.sql @@ -0,0 +1,126 @@ +create table hrsa_other_derate_deduction +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + main_id bigint, + tax_year_month datetime, + employee_id bigint, + tax_agent_id bigint, + file_status int, + other_deduction nvarchar(50), + remark nvarchar(255) +) +GO + + +create table hrsa_health_insurance +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + main_id bigint, + tax_year_month datetime, + employee_id bigint, + tax_agent_id bigint, + file_status int, + identification_number nvarchar(255), + effective_date datetime, + year_premium nvarchar(50), + month_premium nvarchar(50), + current_deduction nvarchar(50) +) +GO + + +create table hrsa_grant_donation +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + main_id bigint, + tax_year_month datetime, + employee_id bigint, + tax_agent_id bigint, + file_status int, + recipient_name nvarchar(255), + tax_code nvarchar(255), + donation_number nvarchar(255), + donate_date datetime, + donate_amount nvarchar(50), + deduction_proportion nvarchar(10), + actual_deduction nvarchar(50) +) +GO + + +create table hrsa_endowment_insurance +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + main_id bigint, + tax_year_month datetime, + employee_id bigint, + tax_agent_id bigint, + file_status int, + account_number nvarchar(255), + check_code nvarchar(255), + year_premium nvarchar(50), + month_premium nvarchar(50), + current_deduction nvarchar(50), + deduction_month datetime +) +GO + + +create table hrsa_derate_deduction +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + main_id bigint, + tax_year_month datetime, + employee_id bigint, + tax_agent_id bigint, + file_status int, + derate_item nvarchar(255), + derate_property nvarchar(255), + derate_amount nvarchar(255) +) +GO + + +create table hrsa_free_income +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + main_id bigint, + tax_year_month datetime, + employee_id bigint, + tax_agent_id bigint, + file_status int, + free_item nvarchar(255), + free_property nvarchar(255), + free_amount nvarchar(255) +) +GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202412160403.sql b/resource/sqlupgrade/SQLServer/sql202412160403.sql new file mode 100644 index 000000000..1ebced6cb --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202412160403.sql @@ -0,0 +1,12 @@ +alter table hrsa_derate_deduction add employee_type int +GO +alter table hrsa_endowment_insurance add employee_type int +GO +alter table hrsa_free_income add employee_type int +GO +alter table hrsa_grant_donation add employee_type int +GO +alter table hrsa_health_insurance add employee_type int +GO +alter table hrsa_other_derate_deduction add employee_type int +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202412160303.sql b/resource/sqlupgrade/ST/sql202412160303.sql new file mode 100644 index 000000000..76dc4c94e --- /dev/null +++ b/resource/sqlupgrade/ST/sql202412160303.sql @@ -0,0 +1,122 @@ +create table hrsa_other_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + other_deduction varchar2(50), + remark varchar2(255) +); +/ + +create table hrsa_health_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + identification_number varchar2(255), + effective_date date, + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50) +); +/ + +create table hrsa_grant_donation +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + recipient_name varchar2(255), + tax_code varchar2(255), + donation_number varchar2(255), + donate_date date, + donate_amount varchar2(50), + deduction_proportion varchar2(10), + actual_deduction varchar2(50) +); +/ + +create table hrsa_endowment_insurance +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + account_number varchar2(255), + check_code varchar2(255), + year_premium varchar2(50), + month_premium varchar2(50), + current_deduction varchar2(50), + deduction_month date +); +/ + +create table hrsa_derate_deduction +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + derate_item varchar2(255), + derate_property varchar2(255), + derate_amount varchar2(255) +); +/ + +create table hrsa_free_income +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + main_id number, + tax_year_month date, + employee_id number, + tax_agent_id number, + file_status int, + free_item varchar2(255), + free_property varchar2(255), + free_amount varchar2(255) +); +/ + diff --git a/resource/sqlupgrade/ST/sql202412160403.sql b/resource/sqlupgrade/ST/sql202412160403.sql new file mode 100644 index 000000000..07a4c3c3b --- /dev/null +++ b/resource/sqlupgrade/ST/sql202412160403.sql @@ -0,0 +1,18 @@ +alter table hrsa_derate_deduction add employee_type int; +/ + +alter table hrsa_endowment_insurance add employee_type int; +/ + +alter table hrsa_free_income add employee_type int; +/ + +alter table hrsa_grant_donation add employee_type int; +/ + +alter table hrsa_health_insurance add employee_type int; +/ + +alter table hrsa_other_derate_deduction add employee_type int; +/ + diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java index 5cdbec166..4bb115d7a 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java @@ -47,6 +47,7 @@ public class OtherDeductionRecordDTO { @SalaryTableColumn(text = "涓◣鎵ｇ即涔夊姟浜", width = "10%", column = "taxAgentName") @TableTitle(title = "涓◣鎵ｇ即涔夊姟浜", dataIndex = "taxAgentName", key = "taxAgentName") private String taxAgentName; + /** * 涓◣鎵ｇ即涔夊姟浜篿d */ diff --git a/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java new file mode 100644 index 000000000..d27f93e59 --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/DerateDeductionPO.java @@ -0,0 +1,77 @@ +package com.engine.salary.entity.datacollection.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-鍑忓厤绋庨 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("鍏朵粬鍏嶇◣鎵ｉ櫎-鍑忓厤绋庨") +//hrsa_derate_deduction +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-鍑忓厤绋庨") +public class DerateDeductionPO{ + @ElogTransform(name = "涓婚敭id") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "浜哄憳") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") + private Long taxAgentId; + + @ElogTransform(name = "鍑忓厤浜嬮」") + private String derateItem; + + @ElogTransform(name = "鍑忓厤鎬ц川") + private String derateProperty; + + @ElogTransform(name = "鍑忓厤閲戦") + private String derateAmount; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private Date createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private Date updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; +} diff --git a/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java b/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java new file mode 100644 index 000000000..1688dbcf9 --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/EndowmentInsurancePO.java @@ -0,0 +1,86 @@ +package com.engine.salary.entity.datacollection.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-绋庡欢鍏昏佷繚闄 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_endowment_insurance") +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-绋庡欢鍏昏佷繚闄") +public class EndowmentInsurancePO { + + @ElogTransform(name = "涓婚敭") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "浜哄憳id") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜篒D") + private Long taxAgentId; + + @ElogTransform(name = "鐢虫姤鎵ｉ櫎鏈堜唤") + private Date deductionMonth; + + @ElogTransform(name = "绋庡欢鍏昏佽处鎴风紪鍙") + private String accountNumber; + + @ElogTransform(name = "鎶ョ◣鏍￠獙鐮") + private String checkCode; + + @ElogTransform(name = "骞村害淇濊垂") + private String yearPremium; + + @ElogTransform(name = "鏈堝害淇濊垂") + private String monthPremium; + + @ElogTransform(name = "鏈湡鎵ｉ櫎閲戦") + private String currentDeduction; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private Date createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private Date updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; + +} diff --git a/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java b/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java new file mode 100644 index 000000000..59aa0afd6 --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/FreeIncomePO.java @@ -0,0 +1,75 @@ +package com.engine.salary.entity.datacollection.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-鍏嶇◣鏀跺叆琛ㄥ崟 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_free_income +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-鍏嶇◣鏀跺叆") +public class FreeIncomePO { + @ElogTransform(name = "涓婚敭id") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "浜哄憳") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") + private Long taxAgentId; + + @ElogTransform(name = "鍏嶇◣浜嬮」") + private String freeItem; + + @ElogTransform(name = "鍏嶇◣鎬ц川") + private String freeProperty; + + @ElogTransform(name = "鍏嶇◣閲戦") + private String freeAmount; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private Date createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private Date updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; +} diff --git a/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java b/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java new file mode 100644 index 000000000..d85239da4 --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/GrantDonationPO.java @@ -0,0 +1,87 @@ +package com.engine.salary.entity.datacollection.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-鍑嗕簣鎵ｉ櫎鐨勬崘璧犻 + * + * @author chengliming + * @date 2023-06-09 15:03:45 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_grant_donation") +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-鍑嗕簣鎵ｉ櫎鐨勬崘璧犻") +public class GrantDonationPO { + @ElogTransform(name = "涓婚敭id") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "浜哄憳") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") + private Long taxAgentId; + + @ElogTransform(name = "鍙楄禒鍗曚綅鍚嶇О") + private String recipientName; + + @ElogTransform(name = "鍙楄禒鍗曚綅绾崇◣浜鸿瘑鍒彿") + private String taxCode; + + @ElogTransform(name = "鎹愯禒鍑瘉鍙") + private String donationNumber; + + @ElogTransform(name = "鎹愯禒鏃ユ湡") + private Date donateDate; + + @ElogTransform(name = "鎹愯禒閲戦") + private String donateAmount; + + @ElogTransform(name = "鎵ｉ櫎姣斾緥") + private String deductionProportion; + + @ElogTransform(name = "瀹為檯鎵ｉ櫎閲戦") + private String actualDeduction; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private Date createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private Date updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; + +} diff --git a/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java b/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java new file mode 100644 index 000000000..c27dc5061 --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/HealthInsurancePO.java @@ -0,0 +1,81 @@ +package com.engine.salary.entity.datacollection.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-鍟嗕笟鍋ュ悍淇濋櫓琛ㄥ崟 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_health_insurance") +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-鍟嗕笟鍋ュ悍淇濋櫓琛ㄥ崟") +public class HealthInsurancePO { + @ElogTransform(name = "涓婚敭id") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "浜哄憳") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") + private Long taxAgentId; + + @ElogTransform(name = "绋庝紭璇嗗埆鐮") + private String identificationNumber; + + @ElogTransform(name = "淇濆崟鐢熸晥鏃ユ湡") + private Date effectiveDate; + + @ElogTransform(name = "骞村害淇濊垂") + private String yearPremium; + + @ElogTransform(name = "鏈堝害淇濊垂") + private String monthPremium; + + @ElogTransform(name = "鏈湡鎵ｉ櫎閲戦") + private String currentDeduction; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private Date createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private Date updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; +} diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java index 83f1ec932..a3af82274 100644 --- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java @@ -46,6 +46,15 @@ public class OtherDeductionPO { @ElogTransform( name ="绋庢鎵灞炴湡") private Date declareMonth; + /** + * 鍏嶇◣鏀跺叆 + */ + @ElogTransform(name = "鍏嶇◣鏀跺叆") + @SalaryFormulaVar(defaultLabel = "鍏嶇◣鏀跺叆", labelId = 91238, dataType = "number") + @Encrypt + private String freeIncome; + + /** * 鍟嗕笟鍋ュ悍淇濋櫓 */ @@ -62,6 +71,14 @@ public class OtherDeductionPO { @Encrypt private String taxDelayEndowmentInsurance; + /** + * 鍑忓厤绋庨 + */ + @ElogTransform(name = "鍑忓厤绋庨") + @SalaryFormulaVar(defaultLabel = "鍑忓厤绋庨", labelId = 102810, dataType = "number") + @Encrypt + private String derateDeduction; + /** * 鍏朵粬 */ diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java new file mode 100644 index 000000000..0dbcd99e6 --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/OtherDerateDeductionPO.java @@ -0,0 +1,74 @@ +package com.engine.salary.entity.datacollection.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-鍑忓厤绋庨 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_other_derate_deduction +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-鍑忓厤绋庨") +public class OtherDerateDeductionPO { + @ElogTransform(name = "涓婚敭id") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "浜哄憳") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") + private Long taxAgentId; + + @ElogTransform(name = "鍑忓厤绋庨") + private String otherDeduction; + + @ElogTransform(name = "澶囨敞") + private String remark; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private LocalDateTime createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private LocalDateTime updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; +} diff --git a/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java b/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java new file mode 100644 index 000000000..6af983b1f --- /dev/null +++ b/src/com/engine/salary/entity/datacollection/po/PersonalPensionPO.java @@ -0,0 +1,92 @@ +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 lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 鍏朵粬鍏嶇◣鎵ｉ櫎-涓汉鍏昏侀噾 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_personal_pension") +@ElogTransform(name = "鍏朵粬鍏嶇◣鎵ｉ櫎-涓汉鍏昏侀噾") +public class PersonalPensionPO{ + + @ElogTransform(name = "涓婚敭id") + private Long id; + + @ElogTransform(name = "涓昏〃鏁版嵁Id") + private Long mainId; + + @ElogTransform(name = "绋庢鎵灞炴湡") + private Date taxYearMonth; + + @ElogTransform(name = "缂磋垂鏈堝害") + private Date payMonth; + + @ElogTransform(name = "浜哄憳") + private Long employeeId; + + @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") + private Long taxAgentId; + + @ElogTransform(name = "鍑瘉绫诲埆") + private Integer voucherType; + + @ElogTransform(name = "鍑瘉绫诲埆鍚嶇О") + private String voucherTypeName; + + @ElogTransform(name = "鍑瘉缂栫爜") + private String voucherNo; + + @ElogTransform(name = "缂磋垂閲戦") + private String payAmount; + + @ElogTransform(name = "褰掓。鐘舵 0鏈綊妗 1宸插綊妗") + private Integer fileStatus; + + /** + * 浜哄憳绫诲瀷 + * @see DataCollectionEmployeeTypeEnum + */ + @ElogTransform(name = "浜哄憳绫诲瀷") + private Integer employeeType; + + /** + * @see EnumDeductionDataSource + */ + @ElogTransform(name = "鏁版嵁鏉ユ簮") + private Integer dataSource; + + @ElogTransform(name = "閲囬泦鏉ユ簮") + private String collectSource; + + @ElogTransform(name = "鍒涘缓鏃堕棿", ignore = true) + private Date createTime; + + @ElogTransform(name = "鏇存柊鏃堕棿", ignore = true) + private Date updateTime; + + @ElogTransform(name = "鍒涘缓浜", ignore = true) + private Long creator; + + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎", ignore = true) + private Integer deleteType; + + @ElogTransform(name = "绉熸埛key", ignore = true) + private String tenantKey; +} diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java index b64ac8b12..5c2c82770 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java @@ -126,6 +126,8 @@ public class TaxDeclarationRequest { List> employeeRequestParams = listRequestParam.computeIfAbsent("txq", k -> Lists.newArrayList()); employeeRequestParams.add(employeeRequestParam); } + // 鍏朵粬鍏嶇◣鎵ｉ櫎闄勮〃 +// buildOtherDeductionDetailParams(taxFreeMap, listRequestParam, employeeDeclare, incomeCategoryEnum, employeeRequestParam); } } diff --git a/src/com/engine/salary/enums/datacollection/EnumDeductionDataSource.java b/src/com/engine/salary/enums/datacollection/EnumDeductionDataSource.java new file mode 100644 index 000000000..cbec3e616 --- /dev/null +++ b/src/com/engine/salary/enums/datacollection/EnumDeductionDataSource.java @@ -0,0 +1,70 @@ +package com.engine.salary.enums.datacollection; + +import java.util.HashMap; +import java.util.Map; + + +/** + * 鍚勭被涓撻」鎵ｉ櫎鏁版嵁鏉ユ簮 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum EnumDeductionDataSource { + /** + * 浜哄伐杈撳叆 + */ + MANUAL(1, "浜哄伐杈撳叆", 153339), + /** + * 鍦ㄧ嚎鑾峰彇 + */ + ONLINE(2, "鍦ㄧ嚎鑾峰彇", 153340), + /** + * 鑷姩璁＄畻 + */ + AUTO_CALC(3, "鑷姩璁＄畻", 233727), + ; + + private int value; + + private String defaultLabel; + + private int labelId; + + EnumDeductionDataSource(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + private static final Map VALUE_NAME_MAP; + + static { + final EnumDeductionDataSource[] values = EnumDeductionDataSource.values(); + VALUE_NAME_MAP = new HashMap<>(values.length); + for (EnumDeductionDataSource value : values) { + VALUE_NAME_MAP.put(value.getValue(), value); + } + } + + public Integer getValue() { + return value; + } + + public Integer getLabelId() { + return labelId; + } + + public static EnumDeductionDataSource parseByValue(Integer index) { + if (index == null) { + return null; + } + return VALUE_NAME_MAP.get(index); + } + + public String getDefaultLabel() { + return defaultLabel; + } +} diff --git a/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.java b/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.java new file mode 100644 index 000000000..a045a9ee2 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.java @@ -0,0 +1,73 @@ +package com.engine.salary.mapper.datacollection; + +import com.engine.salary.entity.datacollection.po.EndowmentInsurancePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface EndowmentInsuranceMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(EndowmentInsurancePO endowmentInsurance); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + EndowmentInsurancePO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param endowmentInsurance 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(EndowmentInsurancePO endowmentInsurance); + + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param endowmentInsurance 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(EndowmentInsurancePO endowmentInsurance); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param endowmentInsurance 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(EndowmentInsurancePO endowmentInsurance); + + /** + * 鍒犻櫎璁板綍 + * + * @param endowmentInsurance 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(EndowmentInsurancePO endowmentInsurance); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml b/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml new file mode 100644 index 000000000..277843ea4 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml @@ -0,0 +1,360 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + t + . + account_number + , t.check_code + , t.create_time + , t.creator + , t.current_deduction + , t.deduction_month + , t.delete_type + , t.employee_id + , t.employee_type + , t.file_status + , t.id + , t.main_id + , t.month_premium + , t.tax_agent_id + , t.tax_year_month + , t.tenant_key + , t.update_time + , t.year_premium + + + + + + + + + + + + + + + INSERT INTO hrsa_endowment_insurance + + + + account_number, + + + check_code, + + + create_time, + + + creator, + + + current_deduction, + + + deduction_month, + + + delete_type, + + + employee_id, + + + employee_type, + + + file_status, + + + id, + + + main_id, + + + month_premium, + + + tax_agent_id, + + + tax_year_month, + + + tenant_key, + + + update_time, + + + year_premium, + + + + + #{accountNumber}, + + + #{checkCode}, + + + #{createTime}, + + + #{creator}, + + + #{currentDeduction}, + + + #{deductionMonth}, + + + #{deleteType}, + + + #{employeeId}, + + + #{employeeType}, + + + #{fileStatus}, + + + #{id}, + + + #{mainId}, + + + #{monthPremium}, + + + #{taxAgentId}, + + + #{taxYearMonth}, + + + #{tenantKey}, + + + #{updateTime}, + + + #{yearPremium}, + + + + + + + + UPDATE hrsa_endowment_insurance + + account_number=#{accountNumber}, + check_code=#{checkCode}, + create_time=#{createTime}, + creator=#{creator}, + current_deduction=#{currentDeduction}, + deduction_month=#{deductionMonth}, + delete_type=#{deleteType}, + employee_id=#{employeeId}, + employee_type=#{employeeType}, + file_status=#{fileStatus}, + main_id=#{mainId}, + month_premium=#{monthPremium}, + tax_agent_id=#{taxAgentId}, + tax_year_month=#{taxYearMonth}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + year_premium=#{yearPremium}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_endowment_insurance + + + account_number=#{accountNumber}, + + + check_code=#{checkCode}, + + + create_time=#{createTime}, + + + creator=#{creator}, + + + current_deduction=#{currentDeduction}, + + + deduction_month=#{deductionMonth}, + + + delete_type=#{deleteType}, + + + employee_id=#{employeeId}, + + + employee_type=#{employeeType}, + + + file_status=#{fileStatus}, + + + main_id=#{mainId}, + + + month_premium=#{monthPremium}, + + + tax_agent_id=#{taxAgentId}, + + + tax_year_month=#{taxYearMonth}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + year_premium=#{yearPremium}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_endowment_insurance + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_endowment_insurance + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.java b/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.java new file mode 100644 index 000000000..1c7489927 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.java @@ -0,0 +1,72 @@ +package com.engine.salary.mapper.datacollection; + +import com.engine.salary.entity.datacollection.po.FreeIncomePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface FreeIncomeMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(FreeIncomePO freeIncome); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + FreeIncomePO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param freeIncome 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(FreeIncomePO freeIncome); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param freeIncome 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(FreeIncomePO freeIncome); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param freeIncome 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(FreeIncomePO freeIncome); + + /** + * 鍒犻櫎璁板綍 + * + * @param freeIncome 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(FreeIncomePO freeIncome); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml b/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml new file mode 100644 index 000000000..e10253fc0 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/FreeIncomeMapper.xml @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + t + . + create_time + , t.creator + , t.delete_type + , t.employee_id + , t.employee_type + , t.file_status + , t.free_amount + , t.free_item + , t.free_property + , t.id + , t.main_id + , t.tax_agent_id + , t.tax_year_month + , t.tenant_key + , t.update_time + + + + + + + + + + + + + + + INSERT INTO hrsa_free_income + + + + create_time, + + + creator, + + + delete_type, + + + employee_id, + + + employee_type, + + + file_status, + + + free_amount, + + + free_item, + + + free_property, + + + id, + + + main_id, + + + tax_agent_id, + + + tax_year_month, + + + tenant_key, + + + update_time, + + + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{employeeId}, + + + #{employeeType}, + + + #{fileStatus}, + + + #{freeAmount}, + + + #{freeItem}, + + + #{freeProperty}, + + + #{id}, + + + #{mainId}, + + + #{taxAgentId}, + + + #{taxYearMonth}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + + UPDATE hrsa_free_income + + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + employee_id=#{employeeId}, + employee_type=#{employeeType}, + file_status=#{fileStatus}, + free_amount=#{freeAmount}, + free_item=#{freeItem}, + free_property=#{freeProperty}, + main_id=#{mainId}, + tax_agent_id=#{taxAgentId}, + tax_year_month=#{taxYearMonth}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_free_income + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + employee_id=#{employeeId}, + + + employee_type=#{employeeType}, + + + file_status=#{fileStatus}, + + + free_amount=#{freeAmount}, + + + free_item=#{freeItem}, + + + free_property=#{freeProperty}, + + + main_id=#{mainId}, + + + tax_agent_id=#{taxAgentId}, + + + tax_year_month=#{taxYearMonth}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_free_income + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_free_income + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.java b/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.java new file mode 100644 index 000000000..5612833de --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.java @@ -0,0 +1,73 @@ +package com.engine.salary.mapper.datacollection; + +import com.engine.salary.entity.datacollection.po.GrantDonationPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface GrantDonationMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(GrantDonationPO grantDonation); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + GrantDonationPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param grantDonation 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(GrantDonationPO grantDonation); + + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param grantDonation 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(GrantDonationPO grantDonation); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param grantDonation 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(GrantDonationPO grantDonation); + + /** + * 鍒犻櫎璁板綍 + * + * @param grantDonation 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(GrantDonationPO grantDonation); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml b/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml new file mode 100644 index 000000000..2a68136eb --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + t + . + actual_deduction + , t.create_time + , t.creator + , t.deduction_proportion + , t.delete_type + , t.donate_amount + , t.donate_date + , t.donation_number + , t.employee_id + , t.employee_type + , t.file_status + , t.id + , t.main_id + , t.recipient_name + , t.tax_agent_id + , t.tax_code + , t.tax_year_month + , t.tenant_key + , t.update_time + + + + + + + + + + + + + + + INSERT INTO hrsa_grant_donation + + + + actual_deduction, + + + create_time, + + + creator, + + + deduction_proportion, + + + delete_type, + + + donate_amount, + + + donate_date, + + + donation_number, + + + employee_id, + + + employee_type, + + + file_status, + + + id, + + + main_id, + + + recipient_name, + + + tax_agent_id, + + + tax_code, + + + tax_year_month, + + + tenant_key, + + + update_time, + + + + + #{actualDeduction}, + + + #{createTime}, + + + #{creator}, + + + #{deductionProportion}, + + + #{deleteType}, + + + #{donateAmount}, + + + #{donateDate}, + + + #{donationNumber}, + + + #{employeeId}, + + + #{employeeType}, + + + #{fileStatus}, + + + #{id}, + + + #{mainId}, + + + #{recipientName}, + + + #{taxAgentId}, + + + #{taxCode}, + + + #{taxYearMonth}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + + UPDATE hrsa_grant_donation + + actual_deduction=#{actualDeduction}, + create_time=#{createTime}, + creator=#{creator}, + deduction_proportion=#{deductionProportion}, + delete_type=#{deleteType}, + donate_amount=#{donateAmount}, + donate_date=#{donateDate}, + donation_number=#{donationNumber}, + employee_id=#{employeeId}, + employee_type=#{employeeType}, + file_status=#{fileStatus}, + main_id=#{mainId}, + recipient_name=#{recipientName}, + tax_agent_id=#{taxAgentId}, + tax_code=#{taxCode}, + tax_year_month=#{taxYearMonth}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_grant_donation + + + actual_deduction=#{actualDeduction}, + + + create_time=#{createTime}, + + + creator=#{creator}, + + + deduction_proportion=#{deductionProportion}, + + + delete_type=#{deleteType}, + + + donate_amount=#{donateAmount}, + + + donate_date=#{donateDate}, + + + donation_number=#{donationNumber}, + + + employee_id=#{employeeId}, + + + employee_type=#{employeeType}, + + + file_status=#{fileStatus}, + + + main_id=#{mainId}, + + + recipient_name=#{recipientName}, + + + tax_agent_id=#{taxAgentId}, + + + tax_code=#{taxCode}, + + + tax_year_month=#{taxYearMonth}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_grant_donation + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_grant_donation + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.java b/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.java new file mode 100644 index 000000000..b382963f2 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.java @@ -0,0 +1,73 @@ +package com.engine.salary.mapper.datacollection; + +import com.engine.salary.entity.datacollection.po.HealthInsurancePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface HealthInsuranceMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(HealthInsurancePO healthInsurance); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + HealthInsurancePO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param healthInsurance 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(HealthInsurancePO healthInsurance); + + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param healthInsurance 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(HealthInsurancePO healthInsurance); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param healthInsurance 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(HealthInsurancePO healthInsurance); + + /** + * 鍒犻櫎璁板綍 + * + * @param healthInsurance 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(HealthInsurancePO healthInsurance); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml b/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml new file mode 100644 index 000000000..71d4cdde1 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + t + . + create_time + , t.creator + , t.current_deduction + , t.delete_type + , t.effective_date + , t.employee_id + , t.employee_type + , t.file_status + , t.id + , t.identification_number + , t.main_id + , t.month_premium + , t.tax_agent_id + , t.tax_year_month + , t.tenant_key + , t.update_time + , t.year_premium + + + + + + + + + + + + + + + INSERT INTO hrsa_health_insurance + + + + create_time, + + + creator, + + + current_deduction, + + + delete_type, + + + effective_date, + + + employee_id, + + + employee_type, + + + file_status, + + + id, + + + identification_number, + + + main_id, + + + month_premium, + + + tax_agent_id, + + + tax_year_month, + + + tenant_key, + + + update_time, + + + year_premium, + + + + + #{createTime}, + + + #{creator}, + + + #{currentDeduction}, + + + #{deleteType}, + + + #{effectiveDate}, + + + #{employeeId}, + + + #{employeeType}, + + + #{fileStatus}, + + + #{id}, + + + #{identificationNumber}, + + + #{mainId}, + + + #{monthPremium}, + + + #{taxAgentId}, + + + #{taxYearMonth}, + + + #{tenantKey}, + + + #{updateTime}, + + + #{yearPremium}, + + + + + + + + UPDATE hrsa_health_insurance + + create_time=#{createTime}, + creator=#{creator}, + current_deduction=#{currentDeduction}, + delete_type=#{deleteType}, + effective_date=#{effectiveDate}, + employee_id=#{employeeId}, + employee_type=#{employeeType}, + file_status=#{fileStatus}, + identification_number=#{identificationNumber}, + main_id=#{mainId}, + month_premium=#{monthPremium}, + tax_agent_id=#{taxAgentId}, + tax_year_month=#{taxYearMonth}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + year_premium=#{yearPremium}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_health_insurance + + + create_time=#{createTime}, + + + creator=#{creator}, + + + current_deduction=#{currentDeduction}, + + + delete_type=#{deleteType}, + + + effective_date=#{effectiveDate}, + + + employee_id=#{employeeId}, + + + employee_type=#{employeeType}, + + + file_status=#{fileStatus}, + + + identification_number=#{identificationNumber}, + + + main_id=#{mainId}, + + + month_premium=#{monthPremium}, + + + tax_agent_id=#{taxAgentId}, + + + tax_year_month=#{taxYearMonth}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + year_premium=#{yearPremium}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_health_insurance + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_health_insurance + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.java b/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.java new file mode 100644 index 000000000..79ce006b3 --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.java @@ -0,0 +1,79 @@ +package com.engine.salary.mapper.datacollection; + +import com.engine.salary.entity.datacollection.po.OtherDerateDeductionPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface OtherDerateDeductionMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(OtherDerateDeductionPO otherDerateDeduction); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + OtherDerateDeductionPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param otherDerateDeduction 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(OtherDerateDeductionPO otherDerateDeduction); + + /** + * 鎵归噺鎻掑叆 + * + * @param otherDerateDeduction + */ + void batchInsert(@Param("collection") List otherDerateDeduction); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param otherDerateDeduction 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(OtherDerateDeductionPO otherDerateDeduction); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param otherDerateDeduction 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(OtherDerateDeductionPO otherDerateDeduction); + + /** + * 鍒犻櫎璁板綍 + * + * @param otherDerateDeduction 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(OtherDerateDeductionPO otherDerateDeduction); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml new file mode 100644 index 000000000..1d7b0e0be --- /dev/null +++ b/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml @@ -0,0 +1,417 @@ + + + + + + + + + + + + + + + + + + + + + + + t.create_time + , t.creator + , t.delete_type + , t.employee_id + , t.employee_type + , t.file_status + , t.id + , t.main_id + , t.other_deduction + , t.remark + , t.tax_agent_id + , t.tax_year_month + , t.tenant_key + , t.update_time + + + + + + + + + + + + + + + INSERT INTO hrsa_other_derate_deduction + + + + create_time, + + + creator, + + + delete_type, + + + employee_id, + + + employee_type, + + + file_status, + + + id, + + + main_id, + + + other_deduction, + + + remark, + + + tax_agent_id, + + + tax_year_month, + + + tenant_key, + + + update_time, + + + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{employeeId}, + + + #{employeeType}, + + + #{fileStatus}, + + + #{id}, + + + #{mainId}, + + + #{otherDeduction}, + + + #{remark}, + + + #{taxAgentId}, + + + #{taxYearMonth}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + + INSERT INTO hrsa_other_derate_deduction + ( + create_time, + creator, + delete_type, + employee_id, + employee_type, + file_status, + id, + main_id, + other_deduction, + remark, + tax_agent_id, + tax_year_month, + tenant_key, + update_time, + ) + VALUES + + + ( + #{item.createTime}, + #{item.creator}, + #{item.deleteType}, + #{item.employeeId}, + #{item.employeeType}, + #{item.fileStatus}, + #{item.id}, + #{item.mainId}, + #{item.otherDeduction}, + #{item.remark}, + #{item.taxAgentId}, + #{item.taxYearMonth}, + #{item.tenantKey}, + #{item.updateTime}, + ) + + + + + + + INSERT INTO hrsa_other_derate_deduction ( + create_time, + creator, + delete_type, + employee_id, + employee_type, + file_status, + id, + main_id, + other_deduction, + remark, + tax_agent_id, + tax_year_month, + tenant_key, + update_time, + ) + + + select + #{item.createTime,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.creator,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.deleteType,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.employeeId,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.employeeType,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.fileStatus,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.id,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.mainId,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.otherDeduction,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.remark,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.taxAgentId,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.taxYearMonth,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.tenantKey,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.updateTime,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + from dual + + + + + + + INSERT INTO hrsa_other_derate_deduction ( + create_time, + creator, + delete_type, + employee_id, + employee_type, + file_status, + id, + main_id, + other_deduction, + remark, + tax_agent_id, + tax_year_month, + tenant_key, + update_time, + ) + VALUES + ( + #{item.createTime}, + #{item.creator}, + #{item.deleteType}, + #{item.employeeId}, + #{item.employeeType}, + #{item.fileStatus}, + #{item.id}, + #{item.mainId}, + #{item.otherDeduction}, + #{item.remark}, + #{item.taxAgentId}, + #{item.taxYearMonth}, + #{item.tenantKey}, + #{item.updateTime}, + ) + + + + + + UPDATE hrsa_other_derate_deduction + + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + employee_id=#{employeeId}, + employee_type=#{employeeType}, + file_status=#{fileStatus}, + main_id=#{mainId}, + other_deduction=#{otherDeduction}, + remark=#{remark}, + tax_agent_id=#{taxAgentId}, + tax_year_month=#{taxYearMonth}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_other_derate_deduction + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + employee_id=#{employeeId}, + + + employee_type=#{employeeType}, + + + file_status=#{fileStatus}, + + + main_id=#{mainId}, + + + other_deduction=#{otherDeduction}, + + + remark=#{remark}, + + + tax_agent_id=#{taxAgentId}, + + + tax_year_month=#{taxYearMonth}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_other_derate_deduction + SET delete_type=1 + WHERE id = #{id} AND delete_type = 0 + + + + UPDATE hrsa_other_derate_deduction + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + + \ No newline at end of file