Merge branch 'release/个税版本' into custom/昂立
This commit is contained in:
Harryxzy
commit
0bd0848c69
|
|
@ -0,0 +1,39 @@
|
|||
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL;
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value add (
|
||||
source number
|
||||
);
|
||||
/
|
||||
|
||||
ALTER TABLE declare_request_id add (
|
||||
declare_request_id varchar2(100)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_item add width int null;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL;
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value add (
|
||||
source number
|
||||
);
|
||||
/
|
||||
|
||||
ALTER TABLE declare_request_id add (
|
||||
declare_request_id varchar2(100)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_item add width int null;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL;
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value add (
|
||||
source number
|
||||
);
|
||||
/
|
||||
|
||||
ALTER TABLE declare_request_id add (
|
||||
declare_request_id varchar2(100)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_item add width int null;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
ALTER TABLE hrsa_social_archives ADD COLUMN social_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_fund_archives ADD COLUMN fund_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_other_archives ADD COLUMN other_payment_com_base_string text NULL;
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD COLUMN social_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_bill_detail ADD COLUMN fund_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_bill_detail ADD COLUMN other_payment_com_base_string text NULL;
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD COLUMN social_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD COLUMN fund_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD COLUMN other_payment_com_base_string text NULL;
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD COLUMN social_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD COLUMN fund_payment_com_base_string text NULL;
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD COLUMN other_payment_com_base_string text NULL;
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD COLUMN payment_scope varchar(10) NULL;
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD COLUMN contrast_type int(0) NULL;
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value ADD COLUMN source int(0) NULL ;
|
||||
|
||||
ALTER TABLE hrsa_tax_declare_record ADD COLUMN declare_request_id varchar(100) NULL ;
|
||||
|
|
@ -0,0 +1 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
|
|
@ -0,0 +1 @@
|
|||
alter table hrsa_salary_item add width int null;
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
alter table hrsa_add_up_situation add add_up_taxable_income varchar2(255)
|
||||
/
|
||||
alter table hrsa_add_up_situation add actual_add_up_advance_tax varchar2(255)
|
||||
/
|
||||
alter table hrsa_add_up_situation add tax_adjustment varchar2(255)
|
||||
/
|
||||
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312885, 1, 674916065864646661, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 5)
|
||||
/
|
||||
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312886, 1, 674916065864646658, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 6)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1693896072589, '当前累计减免税额合计', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"isCustomFunction":"0","sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{薪资项目.本月（次）减免税额}+{往期累计情况.累计减免税额}', 'salaryItem_taxDeduction+addUpSituation_addUpTaxSavings', 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
|
||||
/
|
||||
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1693896072606, '本月（次）减免税额', 1693896072589, 'salaryItem_taxDeduction', '{薪资项目.本月（次）减免税额}', 'number', 'salaryItem', 0, 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
|
||||
/
|
||||
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1693896072611, '累计减免税额', 1693896072589, 'addUpSituation_addUpTaxSavings', '{往期累计情况.累计减免税额}', 'number', 'addUpSituation', 1, 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
|
||||
/
|
||||
|
||||
update hrsa_sys_salary_item set value_type = 2 ,formula_id =1693896072589 where id = 674916065864646658
|
||||
/
|
||||
|
||||
update hrsa_salary_item set value_type =2 ,formula_id =1693896072589 where sys_salary_item_id = 674916065864646658
|
||||
/
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL
|
||||
/
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1)
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出'
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0
|
||||
/
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value add (
|
||||
source number
|
||||
)
|
||||
/
|
||||
|
||||
ALTER TABLE declare_request_id add (
|
||||
declare_request_id varchar2(100)
|
||||
)
|
||||
/
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
/
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
alter table hrsa_salary_item add width int null
|
||||
/
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
ALTER TABLE hrsa_tax_declaration ADD COLUMN income_category int NOT NULL ;
|
||||
ALTER TABLE hrsa_tax_declaration ADD COLUMN income_category int ;
|
||||
|
||||
ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int NOT NULL ;
|
||||
ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int ;
|
||||
|
|
@ -2,9 +2,9 @@ Delete from LeftMenuInfo where id=100186;
|
|||
/
|
||||
Delete from LeftMenuConfig where infoid=100186;
|
||||
/
|
||||
call LMConfig_U_ByInfoInsert (2,100118,9);
|
||||
select LMConfig_U_ByInfoInsert (2,100118,9);
|
||||
/
|
||||
call LMInfo_Insert (100186,541290,'','',2,100118,9,18);
|
||||
select LMInfo_Insert (100186,541290,'','',2,100118,9,18);
|
||||
/
|
||||
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186;
|
||||
/
|
||||
|
|
@ -1,17 +1,14 @@
|
|||
select @current_date:= date_format( now(),'%Y-%m-%d');
|
||||
select @current_time:= date_format( now(),'%T');
|
||||
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA,SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL,BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER,WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME,onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl,isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryExtEmp', '1', '1', '', 'SELECT * FROM hrsa_external_employee where delete_type=0', '', '', '', '', '1','id', '', '', '', '', '', '', 2, '薪酬非系统人员', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date,@current_time, NULL, NULL, '', '', '0', uuid(), '', '', '', '', '1', 0, 1);
|
||||
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA,SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL,BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER,WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME,onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl,isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryExtEmp', '1', '1', '', 'SELECT * FROM hrsa_external_employee where delete_type=0', '', '', '', '', '1','id', '', '', '', '', '', '', 2, '薪酬非系统人员', NULL, '', NULL, NULL, NULL, NULL, '', '', '2020-01-01', '19:12:12', NULL, NULL, '', '', '0', uuid(), '', '', '', '', '1', 0, 1);
|
||||
|
||||
select @datashowset_id:= max(id)from datashowset;
|
||||
|
||||
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime)
|
||||
VALUES ('salaryExtEmp', '0', 0, @current_date, @current_time, NULL, NULL);
|
||||
VALUES ('salaryExtEmp', '0', 0, '2020-01-01', '19:12:12', NULL, NULL);
|
||||
|
||||
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width)
|
||||
VALUES (@datashowset_id, '姓名', 'username', '', 1, 1, uuid(), NULL);
|
||||
VALUES ((select max(id) from datashowparam), '姓名', 'username', '', 1, 1, uuid(), NULL);
|
||||
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width)
|
||||
VALUES (@datashowset_id, '手机号', 'mobile', '', 0, 2, uuid(), NULL);
|
||||
VALUES ((select max(id) from datashowparam), '手机号', 'mobile', '', 0, 2, uuid(), NULL);
|
||||
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield)
|
||||
VALUES (@datashowset_id, '姓名', 'username', '2', '', 1, uuid(), '');
|
||||
VALUES ((select max(id) from datasearchparam), '姓名', 'username', '2', '', 1, uuid(), '');
|
||||
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield)
|
||||
VALUES (@datashowset_id, '手机号', 'mobile', '2', '', 2, uuid(), '');
|
||||
VALUES ((select max(id) from datasearchparam), '手机号', 'mobile', '2', '', 2, uuid(), '');
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
ALTER TABLE hrsa_social_archives ADD COLUMN social_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_fund_archives ADD COLUMN fund_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_other_archives ADD COLUMN other_payment_com_base_string varchar(4000) NULL;
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL;
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD COLUMN social_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD COLUMN fund_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD COLUMN other_payment_com_base_string varchar(4000) NULL;
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL;
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL;
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD COLUMN payment_scope varchar(10) NULL;
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD COLUMN contrast_type int NULL;
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value ADD COLUMN source int NULL ;
|
||||
|
||||
ALTER TABLE hrsa_salary_template ADD COLUMN declare_request_id varchar(200) NULL;
|
||||
|
|
@ -0,0 +1 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
|
|
@ -0,0 +1 @@
|
|||
alter table hrsa_salary_item add width int null;
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar(4000) NULL
|
||||
GO
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar(10) NULL
|
||||
GO
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1)
|
||||
GO
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出'
|
||||
GO
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0
|
||||
GO
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value ADD source int NULL
|
||||
GO
|
||||
|
||||
ALTER TABLE hrsa_tax_declare_record ADD declare_request_id varchar(100) NULL
|
||||
GO
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
update hrsa_tax_declaration_value set source = 0
|
||||
GO
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
alter table hrsa_salary_item add width int null
|
||||
GO
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
|
||||
/
|
||||
|
||||
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL;
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158191, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应扣缴税额', 'addUpTaxPayable', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
|
||||
(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
|
||||
/
|
||||
|
||||
update hrsa_tax_report_column set contrast_type = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
ALTER TABLE hrsa_tax_declaration_value add (
|
||||
source number
|
||||
);
|
||||
/
|
||||
|
||||
ALTER TABLE declare_request_id add (
|
||||
declare_request_id varchar2(100)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
update hrsa_tax_declaration_value set source = 0;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_item add width int null;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.engine.salary.action;
|
||||
|
||||
import com.engine.common.util.ServiceUtil;
|
||||
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
|
||||
import com.engine.salary.mapper.taxagent.TaxAgentMapper;
|
||||
import com.engine.salary.service.SalaryAcctRecordService;
|
||||
import com.engine.salary.service.impl.SalaryAcctRecordServiceImpl;
|
||||
import com.engine.salary.util.db.MapperProxyFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import weaver.general.BaseBean;
|
||||
import weaver.general.Util;
|
||||
import weaver.hrm.User;
|
||||
import weaver.interfaces.workflow.action.Action;
|
||||
import weaver.soa.workflow.request.Property;
|
||||
import weaver.soa.workflow.request.RequestInfo;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author Harryxzy
|
||||
* @ClassName FileSalaryAcctRecordAction
|
||||
* @date 2023/12/13 9:17
|
||||
* @description 薪资核算记录归档action
|
||||
*/
|
||||
@Slf4j
|
||||
public class FileSalaryAcctRecordAction implements Action {
|
||||
|
||||
|
||||
private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
|
||||
return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
|
||||
}
|
||||
|
||||
private TaxAgentMapper getTaxAgentMapper() {
|
||||
return MapperProxyFactory.getProxy(TaxAgentMapper.class);
|
||||
}
|
||||
|
||||
|
||||
private String recordIdFieldName;
|
||||
|
||||
|
||||
public String getRecordIdFieldName() {
|
||||
return recordIdFieldName;
|
||||
}
|
||||
|
||||
public void setRecordIdFieldName(String recordIdFieldName) {
|
||||
this.recordIdFieldName = recordIdFieldName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String execute(RequestInfo requestInfo) {
|
||||
Property[] properties = requestInfo.getMainTableInfo().getProperty();
|
||||
Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
|
||||
property -> Util.null2String(property.getValue())));
|
||||
String salaryAcctRecordId = fieldMap.get(recordIdFieldName);
|
||||
if (StringUtils.isBlank(salaryAcctRecordId)) {
|
||||
requestInfo.getRequestManager().setMessage("薪资核算记录不存在");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
User user = new User();
|
||||
user.setUid(1);
|
||||
Long acctRecordId = Long.valueOf(salaryAcctRecordId);
|
||||
SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(acctRecordId);
|
||||
if (salaryAcctRecordPO == null) {
|
||||
requestInfo.getRequestManager().setMessage("薪资核算记录不存在,或已被删除");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
if (salaryAcctRecordPO.getStatus() > 1) {
|
||||
BaseBean baseBean = new BaseBean();
|
||||
baseBean.writeLog("核算记录归档action， 该核算记录已经归档：" + salaryAcctRecordPO.getId());
|
||||
return SUCCESS;
|
||||
}
|
||||
try {
|
||||
getSalaryAcctRecordService(user).file(acctRecordId);
|
||||
} catch (Exception e) {
|
||||
requestInfo.getRequestManager().setMessage(e.getMessage());
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
return SUCCESS;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
package com.engine.salary.action;
|
||||
|
||||
import com.engine.common.util.ServiceUtil;
|
||||
import com.engine.salary.biz.SalarySendInfoBiz;
|
||||
import com.engine.salary.entity.salaryBill.param.SalarySendGrantParam;
|
||||
import com.engine.salary.entity.salaryBill.po.SalarySendPO;
|
||||
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
|
||||
import com.engine.salary.service.SalaryAcctRecordService;
|
||||
import com.engine.salary.service.SalaryBillService;
|
||||
import com.engine.salary.service.SalarySendService;
|
||||
import com.engine.salary.service.SalaryTemplateService;
|
||||
import com.engine.salary.service.impl.SalaryAcctRecordServiceImpl;
|
||||
import com.engine.salary.service.impl.SalaryBillServiceImpl;
|
||||
import com.engine.salary.service.impl.SalarySendServiceImpl;
|
||||
import com.engine.salary.service.impl.SalaryTemplateServiceImpl;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import weaver.general.Util;
|
||||
import weaver.hrm.User;
|
||||
import weaver.interfaces.workflow.action.Action;
|
||||
import weaver.soa.workflow.request.Property;
|
||||
import weaver.soa.workflow.request.RequestInfo;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author Harryxzy
|
||||
* @ClassName FileSalaryAcctRecordAction
|
||||
* @date 2023/12/13 9:17
|
||||
* @description 工资单发放action
|
||||
*/
|
||||
@Slf4j
|
||||
public class SendSalaryAction implements Action {
|
||||
|
||||
|
||||
private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
|
||||
return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
|
||||
}
|
||||
|
||||
private SalarySendService getSalarySendService(User user) {
|
||||
return ServiceUtil.getService(SalarySendServiceImpl.class, user);
|
||||
}
|
||||
|
||||
private SalaryTemplateService getSalaryTemplateService(User user) {
|
||||
return ServiceUtil.getService(SalaryTemplateServiceImpl.class, user);
|
||||
}
|
||||
|
||||
private SalarySendInfoBiz salarySendInfoMapper = new SalarySendInfoBiz();
|
||||
|
||||
private SalaryBillService getSalaryBillService(User user) {
|
||||
return ServiceUtil.getService(SalaryBillServiceImpl.class, user);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 发放id（核算记录id，工资单id）流程字段名
|
||||
*/
|
||||
private String idFieldName;
|
||||
|
||||
/**
|
||||
* 根据什么id（核算记录id，工资单id）发工资单
|
||||
*/
|
||||
private String sendBy;
|
||||
|
||||
|
||||
@Override
|
||||
public String execute(RequestInfo requestInfo) {
|
||||
Property[] properties = requestInfo.getMainTableInfo().getProperty();
|
||||
Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
|
||||
property -> Util.null2String(property.getValue())));
|
||||
String idStr = fieldMap.get(idFieldName);
|
||||
if (StringUtils.isBlank(idStr)) {
|
||||
requestInfo.getRequestManager().setMessage("核算记录id或工资单id不能为空");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
User user = new User();
|
||||
user.setUid(1);
|
||||
Long id = Long.valueOf(idStr);
|
||||
SalarySendPO salarySendPO;
|
||||
if(!org.h2.util.StringUtils.isNullOrEmpty(sendBy) && sendBy.equals("salaryAcctRecordId")) {
|
||||
// 根据核算记录id发
|
||||
SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(id);
|
||||
if (salaryAcctRecordPO == null) {
|
||||
requestInfo.getRequestManager().setMessage("薪资核算记录不存在,或已被删除");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
if (salaryAcctRecordPO.getStatus() == 1) {
|
||||
requestInfo.getRequestManager().setMessage("核算记录还未归档,请先归档");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
// 获取工资单id
|
||||
List<SalarySendPO> salarySendPOList = getSalarySendService(user).listSome(SalarySendPO.builder().salaryAccountingId(id).sendStatus(0).build());
|
||||
salarySendPO = salarySendPOList.get(0);
|
||||
} else if (!org.h2.util.StringUtils.isNullOrEmpty(sendBy) && sendBy.equals("salarySendId")) {
|
||||
// 根据工资单发
|
||||
salarySendPO = getSalarySendService(user).getById(id);
|
||||
} else {
|
||||
requestInfo.getRequestManager().setMessage("请先维护根据什么id发放工资单的sendBy参数");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
|
||||
if (salarySendPO == null || salarySendPO.getId() == null) {
|
||||
requestInfo.getRequestManager().setMessage("工资单不存在或已被删除！");
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
try {
|
||||
// 全部发放
|
||||
getSalaryBillService(user).grant(SalarySendGrantParam.builder().salarySendId(salarySendPO.getId()).build());
|
||||
} catch (Exception e) {
|
||||
requestInfo.getRequestManager().setMessage(e.getMessage());
|
||||
return FAILURE_AND_CONTINUE;
|
||||
}
|
||||
return SUCCESS;
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@ import com.engine.common.util.ServiceUtil;
|
|||
import com.engine.core.impl.Service;
|
||||
import com.engine.salary.cache.SalaryCacheKey;
|
||||
import com.engine.salary.constant.SalaryDefaultTenantConstant;
|
||||
import com.engine.salary.encrypt.AESEncryptUtil;
|
||||
import com.engine.salary.encrypt.EncryptUtil;
|
||||
import com.engine.salary.entity.progress.ProgressDTO;
|
||||
import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO;
|
||||
|
|
@ -631,11 +630,13 @@ public class SIAccountBiz extends Service {
|
|||
}
|
||||
|
||||
public InsuranceAccountDetailPO accountOther(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth, String tenantKey) {
|
||||
boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase();
|
||||
if (accountPO.getOther() != null) {
|
||||
InsuranceArchivesOtherSchemePO otherPO = accountPO.getOther();
|
||||
insuranceAccountDetailPO.setOtherPayOrg(otherPO.getPaymentOrganization());
|
||||
insuranceAccountDetailPO.setOtherSchemeId(otherPO.getOtherSchemeId());
|
||||
insuranceAccountDetailPO.setOtherPaymentBaseString(otherPO.getOtherPaymentBaseString());
|
||||
insuranceAccountDetailPO.setOtherPaymentComBaseString(otherPO.getOtherPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), otherPO.getOtherStartTime(), otherPO.getOtherEndTime());
|
||||
if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null && inDataRange) {
|
||||
|
|
@ -719,7 +720,13 @@ public class SIAccountBiz extends Service {
|
|||
.collect(
|
||||
Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity()));
|
||||
//档案中包含的基数信息
|
||||
HashMap<String, String> archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
// HashMap<String, String> archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
HashMap<String, String> archivesCom = new HashMap<>();
|
||||
if (welBaseDiffSign) {
|
||||
archivesCom = JSON.parseObject(otherPO.getOtherPaymentComBaseString(), new HashMap<String, String>().getClass());
|
||||
} else {
|
||||
archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
}
|
||||
//需要核算其他的福利id 单位
|
||||
List<Long> needArchivesCom = new ArrayList<>();
|
||||
if (archivesCom != null) {
|
||||
|
|
@ -742,10 +749,11 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
List<BigDecimal> otherComList = new ArrayList<>();
|
||||
Map<String, String> otherComJsonMap = new HashMap<>();
|
||||
HashMap<String, String> finalArchivesCom = archivesCom;
|
||||
needArchivesCom.stream().forEach(e -> {
|
||||
InsuranceSchemeDetailPO po = otherCom.get(e);
|
||||
BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
|
||||
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
|
||||
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
|
||||
// BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
|
||||
|
|
@ -787,6 +795,7 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
|
||||
public InsuranceAccountDetailPO accountFund(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth, String tenantKey) {
|
||||
boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase();
|
||||
if (accountPO.getFund() != null) {
|
||||
InsuranceArchivesFundSchemePO fundPO = accountPO.getFund();
|
||||
insuranceAccountDetailPO.setFundPayOrg(fundPO.getPaymentOrganization());
|
||||
|
|
@ -794,6 +803,7 @@ public class SIAccountBiz extends Service {
|
|||
insuranceAccountDetailPO.setSupplementFundAccount(fundPO.getSupplementFundAccount());
|
||||
insuranceAccountDetailPO.setFundSchemeId(fundPO.getFundSchemeId());
|
||||
insuranceAccountDetailPO.setFundPaymentBaseString(fundPO.getFundPaymentBaseString());
|
||||
insuranceAccountDetailPO.setFundPaymentComBaseString(fundPO.getFundPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), fundPO.getFundStartTime(), fundPO.getFundEndTime());
|
||||
if ((NonPaymentEnum.YES.getValue() == fundPO.getNonPayment() || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null && inDataRange) {
|
||||
|
|
@ -876,7 +886,13 @@ public class SIAccountBiz extends Service {
|
|||
.collect(
|
||||
Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity()));
|
||||
//档案中包含的基数信息
|
||||
HashMap<String, String> archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
// HashMap<String, String> archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
HashMap<String, String> archivesCom = new HashMap<>();
|
||||
if (welBaseDiffSign) {
|
||||
archivesCom = JSON.parseObject(fundPO.getFundPaymentComBaseString(), new HashMap<String, String>().getClass());
|
||||
} else {
|
||||
archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
}
|
||||
//需要核算公积金的福利id 单位
|
||||
List<Long> needArchivesCom = new ArrayList<>();
|
||||
if (archivesCom != null) {
|
||||
|
|
@ -899,10 +915,11 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
List<BigDecimal> fundComList = new ArrayList<>();
|
||||
Map<String, String> fundComJsonMap = new HashMap<>();
|
||||
HashMap<String, String> finalArchivesCom = archivesCom;
|
||||
needArchivesCom.stream().forEach(e -> {
|
||||
InsuranceSchemeDetailPO po = fundCom.get(e);
|
||||
BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
|
||||
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
|
||||
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
|
||||
// BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
|
||||
|
|
@ -945,12 +962,14 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
|
||||
public InsuranceAccountDetailPO accountSocial(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth, String tenantKey) {
|
||||
boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase();
|
||||
if (accountPO.getSocial() != null) {
|
||||
InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial();
|
||||
insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization());
|
||||
insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount());
|
||||
insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId());
|
||||
insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString());
|
||||
insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), socialPO.getSocialStartTime(), socialPO.getSocialEndTime());
|
||||
if ((NonPaymentEnum.YES.getValue().equals(socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) {
|
||||
|
|
@ -1036,7 +1055,13 @@ public class SIAccountBiz extends Service {
|
|||
.collect(
|
||||
Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity()));
|
||||
//档案中包含的基数信息
|
||||
HashMap<String, String> archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
// HashMap<String, String> archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
HashMap<String, String> archivesCom = new HashMap<>();
|
||||
if (welBaseDiffSign) {
|
||||
archivesCom = JSON.parseObject(socialPO.getSocialPaymentComBaseString(), new HashMap<String, String>().getClass());
|
||||
} else {
|
||||
archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
}
|
||||
//需要核算社保的福利id 单位
|
||||
List<Long> needArchivesCom = new ArrayList<>();
|
||||
if (archivesCom != null) {
|
||||
|
|
@ -1059,10 +1084,11 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
List<BigDecimal> socialCom = new ArrayList<>();
|
||||
Map<String, String> sociaComJsonMap = new HashMap<>();
|
||||
HashMap<String, String> finalArchivesCom = archivesCom;
|
||||
needArchivesCom.stream().forEach(e -> {
|
||||
InsuranceSchemeDetailPO po = schemeCom.get(e);
|
||||
BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
|
||||
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
|
||||
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
|
||||
// BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
|
||||
|
|
@ -1510,7 +1536,6 @@ public class SIAccountBiz extends Service {
|
|||
} else {
|
||||
accountFund(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth());
|
||||
}
|
||||
|
||||
}
|
||||
if (projects.contains(ProjectTypeEnum.OTHER.getValue())) {
|
||||
|
||||
|
|
@ -1532,11 +1557,13 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
|
||||
public InsuranceAccountDetailPO accountOther(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) {
|
||||
boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase();
|
||||
if (accountPO.getOther() != null) {
|
||||
InsuranceArchivesOtherSchemePO otherPO = accountPO.getOther();
|
||||
insuranceAccountDetailPO.setOtherPayOrg(otherPO.getPaymentOrganization());
|
||||
insuranceAccountDetailPO.setOtherSchemeId(otherPO.getOtherSchemeId());
|
||||
insuranceAccountDetailPO.setOtherPaymentBaseString(otherPO.getOtherPaymentBaseString());
|
||||
insuranceAccountDetailPO.setOtherPaymentComBaseString(otherPO.getOtherPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, otherPO.getOtherStartTime(), otherPO.getOtherEndTime());
|
||||
if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null && inDataRange) {
|
||||
|
|
@ -1611,7 +1638,13 @@ public class SIAccountBiz extends Service {
|
|||
.collect(
|
||||
Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity()));
|
||||
//档案中包含的基数信息
|
||||
HashMap<String, String> archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
// HashMap<String, String> archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
HashMap<String, String> archivesCom = new HashMap<>();
|
||||
if (welBaseDiffSign) {
|
||||
archivesCom = JSON.parseObject(otherPO.getOtherPaymentComBaseString(), new HashMap<String, String>().getClass());
|
||||
} else {
|
||||
archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
}
|
||||
//需要核算其他的福利id 单位
|
||||
List<Long> needArchivesCom = new ArrayList<>();
|
||||
if (archivesCom != null) {
|
||||
|
|
@ -1626,10 +1659,11 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
List<BigDecimal> otherComList = new ArrayList<>();
|
||||
Map<String, String> otherComJsonMap = new HashMap<>();
|
||||
HashMap<String, String> finalArchivesCom = archivesCom;
|
||||
needArchivesCom.stream().forEach(e -> {
|
||||
InsuranceSchemeDetailPO po = otherCom.get(e);
|
||||
BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
|
||||
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
|
||||
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
|
||||
// BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
|
||||
|
|
@ -1671,6 +1705,7 @@ public class SIAccountBiz extends Service {
|
|||
}
|
||||
|
||||
public InsuranceAccountDetailPO accountFund(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) {
|
||||
boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase();
|
||||
if (accountPO.getFund() != null) {
|
||||
InsuranceArchivesFundSchemePO fundPO = accountPO.getFund();
|
||||
insuranceAccountDetailPO.setFundPayOrg(fundPO.getPaymentOrganization());
|
||||
|
|
@ -1678,6 +1713,7 @@ public class SIAccountBiz extends Service {
|
|||
insuranceAccountDetailPO.setSupplementFundAccount(fundPO.getSupplementFundAccount());
|
||||
insuranceAccountDetailPO.setFundSchemeId(fundPO.getFundSchemeId());
|
||||
insuranceAccountDetailPO.setFundPaymentBaseString(fundPO.getFundPaymentBaseString());
|
||||
insuranceAccountDetailPO.setFundPaymentComBaseString(fundPO.getFundPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, fundPO.getFundStartTime(), fundPO.getFundEndTime());
|
||||
if ((Objects.equals(NonPaymentEnum.YES.getValue(), fundPO.getNonPayment()) || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null && inDataRange) {
|
||||
|
|
@ -1751,7 +1787,13 @@ public class SIAccountBiz extends Service {
|
|||
.collect(
|
||||
Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity()));
|
||||
//档案中包含的基数信息
|
||||
HashMap<String, String> archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
// HashMap<String, String> archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
HashMap<String, String> archivesCom = new HashMap<>();
|
||||
if (welBaseDiffSign) {
|
||||
archivesCom = JSON.parseObject(fundPO.getFundPaymentComBaseString(), new HashMap<String, String>().getClass());
|
||||
} else {
|
||||
archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
}
|
||||
//需要核算公积金的福利id 单位
|
||||
List<Long> needArchivesCom = new ArrayList<>();
|
||||
if (archivesCom != null) {
|
||||
|
|
@ -1766,10 +1808,11 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
List<BigDecimal> fundComList = new ArrayList<>();
|
||||
Map<String, String> fundComJsonMap = new HashMap<>();
|
||||
HashMap<String, String> finalArchivesCom = archivesCom;
|
||||
needArchivesCom.stream().forEach(e -> {
|
||||
InsuranceSchemeDetailPO po = fundCom.get(e);
|
||||
BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
|
||||
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
|
||||
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
|
||||
// BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
|
||||
|
|
@ -1812,12 +1855,14 @@ public class SIAccountBiz extends Service {
|
|||
}
|
||||
|
||||
public InsuranceAccountDetailPO accountSocial(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) {
|
||||
boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase();
|
||||
if (accountPO.getSocial() != null) {
|
||||
InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial();
|
||||
insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization());
|
||||
insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount());
|
||||
insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId());
|
||||
insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString());
|
||||
insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, socialPO.getSocialStartTime(), socialPO.getSocialEndTime());
|
||||
if ((Objects.equals(NonPaymentEnum.YES.getValue(), socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) {
|
||||
|
|
@ -1896,7 +1941,13 @@ public class SIAccountBiz extends Service {
|
|||
.collect(
|
||||
Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity()));
|
||||
//档案中包含的基数信息
|
||||
HashMap<String, String> archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
// HashMap<String, String> archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
HashMap<String, String> archivesCom = new HashMap<>();
|
||||
if (welBaseDiffSign) {
|
||||
archivesCom = JSON.parseObject(socialPO.getSocialPaymentComBaseString(), new HashMap<String, String>().getClass());
|
||||
} else {
|
||||
archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
|
||||
}
|
||||
//需要核算社保的福利id 单位
|
||||
List<Long> needArchivesCom = new ArrayList<>();
|
||||
if (archivesCom != null) {
|
||||
|
|
@ -1911,10 +1962,11 @@ public class SIAccountBiz extends Service {
|
|||
|
||||
List<BigDecimal> socialCom = new ArrayList<>();
|
||||
Map<String, String> sociaComJsonMap = new HashMap<>();
|
||||
HashMap<String, String> finalArchivesCom = archivesCom;
|
||||
needArchivesCom.stream().forEach(e -> {
|
||||
InsuranceSchemeDetailPO po = schemeCom.get(e);
|
||||
BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
|
||||
BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
|
||||
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
|
||||
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
|
||||
// BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
|
||||
|
|
@ -1964,6 +2016,7 @@ public class SIAccountBiz extends Service {
|
|||
insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount());
|
||||
insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId());
|
||||
insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString());
|
||||
insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString());
|
||||
//判断是否在起始缴纳月和最后缴纳月之间
|
||||
Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, socialPO.getSocialStartTime(), socialPO.getSocialEndTime());
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -18,6 +18,11 @@ public class WeaTableColumnGroup extends WeaTableColumn {
|
|||
*/
|
||||
private Integer pattern;
|
||||
|
||||
/**
|
||||
* 字段类型
|
||||
*/
|
||||
private String dataType;
|
||||
|
||||
private List<WeaTableColumnGroup> children;
|
||||
|
||||
public WeaTableColumnGroup() {
|
||||
|
|
@ -40,6 +45,13 @@ public class WeaTableColumnGroup extends WeaTableColumn {
|
|||
this.pattern = pattern;
|
||||
}
|
||||
|
||||
public WeaTableColumnGroup(String width, String text, String column, String lockStatus, Integer pattern, String dataType) {
|
||||
super(width, text, column);
|
||||
this.lockStatus = lockStatus;
|
||||
this.pattern = pattern;
|
||||
this.dataType = dataType;
|
||||
}
|
||||
|
||||
|
||||
public WeaTableColumnGroup(String width, String text, String column, List<WeaTableColumnGroup> children) {
|
||||
super(width, text, column);
|
||||
|
|
|
|||
|
|
@ -75,6 +75,11 @@ public class SzyhApiConstant {
|
|||
*/
|
||||
public static final String UPDATE_DECLARE = "/gateway/iit/report/correct";
|
||||
|
||||
/**
|
||||
* 撤销更正申报
|
||||
*/
|
||||
public static final String CANCEL_CORRECT = "gateway/iit/report/cancelCorrect";
|
||||
|
||||
/**
|
||||
* 税局端申报状态查询
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
package com.engine.salary.entity.employeedeclare.bo;
|
||||
|
||||
import com.engine.salary.entity.employeedeclare.dto.EmployeeDeclareExcelDTO;
|
||||
import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
|
||||
import com.engine.salary.enums.employeedeclare.CardTypeEnum;
|
||||
import com.engine.salary.exception.SalaryRunTimeException;
|
||||
import com.engine.salary.util.SalaryDateUtil;
|
||||
import com.engine.salary.util.SalaryI18nUtil;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
/**
|
||||
* @author Harryxzy
|
||||
* @ClassName EmployeeDeclareBO
|
||||
* @date 2023/12/27 14:13
|
||||
* @description
|
||||
*/
|
||||
public class EmployeeDeclareBO {
|
||||
|
||||
public static EmployeeDeclarePO convert2PO(EmployeeDeclareExcelDTO dto) {
|
||||
if (dto == null) {
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "参数错误"));
|
||||
}
|
||||
EmployeeDeclarePO po = EmployeeDeclarePO.builder()
|
||||
.jobNum(dto.getJobNum())
|
||||
.employeeName(dto.getEmployeeName())
|
||||
.cardType(dto.getCardType() == null ? null :CardTypeEnum.RESIDENT_IDENTITY_CARDS.getValue())
|
||||
.cardNum(dto.getCardNum())
|
||||
.employmentStatus(StringUtils.isBlank(dto.getEmploymentStatus()) ? null : new Integer(dto.getEmploymentStatus()))
|
||||
.employmentType(StringUtils.isBlank(dto.getEmploymentType()) ? null : new Integer(dto.getEmploymentType()))
|
||||
.employmentFirstYear(dto.getEmploymentFirstYear())
|
||||
.mobile(dto.getMobile())
|
||||
.employmentDate(StringUtils.isBlank(dto.getEmploymentDate()) ? null : SalaryDateUtil.stringToDate(dto.getEmploymentDate()) )
|
||||
.dismissDate(StringUtils.isBlank(dto.getDismissDate()) ? null : SalaryDateUtil.stringToDate(dto.getDismissDate()))
|
||||
.disability(dto.getDisability())
|
||||
.disabilityCardNo(dto.getDisabilityCardNo())
|
||||
.martyrDependents(dto.getMartyrDependents())
|
||||
.martyrDependentsCardNo(dto.getMartyrDependentsCardNo())
|
||||
.lonelyOld(dto.getLonelyOld())
|
||||
.deductExpenses(dto.getDeductExpenses())
|
||||
.gender(StringUtils.isBlank(dto.getGender()) ? null : new Integer(dto.getGender()))
|
||||
.birthday(StringUtils.isBlank(dto.getBirthday()) ? null : SalaryDateUtil.stringToDate(dto.getBirthday()))
|
||||
.build();
|
||||
return po;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -105,7 +105,7 @@ public class EmployeeDeclareRefresh {
|
|||
}
|
||||
EmployeeDeclarePO employeeDeclare = initEmployeeDeclare(dto.getTaxAgentId(), dto.getTaxCycle(), now, employeeId);
|
||||
DataCollectionEmployee simpleUserInfo = simpleUserInfoMap.get(hrmEmployeeComInfo.getEmployeeId());
|
||||
String idNum = simpleUserInfo == null ? "" : simpleUserInfo.getIdNo();
|
||||
String idNum = simpleUserInfo != null && simpleUserInfo.getIdNo() != null ? simpleUserInfo.getIdNo().toUpperCase() : "";
|
||||
employeeDeclare.setEmployeeId(hrmEmployeeComInfo.getEmployeeId());
|
||||
employeeDeclare.setEmployeeType(EmployeeTypeEnum.ORGANIZATION.getValue());
|
||||
employeeDeclare.setEmployeeName(hrmEmployeeComInfo.getUsername());
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
package com.engine.salary.entity.employeedeclare.dto;
|
||||
|
||||
import com.engine.salary.annotation.SalaryTable;
|
||||
import com.engine.salary.annotation.SalaryTableColumn;
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
|
||||
import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 人员报送（人员）列表
|
||||
* <p>Copyright: Copyright (c) 2023</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Accessors(chain = true)
|
||||
@SalaryTable(pageId = "a4f89287-289scf07669d7a23de0ef8u8s2710oe7")
|
||||
public class EmployeeDeclareExcelDTO {
|
||||
|
||||
// 主键id
|
||||
private Long id;
|
||||
|
||||
// 人员ID
|
||||
private Long employeeId;
|
||||
|
||||
// 人员类型
|
||||
private EmployeeTypeEnum employeeType;
|
||||
|
||||
|
||||
// 姓名
|
||||
@SalaryTableColumn(text = "姓名", width = "10%", column = "employeeName")
|
||||
@TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
|
||||
private String employeeName;
|
||||
|
||||
// 分部
|
||||
@SalaryTableColumn(text = "分部", width = "10%", column = "subCompanyName")
|
||||
@TableTitle(title = "分部", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
private String subCompanyName;
|
||||
|
||||
// 部门
|
||||
@SalaryTableColumn(text = "部门", width = "10%", column = "departmentName")
|
||||
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
|
||||
private String departmentName;
|
||||
|
||||
// 个税扣缴义务人
|
||||
@SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName")
|
||||
@TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
|
||||
private String taxAgentName;
|
||||
|
||||
// 工号
|
||||
@SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
|
||||
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
// 证件类型
|
||||
@SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType")
|
||||
@TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
|
||||
private String cardType;
|
||||
|
||||
// 证件号码
|
||||
@SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum")
|
||||
@TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
// 性别
|
||||
@SalaryTableColumn(text = "性别", width = "10%", column = "gender")
|
||||
@TableTitle(title = "性别", dataIndex = "gender", key = "gender")
|
||||
private String gender;
|
||||
|
||||
// 出生日期
|
||||
@SalaryTableColumn(text = "出生日期", width = "10%", column = "birthday")
|
||||
@TableTitle(title = "出生日期", dataIndex = "birthday", key = "birthday")
|
||||
private String birthday;
|
||||
|
||||
// 人员状态
|
||||
@SalaryTableColumn(text = "人员状态", width = "10%", column = "employmentStatus")
|
||||
@TableTitle(title = "人员状态", dataIndex = "employmentStatus", key = "employmentStatus")
|
||||
private String employmentStatus;
|
||||
|
||||
// 手机号码
|
||||
@SalaryTableColumn(text = "手机号码", width = "10%", column = "mobile")
|
||||
@TableTitle(title = "手机号码", dataIndex = "mobile", key = "mobile")
|
||||
private String mobile;
|
||||
|
||||
// 任职受雇从业类型
|
||||
@SalaryTableColumn(text = "任职受雇从业类型", width = "10%", column = "employmentType")
|
||||
@TableTitle(title = "任职受雇从业类型", dataIndex = "employmentType", key = "employmentType")
|
||||
private String employmentType;
|
||||
|
||||
// 任职受雇从业日期
|
||||
@SalaryTableColumn(text = "任职受雇从业日期", width = "10%", column = "employmentDate")
|
||||
@TableTitle(title = "任职受雇从业日期", dataIndex = "employmentDate", key = "employmentDate")
|
||||
private String employmentDate;
|
||||
|
||||
// 入职年度就业情形
|
||||
private String employmentFirstYear;
|
||||
|
||||
|
||||
// 离职日期
|
||||
@SalaryTableColumn(text = "离职日期", width = "10%", column = "dismissDate")
|
||||
@TableTitle(title = "离职日期", dataIndex = "dismissDate", key = "dismissDate")
|
||||
private String dismissDate;
|
||||
|
||||
// 是否残疾
|
||||
private Integer disability;
|
||||
|
||||
// 残疾证号
|
||||
private String disabilityCardNo;
|
||||
|
||||
// 是否孤老
|
||||
private Integer lonelyOld;
|
||||
|
||||
// 是否是烈属
|
||||
private Integer martyrDependents;
|
||||
|
||||
// 烈属证号
|
||||
private String martyrDependentsCardNo;
|
||||
|
||||
// 是否扣除减除费用
|
||||
private Integer deductExpenses;
|
||||
|
||||
// 申报状态
|
||||
private DeclareStatusEnum declareStatus;
|
||||
|
||||
// 申报状态
|
||||
@SalaryTableColumn(text = "申报状态", width = "10%", column = "declareStatusDesc")
|
||||
@TableTitle(title = "申报状态", dataIndex = "declareStatusDesc", key = "declareStatusDesc")
|
||||
private String declareStatusDesc;
|
||||
|
||||
// 申报失败原因
|
||||
private String declareErrorMsg;
|
||||
|
||||
// 编辑过的字段
|
||||
private Set<String> updatedDataIndexSet;
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@ import com.engine.salary.annotation.SalaryTableColumn;
|
|||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
|
||||
import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum;
|
||||
import com.engine.salary.util.excel.ExcelHead;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
|
@ -42,72 +43,86 @@ public class EmployeeDeclareListDTO {
|
|||
// 姓名
|
||||
@SalaryTableColumn(text = "姓名", width = "10%", column = "employeeName")
|
||||
@TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
|
||||
@ExcelHead(title = "姓名", dataIndex = "employeeName")
|
||||
private String employeeName;
|
||||
|
||||
// 分部
|
||||
@SalaryTableColumn(text = "分部", width = "10%", column = "subCompanyName")
|
||||
@TableTitle(title = "分部", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
@ExcelHead(title = "分部", dataIndex = "subCompanyName")
|
||||
private String subCompanyName;
|
||||
|
||||
// 部门
|
||||
@SalaryTableColumn(text = "部门", width = "10%", column = "departmentName")
|
||||
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
|
||||
@ExcelHead(title = "部门", dataIndex = "departmentName")
|
||||
private String departmentName;
|
||||
|
||||
// 个税扣缴义务人
|
||||
@SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName")
|
||||
@TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
|
||||
@ExcelHead(title = "个税扣缴义务人", dataIndex = "taxAgentName")
|
||||
private String taxAgentName;
|
||||
|
||||
// 工号
|
||||
@SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
|
||||
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
|
||||
@ExcelHead(title = "工号", dataIndex = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
// 证件类型
|
||||
@SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType")
|
||||
@TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
|
||||
@ExcelHead(title = "证件类型", dataIndex = "cardType")
|
||||
private String cardType;
|
||||
|
||||
// 证件号码
|
||||
@SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum")
|
||||
@TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
|
||||
@ExcelHead(title = "证件号码", dataIndex = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
// 性别
|
||||
@SalaryTableColumn(text = "性别", width = "10%", column = "gender")
|
||||
@TableTitle(title = "性别", dataIndex = "gender", key = "gender")
|
||||
@ExcelHead(title = "性别", dataIndex = "gender")
|
||||
private String gender;
|
||||
|
||||
// 出生日期
|
||||
@SalaryTableColumn(text = "出生日期", width = "10%", column = "birthday")
|
||||
@TableTitle(title = "出生日期", dataIndex = "birthday", key = "birthday")
|
||||
@ExcelHead(title = "出生日期", dataIndex = "birthday")
|
||||
private String birthday;
|
||||
|
||||
// 人员状态
|
||||
@SalaryTableColumn(text = "人员状态", width = "10%", column = "employmentStatus")
|
||||
@TableTitle(title = "人员状态", dataIndex = "employmentStatus", key = "employmentStatus")
|
||||
@ExcelHead(title = "人员状态", dataIndex = "employmentStatus")
|
||||
private String employmentStatus;
|
||||
|
||||
// 手机号码
|
||||
@SalaryTableColumn(text = "手机号码", width = "10%", column = "mobile")
|
||||
@TableTitle(title = "手机号码", dataIndex = "mobile", key = "mobile")
|
||||
@ExcelHead(title = "手机号码", dataIndex = "mobile")
|
||||
private String mobile;
|
||||
|
||||
// 任职受雇从业类型
|
||||
@SalaryTableColumn(text = "任职受雇从业类型", width = "10%", column = "employmentType")
|
||||
@TableTitle(title = "任职受雇从业类型", dataIndex = "employmentType", key = "employmentType")
|
||||
@ExcelHead(title = "任职受雇从业类型", dataIndex = "employmentType")
|
||||
private String employmentType;
|
||||
|
||||
// 任职受雇从业日期
|
||||
@SalaryTableColumn(text = "任职受雇从业日期", width = "10%", column = "employmentDate")
|
||||
@TableTitle(title = "任职受雇从业日期", dataIndex = "employmentDate", key = "employmentDate")
|
||||
@ExcelHead(title = "任职受雇从业日期", dataIndex = "employmentDate")
|
||||
private String employmentDate;
|
||||
|
||||
|
||||
// 离职日期
|
||||
@SalaryTableColumn(text = "离职日期", width = "10%", column = "dismissDate")
|
||||
@TableTitle(title = "离职日期", dataIndex = "dismissDate", key = "dismissDate")
|
||||
@ExcelHead(title = "离职日期", dataIndex = "dismissDate")
|
||||
private String dismissDate;
|
||||
|
||||
// 申报状态
|
||||
|
|
@ -116,6 +131,7 @@ public class EmployeeDeclareListDTO {
|
|||
// 申报状态
|
||||
@SalaryTableColumn(text = "申报状态", width = "10%", column = "declareStatusDesc")
|
||||
@TableTitle(title = "申报状态", dataIndex = "declareStatusDesc", key = "declareStatusDesc")
|
||||
@ExcelHead(title = "申报状态", dataIndex = "declareStatusDesc")
|
||||
private String declareStatusDesc;
|
||||
|
||||
// 申报失败原因
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
package com.engine.salary.entity.employeedeclare.param;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 人员报送（人员）导入参数
|
||||
* <p>Copyright: Copyright (c) 2023</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class EmployeeDeclareImportEmployeeParam {
|
||||
//上传文件id
|
||||
String imageId;
|
||||
|
||||
Long taxAgentId;
|
||||
|
||||
Date taxCycle;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
package com.engine.salary.entity.employeedeclare.param;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @description: 人员报送导入参数
|
||||
* @author: xiajun
|
||||
* @modified By: xiajun
|
||||
* @date: Created in 2022/11/21 4:58 PM
|
||||
* @version:v1.0
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeDeclareImportParam extends EmployeeDeclareListQueryParam {
|
||||
|
||||
@ApiModelProperty("是否导出现有数据")
|
||||
private String exportData;
|
||||
|
||||
//上传文件id
|
||||
String imageId;
|
||||
|
||||
// 校验字段
|
||||
private String checkType;
|
||||
|
||||
// 个税扣义务人id
|
||||
private Long taxAgentId;
|
||||
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@ public class EmployeeDeclareListQueryParam extends BaseQueryParam {
|
|||
|
||||
// 员工姓名/编号
|
||||
private String keyword;
|
||||
private Long employeeId;
|
||||
|
||||
// 部门
|
||||
private Collection<Long> departmentIds;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ public class SalaryAcctResultReportBO {
|
|||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
||||
public static List<SalaryAcctResultReportPO> convert2ReportPO(Collection<SalaryAcctResultTempPO> temps, Map<Long, DataCollectionEmployee> emps) {
|
||||
// Map<Long, DataCollectionEmployee> longDataCollectionEmployeeMap = SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId);
|
||||
if (CollectionUtils.isEmpty(temps)) {
|
||||
|
|
|
|||
|
|
@ -167,6 +167,8 @@ public class SalaryTemplateBO {
|
|||
.id(String.valueOf(e.getSalaryItemId()))
|
||||
.salaryItemId(String.valueOf(e.getSalaryItemId()))
|
||||
.name(e.getName())
|
||||
.salaryItemShowName(e.getName())
|
||||
.originName(e.getName())
|
||||
.sortedIndex(e.getSortedIndex())
|
||||
.build()
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.engine.salary.entity.salaryacct.bo;
|
||||
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import com.engine.salary.annotation.SalaryFormulaVar;
|
||||
import com.engine.salary.common.LocalDateRange;
|
||||
import com.engine.salary.constant.SalaryFormulaFieldConstant;
|
||||
|
|
@ -18,6 +19,7 @@ import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentDataDTO;
|
|||
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
|
||||
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
|
||||
import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO;
|
||||
import com.engine.salary.enums.UserStatusEnum;
|
||||
import com.engine.salary.enums.salaryformula.SalaryFormulaReferenceEnum;
|
||||
import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum;
|
||||
import com.engine.salary.enums.salarysob.SalarySobAdjustRuleTypeEnum;
|
||||
|
|
@ -562,6 +564,10 @@ public class CalculateFormulaVarBO {
|
|||
}
|
||||
// 填充到返回结果集中
|
||||
employeeMap.forEach((key, po) -> {
|
||||
// 获取po的状态
|
||||
if(po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) {
|
||||
po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(po.getStatus())));
|
||||
}
|
||||
List<FormulaVarValue> formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList());
|
||||
Map<String, String> map = JsonUtil.parseMap(po, String.class);
|
||||
formulaVarValues.addAll(fieldNames.stream().map(fieldName -> {
|
||||
|
|
|
|||
|
|
@ -23,9 +23,11 @@ import com.engine.salary.enums.salaryaccounting.LockStatusEnum;
|
|||
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
|
||||
import com.engine.salary.util.SalaryEntityUtil;
|
||||
import com.engine.salary.util.SalaryI18nUtil;
|
||||
import com.engine.salary.util.page.SalaryPageUtil;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
|
@ -85,7 +87,6 @@ public class SalaryAcctResultBO {
|
|||
// }
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 构建薪资核算结果列表的表头（线下对比）
|
||||
*
|
||||
|
|
@ -170,7 +171,7 @@ public class SalaryAcctResultBO {
|
|||
List<WeaTableColumnGroup> columns = Lists.newArrayList();
|
||||
// 员工信息字段
|
||||
for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
|
||||
columns.add(new WeaTableColumnGroup("150", salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
|
||||
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName(), 0), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
|
||||
}
|
||||
// 薪资项目分组下的薪资项目
|
||||
for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {
|
||||
|
|
@ -180,29 +181,29 @@ public class SalaryAcctResultBO {
|
|||
List<WeaTableColumnGroup> childrenColumns = Lists.newArrayList();
|
||||
for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) {
|
||||
if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
|
||||
childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern()));
|
||||
childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
|
||||
} else {
|
||||
childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern()));
|
||||
childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
|
||||
}
|
||||
}
|
||||
WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup("150", salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns);
|
||||
WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemGroupDTO.getName(), 0), salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns);
|
||||
columns.add(weaTableColumnWapper);
|
||||
}
|
||||
// 没有分类的薪资项目
|
||||
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) {
|
||||
if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
|
||||
columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern()));
|
||||
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
|
||||
} else {
|
||||
columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern()));
|
||||
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
|
||||
}
|
||||
|
||||
}
|
||||
// 回算的薪资项目
|
||||
for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getBackCalcItems()) {
|
||||
if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) {
|
||||
columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern()));
|
||||
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), 0), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
|
||||
} else {
|
||||
columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern()));
|
||||
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), 0), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -462,7 +463,8 @@ public class SalaryAcctResultBO {
|
|||
List<SalarySobBackItemPO> salarySobBackItemPOS,
|
||||
List<SalaryItemPO> salaryBackItemPOS,
|
||||
Map<Long, String> salaryBackItemFormula,
|
||||
Map<String, SalaryAcctResultListColumnDTO> formulaContentMap) {
|
||||
Map<String, SalaryAcctResultListColumnDTO> formulaContentMap,
|
||||
List<Long> lockItems) {
|
||||
|
||||
// 员工信息字段
|
||||
Map<String, String> employeeFieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(simpleEmployee);
|
||||
|
|
@ -487,24 +489,24 @@ public class SalaryAcctResultBO {
|
|||
sortItem(salarySobItemPOMap);
|
||||
// 根据账套分组封装薪资项目的值
|
||||
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO> itemsByGroup = new ArrayList<>();
|
||||
for(SalarySobItemGroupPO groupPO : salarySobItemGroupPOS){
|
||||
List<SalarySobItemPO> groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(),Collections.emptyList());
|
||||
if(CollectionUtils.isNotEmpty(groupItems)){
|
||||
for (SalarySobItemGroupPO groupPO : salarySobItemGroupPOS) {
|
||||
List<SalarySobItemPO> groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(), Collections.emptyList());
|
||||
if (CollectionUtils.isNotEmpty(groupItems)) {
|
||||
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> items = groupItems.stream()
|
||||
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap))
|
||||
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, lockItems))
|
||||
.collect(Collectors.toList());
|
||||
itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder()
|
||||
.salarySobItemGroupId(groupPO.getId())
|
||||
.salarySobItemGroupName(groupPO.getName())
|
||||
.salaryItems(items)
|
||||
.sortedIndex(groupPO.getSortedIndex()).build() );
|
||||
.sortedIndex(groupPO.getSortedIndex()).build());
|
||||
}
|
||||
}
|
||||
// 未分类
|
||||
List<SalarySobItemPO> noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList());
|
||||
if(CollectionUtils.isNotEmpty(noGroupItems)){
|
||||
if (CollectionUtils.isNotEmpty(noGroupItems)) {
|
||||
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> items = noGroupItems.stream()
|
||||
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap))
|
||||
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, lockItems))
|
||||
.collect(Collectors.toList());
|
||||
itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder()
|
||||
.salarySobItemGroupId(0L)
|
||||
|
|
@ -514,7 +516,6 @@ public class SalaryAcctResultBO {
|
|||
}
|
||||
|
||||
|
||||
|
||||
// // 公式项的值（不根据salaryItemPO的valueType判断是因为薪资项目的valueType属性改变后并不会同步更新薪资账套中的薪资项目的formulaId字段）
|
||||
// List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> formulaItems = salarySobItemPOS.stream()
|
||||
// .filter(salarySobItemPO -> salarySobItemPO.getFormulaId() > 0)
|
||||
|
|
@ -545,7 +546,7 @@ public class SalaryAcctResultBO {
|
|||
}
|
||||
|
||||
public static List<SalarySobItemGroupPO> sortGroup(List<SalarySobItemGroupPO> salarySobItemGroupPOS) {
|
||||
if(CollectionUtils.isEmpty(salarySobItemGroupPOS)){
|
||||
if (CollectionUtils.isEmpty(salarySobItemGroupPOS)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return salarySobItemGroupPOS.stream().sorted(Comparator.comparingInt(SalarySobItemGroupPO::getSortedIndex)).collect(Collectors.toList());
|
||||
|
|
@ -553,10 +554,9 @@ public class SalaryAcctResultBO {
|
|||
|
||||
/**
|
||||
* 薪资账套的薪资项目按照sortedIndex排序
|
||||
*
|
||||
*/
|
||||
public static void sortItem(Map<Long, List<SalarySobItemPO>> salarySobItemPOMap) {
|
||||
for(Map.Entry<Long, List<SalarySobItemPO>> entry : salarySobItemPOMap.entrySet()){
|
||||
for (Map.Entry<Long, List<SalarySobItemPO>> entry : salarySobItemPOMap.entrySet()) {
|
||||
List<SalarySobItemPO> items = entry.getValue();
|
||||
if (CollectionUtils.isNotEmpty(items)) {
|
||||
List<SalarySobItemPO> sortedValue = items.stream().sorted(Comparator.comparingInt(SalarySobItemPO::getSortedIndex)).collect(Collectors.toList());
|
||||
|
|
@ -576,13 +576,14 @@ public class SalaryAcctResultBO {
|
|||
private static SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO convert2SalaryAcctResultDetailItemDTO(SalarySobItemPO salarySobItemPO,
|
||||
SalaryItemPO salaryItemPO,
|
||||
Map<Long, String> resultValueMap,
|
||||
Map<String, SalaryAcctResultListColumnDTO> formulaContentMap) {
|
||||
Map<String, SalaryAcctResultListColumnDTO> formulaContentMap,
|
||||
List<Long> lockItems) {
|
||||
|
||||
SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(Optional.ofNullable(salarySobItemPO).map(SalarySobItemPO::getValueType).orElse(0));
|
||||
String itemFormulaContent;
|
||||
if(Objects.equals(salaryValueTypeEnum.getValue(),SalaryValueTypeEnum.FORMULA.getValue())){
|
||||
if (Objects.equals(salaryValueTypeEnum.getValue(), SalaryValueTypeEnum.FORMULA.getValue())) {
|
||||
itemFormulaContent = Optional.ofNullable(formulaContentMap.get(salarySobItemPO.getSalaryItemId().toString())).map(SalaryAcctResultListColumnDTO::getFormulaContent).orElse("");
|
||||
}else{
|
||||
} else {
|
||||
itemFormulaContent = salaryValueTypeEnum == null ? "" : salaryValueTypeEnum.getDefaultLabel();
|
||||
}
|
||||
|
||||
|
|
@ -596,6 +597,7 @@ public class SalaryAcctResultBO {
|
|||
// .canEdit(Objects.equals(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getUseInEmployeeSalary).orElse(0), 0))
|
||||
.canEdit(true)
|
||||
.pattern(salarySobItemPO.getPattern())
|
||||
.lockStatus(lockItems.contains(salarySobItemPO.getSalaryItemId()) ? LockStatusEnum.LOCK.getValue() : LockStatusEnum.UNLOCK.getValue())
|
||||
.build();
|
||||
}
|
||||
|
||||
|
|
@ -662,6 +664,34 @@ public class SalaryAcctResultBO {
|
|||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
||||
public static List<SalaryAcctResultPO> batchEditConvert2PO(Map<String, String> salaryAcctResultOldPOMap,
|
||||
List<SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam> items,
|
||||
SalaryAcctEmployeePO salaryAcctEmployee,
|
||||
Long employeeId) {
|
||||
if (CollectionUtils.isEmpty(items) || ObjectUtils.isEmpty(salaryAcctEmployee)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
Date now = new Date();
|
||||
return items.stream()
|
||||
.map(e -> SalaryAcctResultPO.builder()
|
||||
.salarySobId(salaryAcctEmployee.getSalarySobId())
|
||||
.salaryItemId(e.getSalaryItemId())
|
||||
.salaryAcctRecordId(salaryAcctEmployee.getSalaryAcctRecordId())
|
||||
.salaryAcctEmpId(salaryAcctEmployee.getId())
|
||||
.employeeId(salaryAcctEmployee.getEmployeeId())
|
||||
.taxAgentId(salaryAcctEmployee.getTaxAgentId())
|
||||
.resultValue(StringUtils.trim(e.getResultValue()))
|
||||
.originResultValue(salaryAcctResultOldPOMap.get(salaryAcctEmployee.getId() + "-" + e.getSalaryItemId()))
|
||||
.creator(employeeId)
|
||||
.createTime(now)
|
||||
.updateTime(now)
|
||||
.deleteType(NumberUtils.INTEGER_ZERO)
|
||||
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
|
||||
.build())
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public static Map<String, String> buildEmployeeFieldName() {
|
||||
Field[] declaredFields = SalaryFormulaEmployeeDTO.class.getDeclaredFields();
|
||||
Map<String, String> employeeFieldNameMap = Maps.newHashMapWithExpectedSize(declaredFields.length);
|
||||
|
|
|
|||
|
|
@ -72,6 +72,9 @@ public class SalaryAcctResultDetailDTO {
|
|||
|
||||
// 保留小数位数
|
||||
private Integer pattern;
|
||||
|
||||
// 锁定状态
|
||||
private String lockStatus;
|
||||
}
|
||||
|
||||
@Data
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
package com.engine.salary.entity.salaryacct.param;
|
||||
|
||||
import com.engine.salary.util.valid.DataCheck;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ClassName SalaryAcctResultBatchUpdateParam
|
||||
* @author Harryxzy
|
||||
* @date 2023/12/4 13:48
|
||||
* @description 批量更新参数
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SalaryAcctResultBatchUpdateParam {
|
||||
|
||||
//薪资核算记录的id
|
||||
@DataCheck(require = true, message = "薪资核算记录ID不得为空")
|
||||
private Long salaryAcctRecordId;
|
||||
|
||||
//薪资项目的Id
|
||||
@DataCheck(require = true, message = "薪资项目id不得为空")
|
||||
private Long salaryItemId;
|
||||
|
||||
// 薪资核算人员id
|
||||
private List<Long> idList;
|
||||
|
||||
//薪资项目值
|
||||
private String value;
|
||||
|
||||
}
|
||||
|
|
@ -10,6 +10,7 @@ import lombok.Data;
|
|||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -88,4 +89,25 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
|
|||
*/
|
||||
private boolean extSalaryArchiveList;
|
||||
|
||||
|
||||
private String payStartDateStartDateStr;
|
||||
private String payStartDateEndDateStr;
|
||||
|
||||
// 起始发薪日期起
|
||||
private Date payStartDateStartDate;
|
||||
|
||||
// 起始发薪日期止
|
||||
private Date payStartDateEndDate;
|
||||
|
||||
// 最后发薪日期起
|
||||
private String payEndDateStartDateStr;
|
||||
// 最后发薪日期止
|
||||
private String payEndDateEndDateStr;
|
||||
|
||||
// 最后发薪日期起
|
||||
private Date payEndDateStartDate;
|
||||
|
||||
// 最后发薪日期止
|
||||
private Date payEndDateEndDate;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ public class SalaryItemBO {
|
|||
.description(salaryItemPO.getDescription())
|
||||
.canDelete(true)
|
||||
.canEdit(openFormulaForcedEditing ||Objects.equals(salaryItemPO.getCanEdit(), NumberUtils.INTEGER_ONE))
|
||||
.width(salaryItemPO.getWidth())
|
||||
.build();
|
||||
}
|
||||
).collect(Collectors.toList());
|
||||
|
|
@ -200,7 +201,8 @@ public class SalaryItemBO {
|
|||
.setCanEdit(salaryItemPO.getCanEdit())
|
||||
.setTaxAgentIds(salaryItemPO.getTaxAgentIds())
|
||||
.setSharedType(salaryItemPO.getSharedType())
|
||||
.setSortedIndex(salaryItemPO.getSortedIndex());
|
||||
.setSortedIndex(salaryItemPO.getSortedIndex())
|
||||
.setWidth(salaryItemPO.getWidth());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -280,6 +282,7 @@ public class SalaryItemBO {
|
|||
.sharedType(Optional.ofNullable(saveParam.getSharedType()).orElse(0))
|
||||
.taxAgentIds(saveParam.getTaxAgentIds())
|
||||
.sortedIndex(saveParam.getSortedIndex())
|
||||
.width(saveParam.getWidth())
|
||||
.build();
|
||||
// 开启了"薪资档案引用"，取值方式固定为输入
|
||||
// if (Objects.equals(saveParam.getUseInEmployeeSalary(), NumberUtils.INTEGER_ONE)) {
|
||||
|
|
|
|||
|
|
@ -95,4 +95,7 @@ public class SalaryItemFormDTO {
|
|||
private String taxAgentIds;
|
||||
|
||||
private Integer sortedIndex;
|
||||
|
||||
// 宽度
|
||||
private Integer width;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,6 +105,9 @@ public class SalaryItemListDTO {
|
|||
@TableTitle(title = "显示顺序",dataIndex = "sortedIndex",key = "sortedIndex")
|
||||
private Integer sortedIndex;
|
||||
|
||||
// 宽度
|
||||
private Integer width;
|
||||
|
||||
@SalaryTableColumn(text = "操作", width = "20%", column = "operate")
|
||||
private String operate;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class SalaryItemSaveParam {
|
|||
private Integer roundingMode;
|
||||
|
||||
//保留小数位
|
||||
@DataCheck(require = true, type = ValidTypeEnum.NUMBER, max = 6, message = "小数位最多为6")
|
||||
@DataCheck(require = true, type = ValidTypeEnum.NUMBER, max = 8, message = "小数位最多为8")
|
||||
private Integer pattern;
|
||||
|
||||
/**
|
||||
|
|
@ -102,4 +102,9 @@ public class SalaryItemSaveParam {
|
|||
* 排序
|
||||
*/
|
||||
private Integer sortedIndex;
|
||||
|
||||
/**
|
||||
* 宽度
|
||||
*/
|
||||
private Integer width;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -159,4 +159,9 @@ public class SalaryItemPO {
|
|||
* 排序
|
||||
*/
|
||||
private Integer sortedIndex;
|
||||
|
||||
/**
|
||||
* 宽度
|
||||
*/
|
||||
private Integer width;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import com.engine.salary.util.SalaryI18nUtil;
|
|||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
|
|
@ -32,6 +33,7 @@ import java.util.stream.Collectors;
|
|||
* @version 1.0
|
||||
**/
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SalarySobItemAggregateBO {
|
||||
|
||||
/**
|
||||
|
|
@ -148,6 +150,7 @@ public class SalarySobItemAggregateBO {
|
|||
.sortedIndex(salarySobItemPO.getSortedIndex())
|
||||
.canEdit(openFormulaForcedEditing || Objects.equals(salaryItemPO.getCanEdit(), 1))
|
||||
.canDelete(openFormulaForcedEditing || salaryItemPO.getCanDelete() == null || Objects.equals(salaryItemPO.getCanDelete(), 1))
|
||||
.width(salaryItemPO.getWidth())
|
||||
.build());
|
||||
}
|
||||
}
|
||||
|
|
@ -213,7 +216,7 @@ public class SalarySobItemAggregateBO {
|
|||
* @param salarySobEmpFields 薪资账套的员工信息字段
|
||||
* @return
|
||||
*/
|
||||
private List<SalarySobEmpFieldDTO> buildEmpField(Collection<SalarySobEmpFieldPO> salarySobEmpFields) {
|
||||
public List<SalarySobEmpFieldDTO> buildEmpField(Collection<SalarySobEmpFieldPO> salarySobEmpFields) {
|
||||
if (CollectionUtils.isEmpty(salarySobEmpFields)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,4 +113,7 @@ public class SalarySobItemDTO {
|
|||
* 保留小数位数
|
||||
*/
|
||||
private Integer pattern;
|
||||
|
||||
// 显示宽度
|
||||
private Integer width;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ public class SalarySobItemFormDTO {
|
|||
private Integer roundingMode;
|
||||
|
||||
//保留小数位")
|
||||
@DataCheck(require = true, type = ValidTypeEnum.NUMBER, max = 6, message = "小数位最多为6")
|
||||
@DataCheck(require = true, type = ValidTypeEnum.NUMBER, max = 8, message = "小数位最多为8")
|
||||
private Integer pattern;
|
||||
|
||||
//取值方式")
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public class InsuranceComparisonResultBO {
|
|||
* 构建福利核算结果列表的表头（线下对比）
|
||||
*
|
||||
*/
|
||||
public static List<Column> buildTableColumns4ComparisonResult(Set<Long> insuranceBaseSet, Set<Long> insurancePerPaySet, Set<Long> insuranceComPaySet) {
|
||||
public static List<Column> buildTableColumns4ComparisonResult(Set<Long> insuranceBaseSet, Set<Long> insurancePerPaySet, Set<Long> insuranceComPaySet, boolean welBaseDiffSign) {
|
||||
|
||||
List<ICategoryPO> listAll = MapperProxyFactory.getProxy(ICategoryMapper.class).listAll();
|
||||
List<ICategoryPO> socialWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList());
|
||||
|
|
@ -67,21 +67,63 @@ public class InsuranceComparisonResultBO {
|
|||
columns.add(new Column("社保账号", "socialAccount", "socialAccount"));
|
||||
columns.add(new Column("社保方案名称", "socialSchemeName", "socialSchemeName"));
|
||||
//组装社保基数
|
||||
for (ICategoryPO po : socialWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "socialBase", po.getId() + "socialBase"));
|
||||
if (welBaseDiffSign) {
|
||||
List<Column> socialComColumns = Lists.newArrayList();
|
||||
for (ICategoryPO po : socialWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
|
||||
, po.getId() + "socialPerBase", po.getId() + "socialPerBase"));
|
||||
socialComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
|
||||
, po.getId() + "socialComBase", po.getId() + "socialComBase"));
|
||||
}
|
||||
columns.addAll(socialComColumns);
|
||||
} else {
|
||||
for (ICategoryPO po : socialWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "socialBase", po.getId() + "socialBase"));
|
||||
}
|
||||
}
|
||||
// for (ICategoryPO po : socialWelfareList) {
|
||||
// columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "socialBase", po.getId() + "socialBase"));
|
||||
// }
|
||||
columns.add(new Column("公积金账号", "fundAccount", "fundAccount"));
|
||||
columns.add(new Column("公积金方案名称", "fundSchemeName", "fundSchemeName"));
|
||||
//组装公积金基数
|
||||
for (ICategoryPO po : fundWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase"));
|
||||
if (welBaseDiffSign) {
|
||||
List<Column> fundComColumns = Lists.newArrayList();
|
||||
for (ICategoryPO po : fundWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
|
||||
, po.getId() + "fundPerBase", po.getId() + "fundPerBase"));
|
||||
fundComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
|
||||
, po.getId() + "fundComBase", po.getId() + "fundComBase"));
|
||||
}
|
||||
columns.addAll(fundComColumns);
|
||||
} else {
|
||||
for (ICategoryPO po : fundWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase"));
|
||||
}
|
||||
}
|
||||
// for (ICategoryPO po : fundWelfareList) {
|
||||
// columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase"));
|
||||
// }
|
||||
columns.add(new Column("补充公积金账号", "supplementFundAccount", "supplementFundAccount"));
|
||||
columns.add(new Column("其他福利方案名称", "otherSchemeName", "otherSchemeName"));
|
||||
//组装其他福利基数
|
||||
for (ICategoryPO po : otherWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase"));
|
||||
if (welBaseDiffSign) {
|
||||
List<Column> otherComColumns = Lists.newArrayList();
|
||||
for (ICategoryPO po : otherWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
|
||||
, po.getId() + "otherPerBase", po.getId() + "otherPerBase"));
|
||||
otherComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
|
||||
, po.getId() + "otherComBase", po.getId() + "otherComBase"));
|
||||
}
|
||||
columns.addAll(otherComColumns);
|
||||
} else {
|
||||
for (ICategoryPO po : otherWelfareList) {
|
||||
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase"));
|
||||
}
|
||||
}
|
||||
// for (ICategoryPO po : otherWelfareList) {
|
||||
// columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase"));
|
||||
// }
|
||||
|
||||
//社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人）
|
||||
for (ICategoryPO po : socialWelPerList) {
|
||||
|
|
@ -127,7 +169,8 @@ public class InsuranceComparisonResultBO {
|
|||
* 构建福利核算线下对比结果
|
||||
*
|
||||
*/
|
||||
public static List<Map<String, Object>> buildComparisonTableData(List<AccountExportPO> accountExportPOS, List<ExcelAccountExportPO> excelAccountExportPOS, Map<Long, String> schemeIdNameMap) {
|
||||
public static List<Map<String, Object>> buildComparisonTableData(List<AccountExportPO> accountExportPOS, List<ExcelAccountExportPO> excelAccountExportPOS
|
||||
, Map<Long, String> schemeIdNameMap, boolean welBaseDiffSign) {
|
||||
|
||||
Map<Long, List<ExcelAccountExportPO>> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getEmployeeId);
|
||||
// Map<String, List<AccountExportPO>> acctResultMap = SalaryEntityUtil.group2Map(accountExportPOS, AccountExportPO::getWorkcode);
|
||||
|
|
@ -177,12 +220,28 @@ public class InsuranceComparisonResultBO {
|
|||
if (excelResultValueList != null && excelResultValueList.size() == 1) {
|
||||
excelAccountExportPO = excelResultValueList.get(0);
|
||||
}
|
||||
//社保基数，socialPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "Base", 1);
|
||||
//公积金基数，fundPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getFundPaymentBaseString(), excelAccountExportPO.getFundPaymentBaseString(), "Base", 2);
|
||||
//其他福利基数，otherPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "Base", 3);
|
||||
if (welBaseDiffSign) {
|
||||
//社保基数-个人，socialPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "PerBase", 1);
|
||||
//公积金基数-个人，fundPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getFundPaymentBaseString(), excelAccountExportPO.getFundPaymentBaseString(), "PerBase", 2);
|
||||
//其他福利基数-个人，otherPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "PerBase", 3);
|
||||
|
||||
//社保基数-公司，socialPaymentComBaseString
|
||||
welfareElementCompare(map, accountExportPO.getSocialPaymentComBaseString(), excelAccountExportPO.getSocialPaymentComBaseString(), "ComBase", 1);
|
||||
//公积金基数-公司，fundPaymentComBaseString
|
||||
welfareElementCompare(map, accountExportPO.getFundPaymentComBaseString(), excelAccountExportPO.getFundPaymentComBaseString(), "ComBase", 2);
|
||||
//其他福利基数-公司，otherPaymentComBaseString
|
||||
welfareElementCompare(map, accountExportPO.getOtherPaymentComBaseString(), excelAccountExportPO.getOtherPaymentComBaseString(), "ComBase", 3);
|
||||
} else {
|
||||
//社保基数，socialPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "Base", 1);
|
||||
//公积金基数，fundPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getFundPaymentBaseString(), excelAccountExportPO.getFundPaymentBaseString(), "Base", 2);
|
||||
//其他福利基数，otherPaymentBaseString
|
||||
welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "Base", 3);
|
||||
}
|
||||
//社保个人socialPerJson
|
||||
welfareElementCompare(map, accountExportPO.getSocialPerJson(), excelAccountExportPO.getSocialPerJson(), "Per", 1);
|
||||
//公积金个人fundPerJson
|
||||
|
|
|
|||
|
|
@ -25,5 +25,6 @@ public class ExcelInsuranceImportParam {
|
|||
/**
|
||||
* 账单月份
|
||||
*/
|
||||
private String billMonth;
|
||||
private String billMonth;
|
||||
private String paymentOrganization;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,6 +101,12 @@ public class ExcelInsuranceDetailPO {
|
|||
@Encrypt
|
||||
private String socialPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 社保缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String socialPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 公积金方案ID
|
||||
*/
|
||||
|
|
@ -112,6 +118,12 @@ public class ExcelInsuranceDetailPO {
|
|||
@Encrypt
|
||||
private String fundPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 公积金缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String fundPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利方案id
|
||||
*/
|
||||
|
|
@ -123,6 +135,12 @@ public class ExcelInsuranceDetailPO {
|
|||
@Encrypt
|
||||
private String otherPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String otherPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 社保个人缴费明细
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -106,6 +106,12 @@ public class InsuranceAccountDetailPO {
|
|||
@Encrypt
|
||||
private String socialPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 社保缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String socialPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 公积金方案ID
|
||||
*/
|
||||
|
|
@ -117,6 +123,12 @@ public class InsuranceAccountDetailPO {
|
|||
@Encrypt
|
||||
private String fundPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 公积金缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String fundPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利方案id
|
||||
*/
|
||||
|
|
@ -128,6 +140,12 @@ public class InsuranceAccountDetailPO {
|
|||
@Encrypt
|
||||
private String otherPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String otherPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 社保个人缴费明细
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -102,6 +102,11 @@ public class InsuranceAccountDetailTempPO {
|
|||
@Encrypt
|
||||
private String socialPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 社保缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String socialPaymentComBaseString;
|
||||
/**
|
||||
* 公积金方案ID
|
||||
*/
|
||||
|
|
@ -113,6 +118,12 @@ public class InsuranceAccountDetailTempPO {
|
|||
@Encrypt
|
||||
private String fundPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 公积金缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String fundPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利方案id
|
||||
*/
|
||||
|
|
@ -124,6 +135,13 @@ public class InsuranceAccountDetailTempPO {
|
|||
@Encrypt
|
||||
private String otherPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String otherPaymentComBaseString;
|
||||
|
||||
|
||||
/**
|
||||
* 社保个人缴费明细
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ public class InsuranceArchivesBO {
|
|||
.socialStartTime(po.getSocialStartTime())
|
||||
.schemeAccount(po.getSocialAccount())
|
||||
.schemePaymentBaseString(po.getSocialPaymentBaseString())
|
||||
.schemePaymentComBaseString(po.getSocialPaymentComBaseString())
|
||||
.underTake(po.getUnderTake() == null ? null : String.valueOf(po.getUnderTake()))
|
||||
.build();
|
||||
}
|
||||
|
|
@ -52,6 +53,7 @@ public class InsuranceArchivesBO {
|
|||
.fundSchemeId(po.getFundSchemeId())
|
||||
.paymentOrganization(po.getPaymentOrganization())
|
||||
.fundPaymentBaseString(po.getFundPaymentBaseString())
|
||||
.fundPaymentComBaseString(po.getFundPaymentComBaseString())
|
||||
.fundStartTime(po.getFundStartTime())
|
||||
.supplementFundAccount(po.getSupplementFundAccount())
|
||||
.nonPayment(po.getNonPayment())
|
||||
|
|
@ -72,6 +74,7 @@ public class InsuranceArchivesBO {
|
|||
.otherName(po.getOtherSchemeId() == null ? null : String.valueOf(po.getOtherSchemeId()))
|
||||
.otherSchemeId(po.getOtherSchemeId())
|
||||
.otherPaymentBaseString(po.getOtherPaymentBaseString())
|
||||
.otherPaymentComBaseString(po.getOtherPaymentComBaseString())
|
||||
.otherStartTime(po.getOtherStartTime())
|
||||
.otherEndTime(po.getOtherEndTime())
|
||||
.paymentOrganization(po.getPaymentOrganization())
|
||||
|
|
|
|||
|
|
@ -70,12 +70,18 @@ public class InsuranceArchivesBaseHistoryDTO {
|
|||
|
||||
private String adjustAfterBaseJson;
|
||||
|
||||
private String adjustBeforeComBaseJson;
|
||||
|
||||
private String adjustAfterComBaseJson;
|
||||
|
||||
@TableTitle(title = "对象", dataIndex = "employeeName", key = "employeeName")
|
||||
private String employeeName;
|
||||
@TableTitle(title = "个税扣缴义务人", dataIndex = "paymentOrganizationName", key = "paymentOrganizationName")
|
||||
private String paymentOrganizationName;
|
||||
@TableTitle(title = "福利项名称", dataIndex = "welfareItemName", key = "welfareItemName")
|
||||
private String welfareItemName;
|
||||
@TableTitle(title = "缴费对象", dataIndex = "paymentScope", key = "paymentScope")
|
||||
private String paymentScope;
|
||||
@TableTitle(title = "调整前方案", dataIndex = "adjustBeforeSchemeName", key = "adjustBeforeSchemeName")
|
||||
private String adjustBeforeSchemeName;
|
||||
@TableTitle(title = "调整前基数", dataIndex = "adjustBeforeBaseValue", key = "adjustBeforeBaseValue")
|
||||
|
|
|
|||
|
|
@ -65,4 +65,6 @@ public class InsuranceArchivesFundSchemeDTO {
|
|||
|
||||
//缴纳基数
|
||||
private String fundPaymentBaseString;
|
||||
|
||||
private String fundPaymentComBaseString;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,5 +56,7 @@ public class InsuranceArchivesOtherSchemeDTO {
|
|||
|
||||
private String otherPaymentBaseString;
|
||||
|
||||
private String otherPaymentComBaseString;
|
||||
|
||||
//private WeaForm otherPaymentBase;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,4 +59,7 @@ public class InsuranceArchivesSocialSchemeDTO {
|
|||
//社保缴纳基数
|
||||
private String schemePaymentBaseString;
|
||||
|
||||
//社保缴纳基数——单位
|
||||
private String schemePaymentComBaseString;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,4 +23,6 @@ public class InsuranceArchivesSaveParam {
|
|||
private String baseForm;
|
||||
|
||||
private String paymentForm;
|
||||
|
||||
private String paymentComForm;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,4 +77,6 @@ public class InsuranceArchivesBaseHistoryPO {
|
|||
private Date createTime;
|
||||
|
||||
private Date updateTime;
|
||||
|
||||
private String paymentScope;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,6 +87,13 @@ public class InsuranceArchivesFundSchemePO {
|
|||
@Encrypt
|
||||
private String fundPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 公积金缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String fundPaymentComBaseString;
|
||||
|
||||
|
||||
/**
|
||||
* 租户key
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -77,6 +77,12 @@ public class InsuranceArchivesOtherSchemePO {
|
|||
@Encrypt
|
||||
private String otherPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 其他福利缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String otherPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 租户key
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -83,6 +83,12 @@ public class InsuranceArchivesSocialSchemePO {
|
|||
@Encrypt
|
||||
private String socialPaymentBaseString;
|
||||
|
||||
/**
|
||||
* 社保缴纳基数——单位
|
||||
*/
|
||||
@Encrypt
|
||||
private String socialPaymentComBaseString;
|
||||
|
||||
/**
|
||||
* 租户key
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@ public class QueryAccountBalanceResponse {
|
|||
public static class Body {
|
||||
/**
|
||||
* 已购买总流量
|
||||
**/
|
||||
*/
|
||||
private String total;
|
||||
/**
|
||||
* 已使用流量
|
||||
**/
|
||||
*/
|
||||
private String used;
|
||||
/**
|
||||
* 剩余流量
|
||||
**/
|
||||
*/
|
||||
private String surplus;
|
||||
/**
|
||||
* 使用明细
|
||||
|
|
|
|||
|
|
@ -14,11 +14,13 @@ import com.engine.salary.entity.taxdeclaration.po.TaxReportColumnPO;
|
|||
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
|
||||
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
|
||||
import com.engine.salary.enums.sicategory.DeleteTypeEnum;
|
||||
import com.engine.salary.enums.taxdeclaration.SourceEnum;
|
||||
import com.engine.salary.util.SalaryDateUtil;
|
||||
import com.engine.salary.util.SalaryEntityUtil;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import dm.jdbc.util.IdGenerator;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -41,11 +43,9 @@ public class TaxDeclarationCommon implements TaxDeclarationStrategy {
|
|||
public TaxDeclarationGenerateResult generate(TaxDeclareContext taxDeclareContext, Long employeeId) {
|
||||
Date now = new Date();
|
||||
// 薪资核算结果按照薪资核算人员id聚合分类
|
||||
Map<Long, List<SalaryAcctResultPO>> salaryAcctResultValueMap = SalaryEntityUtil.group2Map(
|
||||
taxDeclareContext.getSalaryAcctResultValues(), SalaryAcctResultPO::getSalaryAcctEmpId);
|
||||
Map<Long, List<SalaryAcctResultPO>> salaryAcctResultValueMap = SalaryEntityUtil.group2Map(taxDeclareContext.getSalaryAcctResultValues(), SalaryAcctResultPO::getSalaryAcctEmpId);
|
||||
// 薪资核算人员按照人员id聚合分类
|
||||
Map<Long, List<SalaryAcctEmployeePO>> employeeIdKeyMap = SalaryEntityUtil.group2Map(
|
||||
taxDeclareContext.getSalaryAcctEmployees(), SalaryAcctEmployeePO::getEmployeeId);
|
||||
Map<Long, List<SalaryAcctEmployeePO>> employeeIdKeyMap = SalaryEntityUtil.group2Map(taxDeclareContext.getSalaryAcctEmployees(), SalaryAcctEmployeePO::getEmployeeId);
|
||||
|
||||
List<TaxDeclarationValuePO> taxDeclarationValues = Lists.newArrayListWithExpectedSize(employeeIdKeyMap.size());
|
||||
for (Map.Entry<Long, List<SalaryAcctEmployeePO>> employeeIdEntry : employeeIdKeyMap.entrySet()) {
|
||||
|
|
@ -63,8 +63,7 @@ public class TaxDeclarationCommon implements TaxDeclarationStrategy {
|
|||
SalarySobTaxReportRulePO salarySobTaxReportRule = taxDeclareContext.getSalarySobTaxReportRuleMap()
|
||||
.get(lastSalaryAcctEmployee.getSalarySobId() + "-" + taxReportColumn.getReportColumnDataIndex());
|
||||
List<SalaryAcctResultPO> salaryAcctResultValue = salaryAcctResultValueMap.get(lastSalaryAcctEmployee.getId());
|
||||
String defaultValue = Objects.equals(taxReportColumn.getDataType(), SalaryDataTypeEnum.NUMBER.getValue()) ? "0" : "";
|
||||
String value = defaultValue;
|
||||
String value = "";
|
||||
if (salarySobTaxReportRule != null && salaryAcctResultValue != null) {
|
||||
value = salaryAcctResultValue.stream()
|
||||
.filter(result -> result.getSalaryItemId().equals(salarySobTaxReportRule.getSalaryItemId()))
|
||||
|
|
@ -72,6 +71,7 @@ public class TaxDeclarationCommon implements TaxDeclarationStrategy {
|
|||
.orElse(new SalaryAcctResultPO())
|
||||
.getResultValue();
|
||||
}
|
||||
value = StringUtils.isNotBlank(value) ? value : Objects.equals(taxReportColumn.getDataType(), SalaryDataTypeEnum.NUMBER.getValue()) ? "0.00" : "";
|
||||
valueMap.put(taxReportColumn.getReportColumnDataIndex(), value);
|
||||
}
|
||||
TaxDeclarationValuePO taxDeclarationValue = TaxDeclarationValuePO.builder()
|
||||
|
|
@ -86,6 +86,7 @@ public class TaxDeclarationCommon implements TaxDeclarationStrategy {
|
|||
.deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
|
||||
.createTime(now)
|
||||
.updateTime(now)
|
||||
.source(SourceEnum.ACCT.getValue())
|
||||
.build();
|
||||
taxDeclarationValues.add(taxDeclarationValue);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@ package com.engine.salary.entity.taxdeclaration.bo;
|
|||
|
||||
import com.engine.salary.constant.TaxDeclarationDataIndexConstant;
|
||||
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
|
||||
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationAnnualListDTO;
|
||||
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationEmployeeDTO;
|
||||
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO;
|
||||
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationWageListDTO;
|
||||
import com.engine.salary.entity.taxdeclaration.dto.*;
|
||||
import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO;
|
||||
import com.engine.salary.entity.taxdeclaration.po.TaxReportColumnPO;
|
||||
import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum;
|
||||
import com.engine.salary.util.SalaryEntityUtil;
|
||||
import com.engine.salary.util.SalaryI18nUtil;
|
||||
|
|
@ -15,6 +13,7 @@ import org.apache.commons.collections4.CollectionUtils;
|
|||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 个税申报表详情
|
||||
|
|
@ -177,4 +176,23 @@ public class TaxDeclarationDetailBO {
|
|||
}
|
||||
return taxDeclarationLaborListDTOS;
|
||||
}
|
||||
|
||||
|
||||
public static List<TaxDeclareRecordDetailFormDTO.TaxReportColumn> convert2ListTaxReportColumn(List<TaxReportColumnPO> pos) {
|
||||
if (CollectionUtils.isEmpty(pos)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
List<TaxDeclareRecordDetailFormDTO.TaxReportColumn> collect = pos.stream().map(po -> {
|
||||
TaxDeclareRecordDetailFormDTO.TaxReportColumn taxReportColumn = new TaxDeclareRecordDetailFormDTO.TaxReportColumn();
|
||||
taxReportColumn.setReportColumnName(po.getReportColumnName());
|
||||
taxReportColumn.setReportColumnDataIndex(po.getReportColumnDataIndex());
|
||||
taxReportColumn.setTaxReportType(po.getTaxReportType());
|
||||
taxReportColumn.setIncomeCategory(po.getIncomeCategory());
|
||||
taxReportColumn.setDataType(po.getDataType());
|
||||
return taxReportColumn;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
return collect;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public class TaxDeclarationValueList {
|
|||
List<EmployeeDeclarePO> employeeDeclares,
|
||||
List<DataCollectionEmployee> simpleEmployees,
|
||||
List<DataCollectionEmployee> simpleUserInfos,
|
||||
List<ExtEmpPO> extEmployees) {
|
||||
List<ExtEmpPO> extEmployees, boolean cnKey) {
|
||||
if (CollectionUtils.isEmpty(simpleEmployees)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
|
@ -86,27 +86,27 @@ public class TaxDeclarationValueList {
|
|||
dataMap.put("employeeId", taxDeclarationValue.getEmployeeId() + "");
|
||||
dataMap.put("incomeCategory", incomeCategoryEnum.getDefaultLabel());
|
||||
for (TaxReportColumnPO taxReportColumn : taxReportColumns) {
|
||||
dataMap.put(taxReportColumn.getReportColumnDataIndex(), taxDeclarationValue.getResultValue().get(taxReportColumn.getReportColumnDataIndex()));
|
||||
dataMap.put(cnKey ? taxReportColumn.getReportColumnName() : taxReportColumn.getReportColumnDataIndex(), taxDeclarationValue.getResultValue().get(taxReportColumn.getReportColumnDataIndex()));
|
||||
}
|
||||
EmployeeDeclarePO employeeDeclare = employeeDeclareMap.get(taxDeclarationValue.getEmployeeId());
|
||||
if (employeeDeclare != null) {
|
||||
dataMap.put("jobNum", employeeDeclare.getJobNum());
|
||||
dataMap.put("username", employeeDeclare.getEmployeeName());
|
||||
dataMap.put("cardType", SalaryI18nUtil.getI18nLabel(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getLabelId(), CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()));
|
||||
dataMap.put("cardNum", employeeDeclare.getCardNum());
|
||||
dataMap.put(cnKey ? "姓名" : "username", employeeDeclare.getEmployeeName());
|
||||
dataMap.put(cnKey ? "证件类型" : "cardType", SalaryI18nUtil.getI18nLabel(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getLabelId(), CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()));
|
||||
dataMap.put(cnKey ? "证件号码" : "cardNum", employeeDeclare.getCardNum());
|
||||
} else if (taxDeclarationValue.getEmployeeType() == null || Objects.equals(taxDeclarationValue.getEmployeeType(), EmployeeTypeEnum.ORGANIZATION.getValue())) {
|
||||
DataCollectionEmployee simpleEmployee = simpleEmployeeMap.get(taxDeclarationValue.getEmployeeId());
|
||||
DataCollectionEmployee simpleUserInfo = simpleUserInfoMap.get(taxDeclarationValue.getEmployeeId());
|
||||
dataMap.put("jobNum", simpleEmployee.getWorkcode());
|
||||
dataMap.put("username", simpleEmployee.getUsername());
|
||||
dataMap.put("cardType", SalaryI18nUtil.getI18nLabel(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getLabelId(), CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()));
|
||||
dataMap.put("cardNum", simpleUserInfo == null ? "" : simpleUserInfo.getIdNo());
|
||||
dataMap.put(cnKey ? "工号" : "jobNum", simpleEmployee.getWorkcode());
|
||||
dataMap.put(cnKey ? "姓名" : "username", simpleEmployee.getUsername());
|
||||
dataMap.put(cnKey ? "证件类型" : "cardType", SalaryI18nUtil.getI18nLabel(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getLabelId(), CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()));
|
||||
dataMap.put(cnKey ? "证件号码" : "cardNum", simpleUserInfo == null ? "" : simpleUserInfo.getIdNo());
|
||||
} else {
|
||||
ExtEmpPO extEmployee = extEmployeeMap.get(taxDeclarationValue.getEmployeeId());
|
||||
dataMap.put("jobNum", "");
|
||||
dataMap.put("username", extEmployee.getUsername());
|
||||
dataMap.put("cardType", SalaryI18nUtil.getI18nLabel(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getLabelId(), CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()));
|
||||
dataMap.put("cardNum", extEmployee.getIdNo());
|
||||
dataMap.put(cnKey ? "工号" : "jobNum", "");
|
||||
dataMap.put(cnKey ? "姓名" : "username", extEmployee.getUsername());
|
||||
dataMap.put(cnKey ? "证件类型" : "cardType", SalaryI18nUtil.getI18nLabel(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getLabelId(), CardTypeEnum.RESIDENT_IDENTITY_CARDS.getDefaultLabel()));
|
||||
dataMap.put(cnKey ? "证件号码" : "cardNum", extEmployee.getIdNo());
|
||||
}
|
||||
tableDataList.add(dataMap);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto;
|
|||
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
|
||||
import com.engine.salary.util.excel.ExcelHead;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
|
@ -32,18 +33,22 @@ public class AbnormalEmployeeListDTO {
|
|||
|
||||
//姓名")
|
||||
@TableTitle(title = "姓名",dataIndex = "employeeName",key = "employeeName")
|
||||
@ExcelHead(title = "姓名",dataIndex = "employeeName")
|
||||
private String employeeName;
|
||||
|
||||
//工号")
|
||||
@TableTitle(title = "工号",dataIndex = "jobNum",key = "jobNum")
|
||||
@ExcelHead(title = "工号",dataIndex = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
//证件类型")
|
||||
@TableTitle(title = "证件类型",dataIndex = "cardType",key = "cardType")
|
||||
@ExcelHead(title = "证件类型",dataIndex = "cardType")
|
||||
private String cardType;
|
||||
|
||||
//证件号码")
|
||||
@TableTitle(title = "证件号码",dataIndex = "cardNum",key = "cardNum")
|
||||
@ExcelHead(title = "证件号码",dataIndex = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
//报送状态")
|
||||
|
|
@ -51,5 +56,6 @@ public class AbnormalEmployeeListDTO {
|
|||
|
||||
//报送状态")
|
||||
@TableTitle(title = "报送状态",dataIndex = "declareStatusDesc",key = "declareStatusDesc")
|
||||
@ExcelHead(title = "报送状态",dataIndex = "declareStatusDesc")
|
||||
private String declareStatusDesc;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
package com.engine.salary.entity.taxdeclaration.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 个税申报表详情列表（劳务报酬所得）
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Data
|
||||
public class ContrastListDTO {
|
||||
private String local;
|
||||
|
||||
private String online;
|
||||
|
||||
private Object diff;
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
package com.engine.salary.entity.taxdeclaration.dto;
|
||||
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.util.excel.ExcelHead;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
|
@ -23,7 +24,8 @@ public class FailEmployeeListDTO {
|
|||
private Long id;
|
||||
|
||||
//姓名
|
||||
@TableTitle(title = "姓名",dataIndex = "employeeName",key = "employeeName")
|
||||
@TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
|
||||
@ExcelHead(title = "姓名", dataIndex = "employeeName")
|
||||
private String employeeName;
|
||||
|
||||
//个税扣缴义务人id
|
||||
|
|
@ -31,18 +33,22 @@ public class FailEmployeeListDTO {
|
|||
private Long taxAgentId;
|
||||
|
||||
//个税扣缴义务人名称
|
||||
@TableTitle(title = "个税扣缴义务人名称",dataIndex = "taxAgentName",key = "taxAgentName")
|
||||
@TableTitle(title = "个税扣缴义务人名称", dataIndex = "taxAgentName", key = "taxAgentName")
|
||||
@ExcelHead(title = "个税扣缴义务人名称", dataIndex = "taxAgentName")
|
||||
private String taxAgentName;
|
||||
|
||||
//证件号码
|
||||
@TableTitle(title = "证件号码",dataIndex = "cardNum",key = "cardNum")
|
||||
@TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
|
||||
@ExcelHead(title = "证件号码", dataIndex = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
//失败原因
|
||||
@TableTitle(title = "失败原因",dataIndex = "errorMsg",key = "errorMsg")
|
||||
@TableTitle(title = "失败原因", dataIndex = "errorMsg", key = "errorMsg")
|
||||
@ExcelHead(title = "失败原因", dataIndex = "errorMsg")
|
||||
private String errorMsg;
|
||||
|
||||
//所得项目
|
||||
@TableTitle(title = "所得项目",dataIndex = "incomeCategory",key = "incomeCategory")
|
||||
@TableTitle(title = "所得项目", dataIndex = "incomeCategory", key = "incomeCategory")
|
||||
@ExcelHead(title = "所得项目", dataIndex = "incomeCategory")
|
||||
private String incomeCategory;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto;
|
|||
|
||||
import com.engine.salary.annotation.SalaryTableColumn;
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.util.excel.ExcelHead;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
|
@ -31,59 +32,69 @@ public class TaxDeclarationAnnualListDTO {
|
|||
text = "工号", width = "10%", column = "jobNum"
|
||||
)
|
||||
@TableTitle(title ="工号",dataIndex = "jobNum",key = "jobNum")
|
||||
@ExcelHead(title ="工号",dataIndex = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "姓名", width = "10%", column = "username"
|
||||
)
|
||||
@TableTitle(title ="姓名",dataIndex = "username",key = "username")
|
||||
@ExcelHead(title ="姓名",dataIndex = "username")
|
||||
private String username;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "证件类型", width = "10%", column = "cardType"
|
||||
)
|
||||
@TableTitle(title ="证件类型",dataIndex = "cardType",key = "cardType")
|
||||
@ExcelHead(title ="证件类型",dataIndex = "cardType")
|
||||
private String cardType;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "证件号码", width = "10%", column = "cardNum"
|
||||
)
|
||||
@TableTitle(title ="证件号码",dataIndex = "cardNum",key = "cardNum")
|
||||
@ExcelHead(title ="证件号码",dataIndex = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "全年一次性奖金额", width = "10%", column = "annualIncome"
|
||||
)
|
||||
@TableTitle(title ="全年一次性奖金额",dataIndex = "annualIncome",key = "annualIncome")
|
||||
@ExcelHead(title ="全年一次性奖金额",dataIndex = "annualIncome")
|
||||
private String annualIncome;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "免税收入", width = "10%", column = "annualTaxFreeIncome"
|
||||
)
|
||||
@TableTitle(title ="免税收入",dataIndex = "annualTaxFreeIncome",key = "annualTaxFreeIncome")
|
||||
@ExcelHead(title ="免税收入",dataIndex = "annualTaxFreeIncome")
|
||||
private String annualTaxFreeIncome;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "其他", width = "10%", column = "annualOther"
|
||||
)
|
||||
@TableTitle(title ="其他",dataIndex = "annualOther",key = "annualOther")
|
||||
@ExcelHead(title ="其他",dataIndex = "annualOther")
|
||||
private String annualOther;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "准予扣除的捐赠额", width = "10%", column = "annualDonateTax"
|
||||
)
|
||||
@TableTitle(title ="准予扣除的捐赠额",dataIndex = "annualDonateTax",key = "annualDonateTax")
|
||||
@ExcelHead(title ="准予扣除的捐赠额",dataIndex = "annualDonateTax")
|
||||
private String annualDonateTax;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "减免税额", width = "10%", column = "annualTaxSavings"
|
||||
)
|
||||
@TableTitle(title ="减免税额",dataIndex = "annualTaxSavings",key = "annualTaxSavings")
|
||||
@ExcelHead(title ="减免税额",dataIndex = "annualTaxSavings")
|
||||
private String annualTaxSavings;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "备注", width = "10%", column = "annualRemark"
|
||||
)
|
||||
@TableTitle(title ="备注",dataIndex = "annualRemark",key = "annualRemark")
|
||||
@ExcelHead(title ="备注",dataIndex = "annualRemark")
|
||||
private String annualRemark;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ public class TaxDeclarationInfoDTO {
|
|||
|
||||
|
||||
@ApiModelProperty("薪资所属月")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
|
||||
private Date salaryMonth;
|
||||
|
||||
@ApiModelProperty("税款所属期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
|
||||
private Date taxCycle;
|
||||
|
||||
@ApiModelProperty("个税扣缴义务人id")
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto;
|
|||
|
||||
import com.engine.salary.annotation.SalaryTableColumn;
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.util.excel.ExcelHead;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
|
@ -30,78 +31,91 @@ public class TaxDeclarationLaborListDTO {
|
|||
@SalaryTableColumn(
|
||||
text = "工号", width = "10%", column = "jobNum"
|
||||
)
|
||||
@TableTitle(title ="工号",dataIndex = "jobNum",key = "jobNum")
|
||||
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
|
||||
@ExcelHead(title = "工号", dataIndex = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "姓名", width = "10%", column = "username"
|
||||
)
|
||||
@TableTitle(title ="姓名",dataIndex = "username",key = "username")
|
||||
@TableTitle(title = "姓名", dataIndex = "username", key = "username")
|
||||
@ExcelHead(title = "姓名", dataIndex = "username")
|
||||
private String username;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "证件类型", width = "10%", column = "cardType"
|
||||
)
|
||||
@TableTitle(title ="证件类型",dataIndex = "cardType",key = "cardType")
|
||||
@TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
|
||||
@ExcelHead(title = "证件类型", dataIndex = "cardType")
|
||||
private String cardType;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "证件号码", width = "10%", column = "cardNum"
|
||||
)
|
||||
@TableTitle(title ="证件号码",dataIndex = "cardNum",key = "cardNum")
|
||||
@TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
|
||||
@ExcelHead(title = "证件号码", dataIndex = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "所得项目", width = "10%", column = "incomeItems"
|
||||
)
|
||||
@TableTitle(title ="所得项目",dataIndex = "incomeItems",key = "incomeItems")
|
||||
@TableTitle(title = "所得项目", dataIndex = "incomeItems", key = "incomeItems")
|
||||
@ExcelHead(title = "所得项目", dataIndex = "incomeItems")
|
||||
private String incomeItems;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "劳务收入", width = "10%", column = "laborIncome"
|
||||
)
|
||||
@TableTitle(title ="劳务收入",dataIndex = "laborIncome",key = "laborIncome")
|
||||
@TableTitle(title = "劳务收入", dataIndex = "laborIncome", key = "laborIncome")
|
||||
@ExcelHead(title = "劳务收入", dataIndex = "laborIncome")
|
||||
private String laborIncome;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "劳务免税收入", width = "10%", column = "laborTaxFreeIncome"
|
||||
)
|
||||
@TableTitle(title ="劳务免税收入",dataIndex = "laborTaxFreeIncome",key = "laborTaxFreeIncome")
|
||||
@TableTitle(title = "劳务免税收入", dataIndex = "laborTaxFreeIncome", key = "laborTaxFreeIncome")
|
||||
@ExcelHead(title = "劳务免税收入", dataIndex = "laborTaxFreeIncome")
|
||||
private String laborTaxFreeIncome;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "商业健康保险", width = "10%", column = "commercialHealthInsurance"
|
||||
)
|
||||
@TableTitle(title ="商业健康保险",dataIndex = "commercialHealthInsurance",key = "commercialHealthInsurance")
|
||||
@TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance")
|
||||
@ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance")
|
||||
private String commercialHealthInsurance;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance"
|
||||
)
|
||||
@TableTitle(title ="税延养老保险",dataIndex = "taxDeferredEndowmentInsurance",key = "taxDeferredEndowmentInsurance")
|
||||
@TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance")
|
||||
@ExcelHead(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance")
|
||||
private String taxDeferredEndowmentInsurance;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "其他", width = "10%", column = "other"
|
||||
)
|
||||
@TableTitle(title ="其他",dataIndex = "other",key = "other")
|
||||
@TableTitle(title = "其他", dataIndex = "other", key = "other")
|
||||
@ExcelHead(title = "其他", dataIndex = "other")
|
||||
private String other;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation"
|
||||
)
|
||||
@TableTitle(title ="准予扣除的捐赠额",dataIndex = "allowedDonation",key = "allowedDonation")
|
||||
@TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation")
|
||||
@ExcelHead(title = "准予扣除的捐赠额", dataIndex = "allowedDonation")
|
||||
private String allowedDonation;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "减免税额", width = "10%", column = "taxDeduction"
|
||||
)
|
||||
@TableTitle(title ="减免税额",dataIndex = "taxDeduction",key = "taxDeduction")
|
||||
@TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction")
|
||||
@ExcelHead(title = "减免税额", dataIndex = "taxDeduction")
|
||||
private String taxDeduction;
|
||||
|
||||
@SalaryTableColumn(
|
||||
text = "备注", width = "10%", column = "description"
|
||||
)
|
||||
@TableTitle(title ="备注",dataIndex = "description",key = "description")
|
||||
@TableTitle(title = "备注", dataIndex = "description", key = "description")
|
||||
@ExcelHead(title = "备注", dataIndex = "description")
|
||||
private String description;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.cloudstore.eccom.pc.table.WeaTableType;
|
|||
import com.engine.salary.annotation.SalaryTable;
|
||||
import com.engine.salary.annotation.SalaryTableColumn;
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.util.excel.ExcelHead;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
|
@ -35,101 +36,126 @@ public class TaxDeclarationWageListDTO {
|
|||
|
||||
@SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
|
||||
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
|
||||
@ExcelHead(title = "工号", dataIndex = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
@SalaryTableColumn(text = "姓名", width = "10%", column = "username")
|
||||
@TableTitle(title = "姓名", dataIndex = "username", key = "username")
|
||||
@ExcelHead(title = "姓名", dataIndex = "username")
|
||||
private String username;
|
||||
|
||||
@SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType")
|
||||
@TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
|
||||
@ExcelHead(title = "证件类型", dataIndex = "cardType")
|
||||
private String cardType;
|
||||
|
||||
@SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum")
|
||||
@TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
|
||||
@ExcelHead(title = "证件号码", dataIndex = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
@SalaryTableColumn(text = "本期收入", width = "10%", column = "income")
|
||||
@TableTitle(title = "本期收入", dataIndex = "income", key = "income")
|
||||
@ExcelHead(title = "本期收入", dataIndex = "income")
|
||||
private String income;
|
||||
|
||||
@SalaryTableColumn(text = "本期免税收入", width = "10%", column = "taxFreeIncome")
|
||||
@TableTitle(title = "本期免税收入", dataIndex = "taxFreeIncome", key = "taxFreeIncome")
|
||||
@ExcelHead(title = "本期免税收入", dataIndex = "taxFreeIncome")
|
||||
private String taxFreeIncome;
|
||||
|
||||
@SalaryTableColumn(text = "基本养老保险费", width = "10%", column = "endowmentInsurance")
|
||||
@TableTitle(title = "基本养老保险费", dataIndex = "endowmentInsurance", key = "endowmentInsurance")
|
||||
@ExcelHead(title = "基本养老保险费", dataIndex = "endowmentInsurance")
|
||||
private String endowmentInsurance;
|
||||
|
||||
@SalaryTableColumn(text = "基本医疗保险费", width = "10%", column = "medicalInsurance")
|
||||
@TableTitle(title = "基本医疗保险费", dataIndex = "medicalInsurance", key = "medicalInsurance")
|
||||
@ExcelHead(title = "基本医疗保险费", dataIndex = "medicalInsurance")
|
||||
private String medicalInsurance;
|
||||
|
||||
@SalaryTableColumn(text = "失业保险费", width = "10%", column = "unemploymentInsurance")
|
||||
@TableTitle(title = "失业保险费", dataIndex = "unemploymentInsurance", key = "unemploymentInsurance")
|
||||
@ExcelHead(title = "失业保险费", dataIndex = "unemploymentInsurance")
|
||||
private String unemploymentInsurance;
|
||||
|
||||
@SalaryTableColumn(text = "住房公积金", width = "10%", column = "housingProvidentFund")
|
||||
@TableTitle(title = "住房公积金", dataIndex = "housingProvidentFund", key = "housingProvidentFund")
|
||||
@ExcelHead(title = "住房公积金", dataIndex = "housingProvidentFund")
|
||||
private String housingProvidentFund;
|
||||
|
||||
@SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation")
|
||||
@TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation")
|
||||
@ExcelHead(title = "累计子女教育", dataIndex = "addUpChildEducation")
|
||||
private String addUpChildEducation;
|
||||
|
||||
@SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest")
|
||||
@TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest")
|
||||
@ExcelHead(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest")
|
||||
private String addUpHousingLoanInterest;
|
||||
|
||||
@SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent")
|
||||
@TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent")
|
||||
@ExcelHead(title = "累计住房租金", dataIndex = "addUpHousingRent")
|
||||
private String addUpHousingRent;
|
||||
|
||||
@SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation")
|
||||
@TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation")
|
||||
@ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation")
|
||||
private String addUpContinuingEducation;
|
||||
|
||||
@SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly")
|
||||
@TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly")
|
||||
@ExcelHead(title = "累计赡养老人", dataIndex = "addUpSupportElderly")
|
||||
private String addUpSupportElderly;
|
||||
|
||||
@SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical")
|
||||
@TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical")
|
||||
@ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical")
|
||||
private String addUpIllnessMedical;
|
||||
|
||||
@SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare")
|
||||
@TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare")
|
||||
@ExcelHead(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare")
|
||||
private String addUpInfantCare;
|
||||
|
||||
@SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension")
|
||||
@TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension")
|
||||
@ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension")
|
||||
private String addUpPrivatePension;
|
||||
|
||||
@SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity")
|
||||
@TableTitle(title = "企业（职业）年金", dataIndex = "annuity", key = "annuity")
|
||||
@ExcelHead(title = "企业（职业）年金", dataIndex = "annuity")
|
||||
private String annuity;
|
||||
|
||||
@SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance")
|
||||
@TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance")
|
||||
@ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance")
|
||||
private String commercialHealthInsurance;
|
||||
|
||||
@SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance")
|
||||
@TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance")
|
||||
@ExcelHead(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance")
|
||||
private String taxDeferredEndowmentInsurance;
|
||||
|
||||
@SalaryTableColumn(text = "其他", width = "10%", column = "other")
|
||||
@TableTitle(title = "其他", dataIndex = "other", key = "other")
|
||||
@ExcelHead(title = "其他", dataIndex = "other")
|
||||
private String other;
|
||||
|
||||
@SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation")
|
||||
@TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation")
|
||||
@ExcelHead(title = "准予扣除的捐赠额", dataIndex = "allowedDonation")
|
||||
private String allowedDonation;
|
||||
|
||||
@SalaryTableColumn(text = "减免税额", width = "10%", column = "taxDeduction")
|
||||
@TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction")
|
||||
@ExcelHead(title = "减免税额", dataIndex = "taxDeduction")
|
||||
private String taxDeduction;
|
||||
|
||||
@SalaryTableColumn(text = "备注", width = "10%", column = "description")
|
||||
@TableTitle(title = "备注", dataIndex = "description", key = "description")
|
||||
@ExcelHead(title = "备注", dataIndex = "description")
|
||||
private String description;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,87 @@
|
|||
package com.engine.salary.entity.taxdeclaration.dto;
|
||||
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 个税申报明细新增表单
|
||||
* <p>Copyright: Copyright (c) 2023</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TaxDeclareRecordDetailFormDTO {
|
||||
|
||||
/**
|
||||
* 个税申报表id
|
||||
*/
|
||||
private Long taxDeclarationId;
|
||||
|
||||
//主键id
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
//人员id
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long employeeId;
|
||||
private Integer employeeType;
|
||||
|
||||
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
@TableTitle(title = "姓名", dataIndex = "username", key = "username")
|
||||
private String username;
|
||||
|
||||
@TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
|
||||
private String cardType;
|
||||
|
||||
@TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
|
||||
private String cardNum;
|
||||
|
||||
/**
|
||||
* 收入所得项目
|
||||
*/
|
||||
private String incomeCategory;
|
||||
|
||||
/**
|
||||
* 人员报送下拉选择
|
||||
*/
|
||||
private List<EmployeeDeclarePO> employeeDeclares;
|
||||
|
||||
/**
|
||||
* 当前申报类型可编辑字段
|
||||
*/
|
||||
private List<TaxReportColumn> taxReportColumns;
|
||||
private Map<String, String> resultValue;
|
||||
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class TaxReportColumn {
|
||||
//报表类型
|
||||
private String taxReportType;
|
||||
//所得项目
|
||||
private String incomeCategory;
|
||||
//申报表列索引
|
||||
private String reportColumnDataIndex ;
|
||||
//申报表的列名
|
||||
private String reportColumnName;
|
||||
//数值类型
|
||||
private String dataType;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
package com.engine.salary.entity.taxdeclaration.param;
|
||||
|
||||
import com.engine.salary.common.BaseQueryParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 对比查询
|
||||
* <p>Copyright: Copyright (c) 2023</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Data
|
||||
public class ContrastQueryParam extends BaseQueryParam {
|
||||
|
||||
/**
|
||||
* 申报表id
|
||||
*/
|
||||
private Long taxDeclarationId;
|
||||
|
||||
/**
|
||||
* 是否只显示差异人员
|
||||
*/
|
||||
private boolean onlyShowDiffEmp;
|
||||
|
||||
/**
|
||||
* 是否只显示差异项
|
||||
*/
|
||||
private boolean onlyShowDiffItem;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue