diff --git a/resource/sql/个人养老金.sql b/resource/sql/个人养老金.sql new file mode 100644 index 000000000..48ee61513 --- /dev/null +++ b/resource/sql/个人养老金.sql @@ -0,0 +1,166 @@ +ALTER TABLE hrsa_other_deduction ADD COLUMN private_pension varchar(255) NULL; + +ALTER TABLE hrsa_add_up_situation ADD COLUMN add_up_private_pension varchar(255) NULL; + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629605, '个人养老金', 'privatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1680746056549, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number'); + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629698, '累计个人养老金', 'addUpPrivatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1681201555316, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number'); + +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 (1680746056549, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{其他免税扣除.个人养老金}', 'otherDeduction_privatePension', 92, 0, '2023-04-06 09:54:16', '2023-04-06 09:54:16'); +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 (1680746056577, '个人养老金', 1680746056549, 'otherDeduction_privatePension', '{其他免税扣除.个人养老金}', 'number', 'otherDeduction', 0, 92, 0, '2023-04-06 09:54:16', '2023-04-06 09:54:16'); + +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 (1681201555316, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.个人养老金}+{往期累计情况.累计个人养老金}', 'salaryItem_privatePension+addUpSituation_addUpPrivatePension', 92, 0, '2023-04-11 16:25:55', '2023-04-11 16:25:55'); +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 (1681201555332, '个人养老金', 1681201555316, 'salaryItem_privatePension', '{薪资项目.个人养老金}', 'number', 'salaryItem', 0, 92, 0, '2023-04-11 16:25:55', '2023-04-11 16:25:55'); +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 (1681201555338, '累计个人养老金', 1681201555316, 'addUpSituation_addUpPrivatePension', '{往期累计情况.累计个人养老金}', 'number', 'addUpSituation', 1, 92, 0, '2023-04-11 16:25:55', '2023-04-11 16:25:55'); + +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 (733975748932845610, 1, 746777981115629605, 1, 0, 0, '2022-03-18 16:30:21', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 10); + +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 (733975748932845611, 1, 746777981115629698, 1, 0, 0, '2022-03-18 16:30:21', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 11); + + + + +ALTER TABLE hrsa_other_deduction ADD [private_pension] varchar(255) NULL +GO + +ALTER TABLE hrsa_add_up_situation ADD [add_up_private_pension] varchar(255) NULL +GO + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629605, '个人养老金', 'privatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1680746056549, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number') +GO + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629698, '累计个人养老金', 'addUpPrivatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1681201555316, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number') +GO + +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 (1680746056549, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{其他免税扣除.个人养老金}', 'otherDeduction_privatePension', 92, 0, '2023-04-06 09:54:16', '2023-04-06 09:54:16') +GO +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 (1680746056577, '个人养老金', 1680746056549, 'otherDeduction_privatePension', '{其他免税扣除.个人养老金}', 'number', 'otherDeduction', 0, 92, 0, '2023-04-06 09:54:16', '2023-04-06 09:54:16') +GO + +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 (1681201555316, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.个人养老金}+{往期累计情况.累计个人养老金}', 'salaryItem_privatePension+addUpSituation_addUpPrivatePension', 92, 0, '2023-04-11 16:25:55', '2023-04-11 16:25:55') +GO +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 (1681201555332, '个人养老金', 1681201555316, 'salaryItem_privatePension', '{薪资项目.个人养老金}', 'number', 'salaryItem', 0, 92, 0, '2023-04-11 16:25:55', '2023-04-11 16:25:55') +GO +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 (1681201555338, '累计个人养老金', 1681201555316, 'addUpSituation_addUpPrivatePension', '{往期累计情况.累计个人养老金}', 'number', 'addUpSituation', 1, 92, 0, '2023-04-11 16:25:55', '2023-04-11 16:25:55') +GO + +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 (733975748932845610, 1, 746777981115629605, 1, 0, 0, '2022-03-18 16:30:21', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 10) +GO + +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 (733975748932845611, 1, 746777981115629698, 1, 0, 0, '2022-03-18 16:30:21', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 11) +GO + + +ALTER TABLE hrsa_other_deduction ADD ( + private_pension varchar2(255) NULL +) +/ + +ALTER TABLE hrsa_add_up_situation ADD ( + add_up_private_pension varchar2(255) NULL +) +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629605, '个人养老金', 'privatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1680746056549, '', 0, 1, 0, 0, 'all_teams', 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'), 'number') +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629698, '累计个人养老金', 'addUpPrivatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1681201555316, '', 0, 1, 0, 0, 'all_teams', 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'), 'number') +/ + +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 (1680746056549, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{其他免税扣除.个人养老金}', 'otherDeduction_privatePension', 92, 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 (1680746056577, '个人养老金', 1680746056549, 'otherDeduction_privatePension', '{其他免税扣除.个人养老金}', 'number', 'otherDeduction', 0, 92, 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(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1681201555316, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.个人养老金}+{往期累计情况.累计个人养老金}', 'salaryItem_privatePension+addUpSituation_addUpPrivatePension', 92, 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 (1681201555332, '个人养老金', 1681201555316, 'salaryItem_privatePension', '{薪资项目.个人养老金}', 'number', 'salaryItem', 0, 92, 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 (1681201555338, '累计个人养老金', 1681201555316, 'addUpSituation_addUpPrivatePension', '{往期累计情况.累计个人养老金}', 'number', 'addUpSituation', 1, 92, 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_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 (733975748932845610, 1, 746777981115629605, 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', 703433961629614110, 10) +/ + +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 (733975748932845611, 1, 746777981115629698, 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', 703433961629614110, 11) +/ + + + + + + + +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 (1681265757380, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.当前累计应税收入合计}-{薪资项目.当前累计专项扣除合计}-{薪资项目.当前累计专项附加扣除合计}-{薪资项目.当前累计其他扣除合计}-{薪资项目.当前累计减除费用}-{薪资项目.当前累计准备扣除的捐赠额}-{薪资项目.累计个人养老金}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation-salaryItem_addUpPrivatePension', 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); + +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 (1681265757404, '当前累计准备扣除的捐赠额', 1681265757380, 'salaryItem_addUpAllowedDonation', '{薪资项目.当前累计准备扣除的捐赠额}', 'number', 'salaryItem', 5, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); +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 (1681265757408, '当前累计减除费用', 1681265757380, 'salaryItem_addUpSubtraction', '{薪资项目.当前累计减除费用}', 'number', 'salaryItem', 4, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); +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 (1681265757413, '当前累计其他扣除合计', 1681265757380, 'salaryItem_addUpOtherDeduction', '{薪资项目.当前累计其他扣除合计}', 'number', 'salaryItem', 3, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); +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 (1681265757417, '当前累计专项附加扣除合计', 1681265757380, 'salaryItem_addUpSpeAddiDeduction', '{薪资项目.当前累计专项附加扣除合计}', 'number', 'salaryItem', 2, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); +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 (1681265757421, '当前累计专项扣除合计', 1681265757380, 'salaryItem_addUpSpecialDeduction', '{薪资项目.当前累计专项扣除合计}', 'number', 'salaryItem', 1, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); +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 (1681265757424, '当前累计应税收入合计', 1681265757380, 'salaryItem_addUpIncome', '{薪资项目.当前累计应税收入合计}', 'number', 'salaryItem', 0, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); +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 (1681265757428, '累计个人养老金', 1681265757380, 'salaryItem_addUpPrivatePension', '{薪资项目.累计个人养老金}', 'number', 'salaryItem', 6, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57'); + + + +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 (1681265757380, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.当前累计应税收入合计}-{薪资项目.当前累计专项扣除合计}-{薪资项目.当前累计专项附加扣除合计}-{薪资项目.当前累计其他扣除合计}-{薪资项目.当前累计减除费用}-{薪资项目.当前累计准备扣除的捐赠额}-{薪资项目.累计个人养老金}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation-salaryItem_addUpPrivatePension', 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO + +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 (1681265757404, '当前累计准备扣除的捐赠额', 1681265757380, 'salaryItem_addUpAllowedDonation', '{薪资项目.当前累计准备扣除的捐赠额}', 'number', 'salaryItem', 5, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO +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 (1681265757408, '当前累计减除费用', 1681265757380, 'salaryItem_addUpSubtraction', '{薪资项目.当前累计减除费用}', 'number', 'salaryItem', 4, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO +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 (1681265757413, '当前累计其他扣除合计', 1681265757380, 'salaryItem_addUpOtherDeduction', '{薪资项目.当前累计其他扣除合计}', 'number', 'salaryItem', 3, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO +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 (1681265757417, '当前累计专项附加扣除合计', 1681265757380, 'salaryItem_addUpSpeAddiDeduction', '{薪资项目.当前累计专项附加扣除合计}', 'number', 'salaryItem', 2, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO +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 (1681265757421, '当前累计专项扣除合计', 1681265757380, 'salaryItem_addUpSpecialDeduction', '{薪资项目.当前累计专项扣除合计}', 'number', 'salaryItem', 1, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO +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 (1681265757424, '当前累计应税收入合计', 1681265757380, 'salaryItem_addUpIncome', '{薪资项目.当前累计应税收入合计}', 'number', 'salaryItem', 0, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO +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 (1681265757428, '累计个人养老金', 1681265757380, 'salaryItem_addUpPrivatePension', '{薪资项目.累计个人养老金}', 'number', 'salaryItem', 6, 92, 0, '2023-04-12 10:15:57', '2023-04-12 10:15:57') +GO + + +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 (1681265757380, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.当前累计应税收入合计}-{薪资项目.当前累计专项扣除合计}-{薪资项目.当前累计专项附加扣除合计}-{薪资项目.当前累计其他扣除合计}-{薪资项目.当前累计减除费用}-{薪资项目.当前累计准备扣除的捐赠额}-{薪资项目.累计个人养老金}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation-salaryItem_addUpPrivatePension', 92, 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 (1681265757404, '当前累计准备扣除的捐赠额', 1681265757380, 'salaryItem_addUpAllowedDonation', '{薪资项目.当前累计准备扣除的捐赠额}', 'number', 'salaryItem', 5, 92, 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 (1681265757408, '当前累计减除费用', 1681265757380, 'salaryItem_addUpSubtraction', '{薪资项目.当前累计减除费用}', 'number', 'salaryItem', 4, 92, 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 (1681265757413, '当前累计其他扣除合计', 1681265757380, 'salaryItem_addUpOtherDeduction', '{薪资项目.当前累计其他扣除合计}', 'number', 'salaryItem', 3, 92, 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 (1681265757417, '当前累计专项附加扣除合计', 1681265757380, 'salaryItem_addUpSpeAddiDeduction', '{薪资项目.当前累计专项附加扣除合计}', 'number', 'salaryItem', 2, 92, 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 (1681265757421, '当前累计专项扣除合计', 1681265757380, 'salaryItem_addUpSpecialDeduction', '{薪资项目.当前累计专项扣除合计}', 'number', 'salaryItem', 1, 92, 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 (1681265757424, '当前累计应税收入合计', 1681265757380, 'salaryItem_addUpIncome', '{薪资项目.当前累计应税收入合计}', 'number', 'salaryItem', 0, 92, 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 (1681265757428, '累计个人养老金', 1681265757380, 'salaryItem_addUpPrivatePension', '{薪资项目.累计个人养老金}', 'number', 'salaryItem', 6, 92, 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 formula_id = 1681265757380 where name = '当前累计应纳税所得额' ; +update hrsa_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额'; + + + + +update hrsa_sys_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额' +GO +update hrsa_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额' +GO + +update hrsa_sys_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额' +/ +update hrsa_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额' +/ + + + + + diff --git a/resource/sql/公式修改.sql b/resource/sql/公式修改.sql index 1eb4eac79..2baed0f20 100644 --- a/resource/sql/公式修改.sql +++ b/resource/sql/公式修改.sql @@ -1,3 +1,3 @@ -update hrsa_formula set formula = 'if({薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}' where id = 1651742702735 ; +update hrsa_formula set formula = '' where id = 1651742702735 ; -update hrsa_formula set formulaRunScript = 'if(salaryItem_addUpTaxableIncome<=36000){0;}else if(salaryItem_addUpTaxableIncome<=144000){2520;}else if(salaryItem_addUpTaxableIncome<=300000){16920;}else if(salaryItem_addUpTaxableIncome<=420000){31920;}else if(salaryItem_addUpTaxableIncome<=660000){52920;}else if(salaryItem_addUpTaxableIncome<=960000){85920;}else{181920;}' where id = 1651742702735 ; \ No newline at end of file +update hrsa_formula set formulaRunScript = '' where id = 1651742702735 ; \ No newline at end of file diff --git a/src/com/api/salary/web/MaintainerController.java b/src/com/api/salary/web/MaintainerController.java new file mode 100644 index 000000000..f43fe0a46 --- /dev/null +++ b/src/com/api/salary/web/MaintainerController.java @@ -0,0 +1,9 @@ +package com.api.salary.web; + + +import javax.ws.rs.Path; + +@Path("/bs/hrmsalary/maintainer") +public class MaintainerController extends com.engine.salary.maintainer.MaintainerController{ + +} diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index e09ce9e7b..a7dd4ed4c 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -148,14 +148,14 @@ public class SIAccountBiz extends Service { public PageInfo listCommonPage(InsuranceAccountDetailParam queryParam) { queryParam.setPaymentStatus(PaymentStatusEnum.COMMON.getValue()); - //过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员 - List baseInfoPOList = getInsuranceBaseInfoMapper().listAll(); - List canAccountIds = baseInfoPOList.stream() - .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization()) - && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue()))) - .map(InsuranceArchivesBaseInfoPO::getEmployeeId) - .collect(Collectors.toList()); - queryParam.setEmployeeIds(canAccountIds); +// //过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员 +// List baseInfoPOList = getInsuranceBaseInfoMapper().listAll(); +// List canAccountIds = baseInfoPOList.stream() +// .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization()) +// && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue()))) +// .map(InsuranceArchivesBaseInfoPO::getEmployeeId) +// .collect(Collectors.toList()); +// queryParam.setEmployeeIds(canAccountIds); //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); queryParam.setOrderRule(orderRule); @@ -226,8 +226,8 @@ public class SIAccountBiz extends Service { List employeeIds = getInsuranceAccountDetailMapper().selectEmpByPaymentOrg(paymentOrganization); // employeeIds = employeeIds.stream().filter(employeeIdsInTaxAgent::contains).collect(Collectors.toList()); if (CollectionUtils.isEmpty(employeeIds)) { - List list = Lists.newArrayList(getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), paymentOrganization)); - encryptUtil.decryptList(list, InsuranceAccountBatchPO.class); + List list = Lists.newArrayList(getInsuranceAccountDetailMapper().queryNormalListByBillMonth(param.getBillMonth(), paymentOrganization)); + encryptUtil.decryptList(list, InsuranceAccountDetailPO.class); if (CollectionUtils.isNotEmpty(list)) { list.stream().forEach(f -> { getInsuranceAccountDetailMapper().deleteById(f.getId()); diff --git a/src/com/engine/salary/biz/SubCompanyBiz.java b/src/com/engine/salary/biz/SubCompanyBiz.java new file mode 100644 index 000000000..2ca3cbd6d --- /dev/null +++ b/src/com/engine/salary/biz/SubCompanyBiz.java @@ -0,0 +1,48 @@ +package com.engine.salary.biz; + +import com.engine.salary.entity.hrm.SubCompanyInfo; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; + +import java.util.ArrayList; +import java.util.List; + +public class SubCompanyBiz { + + public List list() { + List returnList = new ArrayList<>(); + + RecordSet rs = new RecordSet(); + rs.executeQuery("select id, subcompanyname from HrmsubCompany"); + while (rs.next()) { + returnList.add( + SubCompanyInfo.builder() + .id(Long.valueOf(rs.getString(1))) + .name(rs.getString(2)).build() + ); + } + return returnList; + } + + /** + * 获取所有上级分部 + * + * @param subId + * @param returnList + * @return + */ + public List getSupSubCompanyLists(String subId, List returnList) { + RecordSet rs = new RecordSet(); + rs.executeSql("select supsubcomid from HrmsubCompany where id=" + subId); + while (rs.next()) { + String supsubcomid = rs.getString(1); + if (!StringUtils.equals(supsubcomid, "0")) { + returnList.add(supsubcomid); + getSupSubCompanyLists(supsubcomid, returnList); + } + } + return returnList; + } + + +} diff --git a/src/com/engine/salary/cache/SalaryCacheKey.java b/src/com/engine/salary/cache/SalaryCacheKey.java index 549dccd31..76d19ea7d 100644 --- a/src/com/engine/salary/cache/SalaryCacheKey.java +++ b/src/com/engine/salary/cache/SalaryCacheKey.java @@ -1,11 +1,7 @@ package com.engine.salary.cache; /** - * @description: 用于定义本服务内部使用的缓存key - * @author: xiajun - * @modified By: xiajun - * @date: Created in 12/13/21 11:12 AM - * @version:v1.0 + * 用于定义本服务内部使用的缓存key */ public class SalaryCacheKey { diff --git a/src/com/engine/salary/common/SalaryContext.java b/src/com/engine/salary/common/SalaryContext.java new file mode 100644 index 000000000..b83bb88fc --- /dev/null +++ b/src/com/engine/salary/common/SalaryContext.java @@ -0,0 +1,38 @@ +package com.engine.salary.common; + +import java.util.HashMap; +import java.util.Map; + + +/** + * 薪酬上下文 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +public class SalaryContext { + public static ThreadLocal context = new ThreadLocal(); + + private Map map = new HashMap<>(); + + public static SalaryContext get() { + if (null == context.get()) { + context.set(new SalaryContext()); + } + return context.get(); + } + + public void setValue(String key, Object value) { + map.put(key, value); + } + + public Object getValue(String key) { + return map.get(key); + } + + public void removeContext() { + context.remove(); + } +} \ No newline at end of file diff --git a/src/com/engine/salary/constant/TaxDeclarationDataIndexConstant.java b/src/com/engine/salary/constant/TaxDeclarationDataIndexConstant.java index 66794def2..38c9d09bc 100644 --- a/src/com/engine/salary/constant/TaxDeclarationDataIndexConstant.java +++ b/src/com/engine/salary/constant/TaxDeclarationDataIndexConstant.java @@ -112,6 +112,11 @@ public class TaxDeclarationDataIndexConstant { */ public static final String ADD_UP_INFANT_CARE = "addUpInfantCare"; + /** + * 累计个人养老金 + */ + public static final String ADD_UP_PRIVATE_PENSION = "addUpPrivatePension"; + /** * 累计专项附加扣除 */ diff --git a/src/com/engine/salary/encrypt/EncryptUtil.java b/src/com/engine/salary/encrypt/EncryptUtil.java index e35d3d53b..1509904d5 100644 --- a/src/com/engine/salary/encrypt/EncryptUtil.java +++ b/src/com/engine/salary/encrypt/EncryptUtil.java @@ -16,7 +16,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; @Slf4j @@ -90,7 +89,6 @@ public class EncryptUtil { try { List fieldList = getFields(clazz); if (CollectionUtils.isNotEmpty(fieldList)) { - List> values = new ArrayList<>(); for (T data : dataList) { for (Field field : fieldList) { field.setAccessible(true); diff --git a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java deleted file mode 100644 index b307616a8..000000000 --- a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.engine.salary.encrypt.archive; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO; - -import java.util.List; - -/** - * hrsa_salary_archive_item: 加解密 - * 字段： - * item_value - */ -@Deprecated -public class SalaryArchiveItemPOEncrypt { - public static List encryptSalaryArchiveItemPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setItemValue(AESEncryptUtil.encrypt(item.getItemValue())); - }); - return list; - } - - public static List decryptSalaryArchiveItemPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setItemValue(AESEncryptUtil.decrypt(item.getItemValue())); - }); - return list; - } - - public static SalaryArchiveItemPO encryptSalaryArchiveItemPO(SalaryArchiveItemPO item) { - if(item == null) { - return item; } - item.setItemValue(AESEncryptUtil.encrypt(item.getItemValue())); - return item; - } - - public static SalaryArchiveItemPO decryptSalaryArchiveItemPO(SalaryArchiveItemPO item) { - if(item == null) { - return item; - } - item.setItemValue(AESEncryptUtil.decrypt(item.getItemValue())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java deleted file mode 100644 index 404b0b3f4..000000000 --- a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.engine.salary.encrypt.archive; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; - -import java.util.List; - -@Deprecated -public class SalaryItemAdjustRecordListDTOEncrypt { - public static List decryptSalaryItemAdjustRecordListDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAdjustBefore(AESEncryptUtil.decrypt(item.getAdjustBefore())); - item.setAdjustAfter(AESEncryptUtil.decrypt(item.getAdjustAfter())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java deleted file mode 100644 index 848c56ab2..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.AddUpDeduction; - -import java.util.List; - -/** - * hrsa_add_up_deduction: 数据加解密 - * 字段： - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - * add_up_illness_medical - * add_up_infant_care - */ -@Deprecated -public class AddUpDeductionEncrypt { - @Deprecated - public static List encryptAddUpDeductionList(List list) { - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - }); - return list; - } - - @Deprecated - public static List decryptAddUpDeductionList(List list) { - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } - - @Deprecated - public static AddUpDeduction encryptAddUpDeduction(AddUpDeduction item) { - if(item == null) { - return item; - } - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - return item; - } - - @Deprecated - public static AddUpDeduction decryptAddUpDeduction(AddUpDeduction item) { - if(item == null) { - return item; - } - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java deleted file mode 100644 index 0750a6422..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * hrsa_add_up_deduction: 数据加解密 - * 字段： - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - */ -@Deprecated -public class AddUpDeductionRecordStrDTOEncrypt { - public static List decryptAddUpDeductionRecordDTO(List list) { - if(list == null || list.size() == 0) { - return new ArrayList<>(); - } - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list.stream().map(item -> { - return AddUpDeductionRecordDTO.builder() - .id(item.getId()) - .employeeId(item.getEmployeeId()) - .username(item.getUsername()) - .declareMonth(item.getDeclareMonth()) - .taxAgentName(item.getTaxAgentName()) - .taxAgentId(item.getTaxAgentId()) - .departmentName(item.getDepartmentName()) - .mobile(item.getMobile()) - .jobNum(item.getJobNum()) - .addUpChildEducation(item.getAddUpChildEducation()) - .addUpContinuingEducation(item.getAddUpContinuingEducation()) - .addUpHousingLoanInterest(item.getAddUpHousingLoanInterest()) - .addUpHousingRent(item.getAddUpHousingRent()) - .addUpSupportElderly(item.getAddUpSupportElderly()) - .addUpIllnessMedical(item.getAddUpIllnessMedical()) - .addUpInfantCare(item.getAddUpInfantCare()) - .build(); - }).collect(Collectors.toList()); - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java deleted file mode 100644 index 4877fe406..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; - -import java.util.List; - -/** - * hrsa_add_up_deduction: 数据加解密 - * 字段： - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - */ -@Deprecated -public class AddUpDeductionStrDTOEncrypt { - public static void decryptAddUpDeductionList(List list) { - if (list == null || list.size() == 0) { - return; - } - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - - } - -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java deleted file mode 100644 index a8b369c80..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO; - -import java.util.List; - -/** - * hrsa_add_up_situation: 加解密 - * 字段： - * add_up_income - * add_up_subtraction - * add_up_social_security_total - * add_up_accumulation_fund_total - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - * add_up_enterprise_and_other - * add_up_other_deduction - * add_up_tax_exempt_income - * add_up_allowed_donation - * add_up_advance_tax - */ -@Deprecated -public class AddUpSituationDTOEncrypt { - public static List encryptAddUpSituationDTOList(List list) { - if (list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - }); - return list; - } - - public static List decryptAddUpSituationDTOList(List list) { - if (list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.decrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.decrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java deleted file mode 100644 index b6debb195..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.AddUpSituation; - -import java.util.List; - -/** - * hrsa_add_up_situation: 加解密 - * 字段： - * add_up_income - * add_up_subtraction - * add_up_social_security_total - * add_up_accumulation_fund_total - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - * add_up_enterprise_and_other - * add_up_other_deduction - * add_up_tax_exempt_income - * add_up_allowed_donation - * add_up_advance_tax - */ -@Deprecated -public class AddUpSituationEncrypt { - public static List encryptAddUpSituationList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - - }); - return list; - } - - public static List decryptAddUpSituationList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.decrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.decrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } - - public static AddUpSituation encryptAddUpSituation(AddUpSituation item) { - if(item == null) { - return item; - } - item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - return item; - } - - public static AddUpSituation decryptAddUpSituation(AddUpSituation item) { - if(item == null) { - return item; - } - item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java deleted file mode 100644 index dd39664f9..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO; - -import java.util.List; - -@Deprecated -public class AddUpSituationRecordDTOEncrypt { - public static List encryptAddUpSituationRecordDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - }); - return list; - } - - public static List decryptAddUpSituationRecordDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.decrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.decrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java deleted file mode 100644 index 6d099a631..000000000 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.OtherDeductionListDTO; - -import java.util.List; - - -/** - * hrsa_other_deduction: 加解密 - * 字段： - * business_healthy_insurance - * tax_delay_endowment_insurance - * other_deduction - * deduction_allowed_donation - */ -@Deprecated -public class OtherDeductionListDTOEncrypt { - public static List encryptOtherDeductionListDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - public static List decryptOtherDeductionListDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - public static OtherDeductionListDTO encryptOtherDeductionListDTO(OtherDeductionListDTO item) { - if(item == null) { - return item; - } - item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - return item; - } - - public static OtherDeductionListDTO decryptOtherDeductionListDTO(OtherDeductionListDTO item) { - if(item == null) { - return item; - } - item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java deleted file mode 100644 index bed9cd935..000000000 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.po.OtherDeductionPO; - -import java.util.List; -@Deprecated -public class OtherDeductionPOEncrypt { - public static List encryptOtherDeductionPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - public static List decryptOtherDeductionPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - public static OtherDeductionPO encryptOtherDeductionPO(OtherDeductionPO item) { - if(item == null) { - return item; - } - item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - return item; - } - - public static OtherDeductionPO decryptOtherDeductionPO(OtherDeductionPO item) { - if(item == null) { - return item; - } - item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java deleted file mode 100644 index 44fffcc1b..000000000 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO; - -import java.util.List; - -/** - * hrsa_other_deduction: 加解密 - * 字段： - * business_healthy_insurance - * tax_delay_endowment_insurance - * other_deduction - * deduction_allowed_donation - */ -@Deprecated -public class OtherDeductionRecordDTOEncrypt { - public static List encryptOtherDeductionRecordDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - public static List decryptOtherDeductionRecordDTOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - public static OtherDeductionRecordDTO encryptOtherDeductionRecordDTO(OtherDeductionRecordDTO item) { - if(item == null) { - return item; - } - item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - return item; - } - - public static OtherDeductionRecordDTO decryptOtherDeductionRecordDTO(OtherDeductionRecordDTO item) { - if(item == null) { - return item; - } - item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); - item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java b/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java deleted file mode 100644 index 448fb2010..000000000 --- a/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * hrsa_special_add_deduction: 加解密 - * 字段： - * children_education - * continuing_education - * housing_loan_interest - * housing_rent - * supporting_elder - * serious_illness_treatment - * infant_care - */ -@Deprecated -public class SpecialAddDeductionEncrypt { - private static final List FIELDS = Arrays.asList( - "childrenEducation", "continuingEducation", "supportingElder", "housingLoanInterest", - "housingRent", "seriousIllnessTreatment", "infantCare"); - - public static T encrypt(T obj) { - if (obj == null) { - return obj; - } - if(obj instanceof List) { - return encrypt(obj); - } - Class clazz = obj.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - field.setAccessible(true); - if (FIELDS.contains(field.getName())) { - try { - Object o = field.get(obj); - if (o instanceof String) { - Object value = AESEncryptUtil.encrypt((String)o); - field.set(obj, value); - } - } catch (IllegalAccessException e) { - //ignore - } - } - } - return obj; - } - - public static List encrypt(List list) { - if (list == null || list.isEmpty()) { - return list; - } - return list.stream().map(SpecialAddDeductionEncrypt::encrypt) - .collect(Collectors.toList()); - } - - public static T decrypt(T obj) { - if (obj == null) { - return obj; - } - if(obj instanceof List) { - return encrypt(obj); - } - Class clazz = obj.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - field.setAccessible(true); - if (FIELDS.contains(field.getName())) { - try { - Object o = field.get(obj); - if (o instanceof String) { - Object value = AESEncryptUtil.decrypt((String)o); - field.set(obj, value); - } - } catch (IllegalAccessException e) { - //ignore - } - } - } - return obj; - } - - public static List decrypt(List list) { - if (list == null || list.isEmpty()) { - return list; - } - return list.stream().map(SpecialAddDeductionEncrypt::decrypt) - .collect(Collectors.toList()); - } -} diff --git a/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java b/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java deleted file mode 100644 index 7c34d4dc9..000000000 --- a/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.engine.salary.encrypt.report; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; - -import java.util.Collection; - -/** - * 薪资核算报表 - */ -@Deprecated -public class SalaryAcctResultReportPOEncrypt { - - public static Collection encryptList(Collection list) { - if (list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setEmployeeId(AESEncryptUtil.encrypt(item.getEmployeeId())); - item.setSalaryAcctEmpId(AESEncryptUtil.encrypt(item.getSalaryAcctEmpId())); - }); - return list; - } - - public static Collection decryptList(Collection list) { - if (list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setEmployeeId(AESEncryptUtil.decrypt(item.getEmployeeId())); - item.setSalaryAcctEmpId(AESEncryptUtil.decrypt(item.getSalaryAcctEmpId())); - }); - return list; - } -} \ No newline at end of file diff --git a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java deleted file mode 100644 index c19d16689..000000000 --- a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.engine.salary.encrypt.salaryacct; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.salaryacct.po.ExcelAcctResultPO; - -import java.util.Collection; -import java.util.List; - -@Deprecated -public class ExcelAcctResultPOEncrypt { - - public static Collection encryptList(Collection list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - }); - return list; - } - - public static Collection decryptList(Collection list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - }); - return list; - } - - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - }); - return list; - } - - public static ExcelAcctResultPO encryptItem(ExcelAcctResultPO item) { - if(item == null) { - return item; - } - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - return item; - } - - public static ExcelAcctResultPO decryptItem(ExcelAcctResultPO item) { - if(item == null) { - return item; - } - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java deleted file mode 100644 index b148d85ad..000000000 --- a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.engine.salary.encrypt.salaryacct; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; - -import java.util.List; - -@Deprecated -public class SalaryAcctResultPOEncrypt { - - @Deprecated - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - item.setOriginResultValue(AESEncryptUtil.encrypt(item.getOriginResultValue())); - }); - return list; - } - - @Deprecated - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - item.setOriginResultValue(AESEncryptUtil.decrypt(item.getOriginResultValue())); - }); - return list; - } - - @Deprecated - public static SalaryAcctResultPO encryptItem(SalaryAcctResultPO item) { - if(item == null) { - return item; - } - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - return item; - } - - @Deprecated - public static SalaryAcctResultPO decryptItem(SalaryAcctResultPO item) { - if(item == null) { - return item; - } - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java deleted file mode 100644 index 592ba011a..000000000 --- a/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.ExcelInsuranceDetailPO; - -import java.util.List; - -/** - * hrsa_excel_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class ExcelInsuranceDetailPOEncrypt { - public static List encryptInsuranceAccountDetailPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - public static List decryptInsuranceAccountDetailPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } - - public static ExcelInsuranceDetailPO decryptItem(ExcelInsuranceDetailPO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - return item; - } - - -} diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java deleted file mode 100644 index 73153f629..000000000 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; - -import java.util.List; - -/** - * hrsa_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class InsuranceAccountDetailPOEncrypt { - public static List encryptInsuranceAccountDetailPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - public static List decryptInsuranceAccountDetailPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } - - public static InsuranceAccountDetailPO decryptItem(InsuranceAccountDetailPO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - return item; - } - - public static InsuranceAccountDetailPO encryptItem(InsuranceAccountDetailPO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - return item; - } - - -} diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java deleted file mode 100644 index 5e5f32724..000000000 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailTempPO; - -import java.util.List; - -/** - * hrsa_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class InsuranceAccountDetailTempPOEncrypt { - public static List encryptInsuranceAccountDetailTempPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - public static List decryptInsuranceAccountDetailTempPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java b/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java deleted file mode 100644 index 73a627e5f..000000000 --- a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; - -import java.util.List; - -/** - * hrsa_bill_batch 加解密 - * 字段: - * other_pay - * social_pay - * fund_pay - */ -@Deprecated -public class SiAccountEncrypt { - @Deprecated - public static List encryptInsuranceAccountBatchList(List list) { - list.forEach(item -> { - item.setOtherPay(AESEncryptUtil.encrypt(item.getOtherPay())); - item.setSocialPay(AESEncryptUtil.encrypt(item.getSocialPay())); - item.setFundPay(AESEncryptUtil.encrypt(item.getFundPay())); - }); - return list; - } - - @Deprecated - public static List decryptInsuranceAccountBatchList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setOtherPay(AESEncryptUtil.decrypt(item.getOtherPay())); - item.setSocialPay(AESEncryptUtil.decrypt(item.getSocialPay())); - item.setFundPay(AESEncryptUtil.decrypt(item.getFundPay())); - }); - return list; - } - - @Deprecated - public static InsuranceAccountBatchPO encryptInsuranceAccountBatch(InsuranceAccountBatchPO item) { - if(item == null) { - return item; - } - item.setOtherPay(AESEncryptUtil.encrypt(item.getOtherPay())); - item.setSocialPay(AESEncryptUtil.encrypt(item.getSocialPay())); - item.setFundPay(AESEncryptUtil.encrypt(item.getFundPay())); - return item; - } - - @Deprecated - public static InsuranceAccountBatchPO decryptInsuranceAccountBatch(InsuranceAccountBatchPO item) { - if(item == null) { - return item; - } - item.setOtherPay(AESEncryptUtil.decrypt(item.getOtherPay())); - item.setSocialPay(AESEncryptUtil.decrypt(item.getSocialPay())); - item.setFundPay(AESEncryptUtil.decrypt(item.getFundPay())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java deleted file mode 100644 index 18233ed58..000000000 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.encrypt.siarchives; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; - -import java.util.List; - -@Deprecated -public class InsuranceArchivesFundSchemePOEncrypt { - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - }); - return list; - } - - public static InsuranceArchivesFundSchemePO encryptItem(InsuranceArchivesFundSchemePO item) { - if(item == null) { - return item; - } - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - return item; - } - - public static InsuranceArchivesFundSchemePO decryptItem(InsuranceArchivesFundSchemePO item) { - if(item == null) { - return item; - } - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java deleted file mode 100644 index d24b22e89..000000000 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.encrypt.siarchives; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; - -import java.util.List; - -@Deprecated -public class InsuranceArchivesOtherSchemePOEncrypt { - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - }); - return list; - } - - public static InsuranceArchivesOtherSchemePO encryptItem(InsuranceArchivesOtherSchemePO item) { - if(item == null) { - return item; - } - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - return item; - } - - public static InsuranceArchivesOtherSchemePO decryptItem(InsuranceArchivesOtherSchemePO item) { - if(item == null) { - return item; - } - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java deleted file mode 100644 index 7490ad352..000000000 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.encrypt.siarchives; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; - -import java.util.List; - -@Deprecated -public class InsuranceArchivesSocialSchemePOEncrypt { - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - }); - return list; - } - - public static InsuranceArchivesSocialSchemePO encryptItem(InsuranceArchivesSocialSchemePO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - return item; - } - - public static InsuranceArchivesSocialSchemePO decryptItem(InsuranceArchivesSocialSchemePO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java b/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java deleted file mode 100644 index 564993785..000000000 --- a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.engine.salary.encrypt.siexport; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siexport.po.AccountExportPO; - -import java.util.List; - -/** - * hrsa_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class AccountExportPOEncrypt { - public static List encryptAccountExportPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - public static List decryptAccountExportPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java b/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java deleted file mode 100644 index d562ac937..000000000 --- a/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.engine.salary.encrypt.siexport; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siexport.po.ExcelAccountExportPO; - -import java.util.List; - -/** - * hrsa_excel_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class ExcelAccountExportPOEncrypt { - public static List encryptExcelAccountExportPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - public static List decryptExcelAccountExportPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java b/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java deleted file mode 100644 index 2f75436c8..000000000 --- a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.engine.salary.encrypt.sischeme; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; - -import java.util.List; - -@Deprecated -public class InsuranceSchemeDetailPOEncrypt { - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit())); - item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost())); - item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit())); - }); - return list; - } - - public static List decryptList(List list) { - - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setLowerLimit(AESEncryptUtil.decrypt(item.getLowerLimit())); - item.setFixedCost(AESEncryptUtil.decrypt(item.getFixedCost())); - item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit())); - }); - return list; - } - - public static InsuranceSchemeDetailPO encryptItem(InsuranceSchemeDetailPO item) { - if(item == null) { - return item; - } - item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit())); - item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost())); - item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit())); - return item; - } - - public static InsuranceSchemeDetailPO decryptItem(InsuranceSchemeDetailPO item) { - if(item == null) { - return item; - } - item.setLowerLimit(AESEncryptUtil.decrypt(item.getLowerLimit())); - item.setFixedCost(AESEncryptUtil.decrypt(item.getFixedCost())); - item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java deleted file mode 100644 index b1bde8463..000000000 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.engine.salary.encrypt.taxdeclaration; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; - -import java.util.List; - -/** - * hrsa_tax_declaration_detail: 加解密 - * 字段： - * field_value - */ - -@Deprecated -public class TaxDeclarationDetailEncrypt { - public static List encryptTaxDeclarationDetailList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue())); - }); - return list; - } - - public static List decryptTaxDeclarationDetailList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); - }); - return list; - } - -} diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java deleted file mode 100644 index 0cbc88a29..000000000 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.engine.salary.encrypt.taxdeclaration; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; - -import java.util.Collection; -import java.util.List; - -/** - * hrsa_tax_declaration_detail: 加解密 - * 字段： - * field_value - */ -@Deprecated -public class TaxDeclarationDetailPOEncrypt { - public static List encryptTaxDeclarationDetailPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue())); - }); - return list; - } - - public static Collection encryptTaxDeclarationDetailPOList(Collection list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue())); - }); - return list; - } - - public static List decryptTaxDeclarationDetailPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); - }); - return list; - } - - - public static TaxDeclarationDetailPO encryptTaxDeclarationDetailPOItem(TaxDeclarationDetailPO item) { - if(item == null) { - return item; - } - item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); - return item; - } -} diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java index 6335aee90..eeae5d130 100644 --- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java +++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java @@ -126,6 +126,13 @@ public class AddUpSituation { @Encrypt private String addUpInfantCare; + /** + * 累计婴幼儿照护 + */ + @SalaryFormulaVar(defaultLabel = "累计个人养老金", labelId = 117732, dataType = "number") + @Encrypt + private String addUpPrivatePension; + /** * 累计企业（职业）年金及其他福利 */ diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index 342d81f53..fd217469e 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -204,6 +204,13 @@ public class AddUpSituationDTO { @Encrypt private String addUpInfantCare; + //累计个人养老金 + @ExcelProperty(index = 24) + @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") + @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") + @Encrypt + private String addUpPrivatePension; + @SalaryTableColumn(text = "操作", width = "20%", column = "operate") @TableTitle(title = "操作", dataIndex = "operate", key = "operate") private String operate; diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java index b32b60cae..e8c2fd0aa 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java @@ -170,4 +170,10 @@ public class AddUpSituationRecordDTO { @TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") @Encrypt private String addUpInfantCare; + + @ExcelProperty(index = 23) + @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") + @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") + @Encrypt + private String addUpPrivatePension; } diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java index fef35da8e..5ea78ea2f 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java @@ -108,6 +108,12 @@ public class OtherDeductionListDTO { @Encrypt private String deductionAllowedDonation; + @ExcelProperty(index = 11) + @SalaryTableColumn(text = "个人养老金", width = "10%", column = "privatePension") + @TableTitle(title = "个人养老金", dataIndex = "privatePension", key = "privatePension") + @Encrypt + private String privatePension; + @SalaryTableColumn(text = "操作", width = "20%", column = "operate") @TableTitle(title = "操作", dataIndex = "operate", key = "operate") private String operate; diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java index caafb0010..5cdbec166 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java @@ -93,4 +93,9 @@ public class OtherDeductionRecordDTO { @TableTitle(title = "准予扣除的捐赠额", dataIndex = "deductionAllowedDonation", key = "deductionAllowedDonation") @Encrypt private String deductionAllowedDonation; + + @SalaryTableColumn(text = "个人养老金", width = "10%", column = "privatePension") + @TableTitle(title = "个人养老金", dataIndex = "privatePension", key = "privatePension") + @Encrypt + private String privatePension; } diff --git a/src/com/engine/salary/entity/datacollection/param/AddUpSituationParam.java b/src/com/engine/salary/entity/datacollection/param/AddUpSituationParam.java index da28b08be..d50184b2f 100644 --- a/src/com/engine/salary/entity/datacollection/param/AddUpSituationParam.java +++ b/src/com/engine/salary/entity/datacollection/param/AddUpSituationParam.java @@ -95,4 +95,7 @@ public class AddUpSituationParam { //累计婴幼儿照护 private String addUpInfantCare; + //累计个人养老金 + private String addUpPrivatePension; + } diff --git a/src/com/engine/salary/entity/datacollection/param/OtherDeductionParam.java b/src/com/engine/salary/entity/datacollection/param/OtherDeductionParam.java index fee579dec..06311ed20 100644 --- a/src/com/engine/salary/entity/datacollection/param/OtherDeductionParam.java +++ b/src/com/engine/salary/entity/datacollection/param/OtherDeductionParam.java @@ -56,5 +56,8 @@ public class OtherDeductionParam { // 准予扣除的捐赠额 private String deductionAllowedDonation; + //个人养老金 + private String privatePension; + } diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java index addccafa3..babc789a9 100644 --- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java @@ -68,6 +68,13 @@ public class OtherDeductionPO { @Encrypt private String deductionAllowedDonation; + /** + * 个人养老金 + */ + @SalaryFormulaVar(defaultLabel = "个人养老金", labelId = 91240, dataType = "number") + @Encrypt + private String privatePension; + /** * 创建时间 */ diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java index d6f6ab501..c24a2f513 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java @@ -18,10 +18,7 @@ import com.engine.salary.util.page.Column; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -44,13 +41,20 @@ public class InsuranceComparisonResultBO { * 构建福利核算结果列表的表头（线下对比） * */ - public static List buildTableColumns4ComparisonResult() { + public static List buildTableColumns4ComparisonResult(Set insuranceBaseSet, Set insurancePerPaySet, Set insuranceComPaySet) { List listAll = MapperProxyFactory.getProxy(ICategoryMapper.class).listAll(); - List socialWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 1).collect(Collectors.toList()); - List fundWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 2).collect(Collectors.toList()); - List otherWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 3).collect(Collectors.toList()); + List socialWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); + List fundWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); + List otherWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); + List socialWelPerList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insurancePerPaySet.contains(e.getId())).collect(Collectors.toList()); + List fundWelPerList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insurancePerPaySet.contains(e.getId())).collect(Collectors.toList()); + List otherWelPerList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insurancePerPaySet.contains(e.getId())).collect(Collectors.toList()); + + List socialWelComList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); + List fundWelComList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); + List otherWelComList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); List columns = Lists.newArrayList(); // 员工信息字段 columns.add(new Column("姓名", "userName", "userName")); @@ -80,33 +84,33 @@ public class InsuranceComparisonResultBO { } //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） - for (ICategoryPO po : socialWelfareList) { + for (ICategoryPO po : socialWelPerList) { columns.add(new Column(po.getInsuranceName() + "个人", po.getId() + "socialPer", po.getId() + "socialPer")); } columns.add(new Column("社保个人合计", "socialPerSum", "socialPerSum")); //住房公积金个人、补充住房公积金个人 - for (ICategoryPO po : fundWelfareList) { + for (ICategoryPO po : fundWelPerList) { columns.add(new Column(po.getInsuranceName() + "个人", po.getId() + "fundPer", po.getId() + "fundPer")); } columns.add(new Column("公积金个人合计", "fundPerSum", "fundPerSum")); //其他个人（比如企业年金个人） - for (ICategoryPO po : otherWelfareList) { + for (ICategoryPO po : otherWelPerList) { columns.add(new Column(po.getInsuranceName() + "个人", po.getId() + "otherPer", po.getId() + "otherPer")); } columns.add(new Column("其他福利个人合计", "otherPerSum", "otherPerSum")); columns.add(new Column("个人合计", "perSum", "perSum")); //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） - for (ICategoryPO po : socialWelfareList) { + for (ICategoryPO po : socialWelComList) { columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "socialCom", po.getId() + "socialCom")); } columns.add(new Column("社保单位合计", "socialComSum", "socialComSum")); //住房公积金单位、补充住房公积金单位 - for (ICategoryPO po : fundWelfareList) { + for (ICategoryPO po : fundWelComList) { columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "fundCom", po.getId() + "fundCom")); } columns.add(new Column("公积金单位合计", "fundComSum", "fundComSum")); //其他单位（比如企业年金单位） - for (ICategoryPO po : otherWelfareList) { + for (ICategoryPO po : otherWelComList) { columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "otherCom", po.getId() + "otherCom")); } columns.add(new Column("其他福利单位合计", "otherComSum", "otherComSum")); @@ -123,7 +127,7 @@ public class InsuranceComparisonResultBO { * 构建福利核算线下对比结果 * */ - public static List> buildComparisonTableData(List accountExportPOS, List excelAccountExportPOS) { + public static List> buildComparisonTableData(List accountExportPOS, List excelAccountExportPOS, Map schemeIdNameMap) { Map> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getWorkcode); // Map> acctResultMap = SalaryEntityUtil.group2Map(accountExportPOS, AccountExportPO::getWorkcode); @@ -162,6 +166,11 @@ public class InsuranceComparisonResultBO { map.put("supplementFundAccount", accountExportPO.getSupplementFundAccount()); map.put("supplementFundAccount" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); + //福利方案名称 + map.put("socialSchemeName", schemeIdNameMap.get(accountExportPO.getSocialSchemeId())); + map.put("fundSchemeName", schemeIdNameMap.get(accountExportPO.getFundSchemeId())); + map.put("otherSchemeName", schemeIdNameMap.get(accountExportPO.getOtherSchemeId())); + //线下值 List excelResultValueList = excelResultMap.get(accountExportPO.getWorkcode()); ExcelAccountExportPO excelAccountExportPO = new ExcelAccountExportPO(); diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index 906cd9e4f..4fe0d32c3 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -50,7 +50,7 @@ public class TaxDeclarationBO { List simpleEmployees, List taxAgents) { if (CollectionUtils.isEmpty(simpleEmployees)) { - return Collections.emptyList(); + simpleEmployees = new ArrayList<>(); } Map taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName); @@ -245,6 +245,9 @@ public class TaxDeclarationBO { // 累计婴幼儿照护 BigDecimal addUpInfantCare = findValue(TaxDeclarationDataIndexConstant.ADD_UP_INFANT_CARE, resultMap, salaryItemMap); valueMap.put(TaxDeclarationDataIndexConstant.ADD_UP_INFANT_CARE, addUpInfantCare.toPlainString()); + // 累计个人养老金 + BigDecimal addUpPrivatePension = findValue(TaxDeclarationDataIndexConstant.ADD_UP_PRIVATE_PENSION, resultMap, salaryItemMap); + valueMap.put(TaxDeclarationDataIndexConstant.ADD_UP_PRIVATE_PENSION, addUpPrivatePension.toPlainString()); // 企业(职业)年金 BigDecimal annuity = findValue(TaxDeclarationDataIndexConstant.ANNUITY, resultMap, salaryItemMap); valueMap.put(TaxDeclarationDataIndexConstant.ANNUITY, annuity.toPlainString()); @@ -412,6 +415,8 @@ public class TaxDeclarationBO { BigDecimal addUpIllnessMedical = findAddUpValue(TaxDeclarationDataIndexConstant.ADD_UP_ILLNESS_MEDICAL, resultMap, salaryItemMap); // 累计婴幼儿照护 BigDecimal addUpInfantCare = findAddUpValue(TaxDeclarationDataIndexConstant.ADD_UP_INFANT_CARE, resultMap, salaryItemMap); + // 累计个人养老金 + BigDecimal addUpPrivatePension = findAddUpValue(TaxDeclarationDataIndexConstant.ADD_UP_PRIVATE_PENSION, resultMap, salaryItemMap); // 累计企业（职业）年金及其他福利 BigDecimal addUpEnterpriseAndOther = findAddUpValue(TaxDeclarationDataIndexConstant.ADD_UP_ENTERPRISE_AND_OTHER, resultMap, salaryItemMap); // 累计其他免税扣除 @@ -452,6 +457,7 @@ public class TaxDeclarationBO { .addUpSupportElderly(addUpSupportElderly.toPlainString()) .addUpIllnessMedical(addUpIllnessMedical.toPlainString()) .addUpInfantCare(addUpInfantCare.toPlainString()) + .addUpPrivatePension(addUpPrivatePension.toPlainString()) .addUpOtherDeduction(addUpOtherDeduction.toPlainString()) .addUpTaxExemptIncome(addUpTaxFreeIncome.toPlainString()) .addUpAllowedDonation(addUpAllowedDonation.toPlainString()) @@ -715,7 +721,6 @@ public class TaxDeclarationBO { private static String findStringValue(String fieldCode, Map> resultMap, Map salaryItemMap) { return resultMap.getOrDefault(salaryItemMap.getOrDefault(fieldCode, 0L), Collections.emptyList()).stream() - .filter(f -> StringUtils.isNotBlank(f.getResultValue())) .map(SalaryAcctResultPO::getResultValue) .findFirst().orElse(""); } diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java index 855a835be..81010fb7b 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java @@ -61,6 +61,7 @@ public class TaxDeclarationDetailBO { .addUpSupportElderly(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ADD_UP_SUPPORT_ELDERLY)) .addUpIllnessMedical(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ADD_UP_ILLNESS_MEDICAL)) .addUpInfantCare(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ADD_UP_INFANT_CARE)) + .addUpPrivatePension(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ADD_UP_PRIVATE_PENSION)) .annuity(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ANNUITY)) .commercialHealthInsurance(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.COMMERCIAL_HEALTH_INSURANCE)) .taxDeferredEndowmentInsurance(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.TAX_DEFERRED_ENDOWMENT_INSURANCE)) diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java index 7cb5ad3cb..3725aaf27 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java @@ -97,10 +97,14 @@ public class TaxDeclarationWageListDTO { @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") private String addUpIllnessMedical; - @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") - @TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") + @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare") + @TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") private String addUpInfantCare; + @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") + @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") + private String addUpPrivatePension; + @SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity") @TableTitle(title = "企业（职业）年金", dataIndex = "annuity", key = "annuity") private String annuity; diff --git a/src/com/engine/salary/maintainer/MaintainerController.java b/src/com/engine/salary/maintainer/MaintainerController.java new file mode 100644 index 000000000..245844bc9 --- /dev/null +++ b/src/com/engine/salary/maintainer/MaintainerController.java @@ -0,0 +1,78 @@ +package com.engine.salary.maintainer; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.maintainer.datacollection.AddUpSituationManager; +import com.engine.salary.maintainer.salaryacct.SalaryAcctManager; +import com.engine.salary.maintainer.salaryacct.SalaryAcctSupplementParam; +import com.engine.salary.util.ResponseResult; +import lombok.extern.slf4j.Slf4j; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.Map; + +/** + * 累计专项附加扣除 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Slf4j +public class MaintainerController { + + private SalaryAcctManager getSalaryAcctManager(User user) { + return ServiceUtil.getService(SalaryAcctManager.class, user); + } + + private AddUpSituationManager getAddUpSituationManager(User user) { + return ServiceUtil.getService(AddUpSituationManager.class, user); + } + + //---------------------------薪资核算 start ------------------------------------ + + /** + * 补充核算 + * + * @return + */ + @GET + @Path("/acct/supplement") + @Produces(MediaType.APPLICATION_JSON) + public String supplementAcctRecord(@Context HttpServletRequest request, @Context HttpServletResponse response) { + SalaryAcctSupplementParam queryParam = SalaryAcctSupplementParam.builder() + .salaryAcctRecordId(Long.parseLong(request.getParameter("salaryAcctRecordId"))) + .salaryItemStrIds(request.getParameter("salaryItemStrIds")).build(); + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>(user).run(getSalaryAcctManager(user)::supplementAcctRecord, queryParam); + } + + + //---------------------------薪资核算 end ------------------------------------ + + + //---------------------------数据采集 往期累计情况 start ------------------------------------ + + /** + * 恢复所有已申报的往期累计数据 + * + * @return + */ + @GET + @Path("/addupsituation/recover") + @Produces(MediaType.APPLICATION_JSON) + public String recoverAddUpSituationHistoryData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult, Boolean>(user).run(getAddUpSituationManager(user)::recoverAddUpHistoryData); + } + //---------------------------数据采集 往期累计情况 end ------------------------------------ + +} diff --git a/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java b/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java new file mode 100644 index 000000000..69f62e147 --- /dev/null +++ b/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java @@ -0,0 +1,66 @@ +package com.engine.salary.maintainer.datacollection; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam; +import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO; +import com.engine.salary.mapper.taxdeclaration.TaxDeclarationMapper; +import com.engine.salary.service.TaxDeclarationService; +import com.engine.salary.service.impl.TaxDeclarationServiceImpl; +import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import weaver.general.BaseBean; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.YearMonth; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author Harryxzy + * @date 2023/04/23 17:23 + * @description 往期累计情况维护类 + */ +public class AddUpSituationManager extends Service { + + private TaxDeclarationMapper getTaxDeclarationMapper() { + return MapperProxyFactory.getProxy(TaxDeclarationMapper.class); + } + + private TaxDeclarationService getTaxDeclarationService() { + return ServiceUtil.getService(TaxDeclarationServiceImpl.class, user); + } + + public boolean recoverAddUpHistoryData() { + // 获取已有的个税申报表记录 + List taxDeclarationList = getTaxDeclarationMapper().listSome(new TaxDeclarationPO()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + Map taxDeclarationMap = SalaryEntityUtil.convert2Map(taxDeclarationList, TaxDeclarationPO::getId, PO->PO.getTaxAgentId()+"-"+sdf.format(PO.getSalaryMonth())); + BaseBean bb = new BaseBean(); + List taxDeclarationIds = taxDeclarationList.stream().map(TaxDeclarationPO::getId).collect(Collectors.toList()); + bb.writeLog("往期累计数据恢复DataIds："+ taxDeclarationIds); + bb.writeLog("往期累计数据恢复DataMap："+ taxDeclarationMap); + boolean result = true; + // 循环调用生成申报单接口 + for(int i =0; i < taxDeclarationList.size(); i++){ + TaxDeclarationPO po = taxDeclarationList.get(i); + bb.writeLog("开始删除生成:"+po.getTaxAgentId()+"-"+po.getSalaryMonth()); + // 删除记录 + int delete = getTaxDeclarationMapper().deleteByIdZj(po.getId()); + LocalDate localDate = SalaryDateUtil.dateToLocalDate(po.getSalaryMonth()); + // 调用生成申报单接口 + YearMonth yearMonth = YearMonth.of(localDate.getYear(),localDate.getMonth()); + try { + getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).taxAgentId(po.getTaxAgentId()).build()); + }catch (Exception e){ + bb.writeLog("错误:"+e); + result = false; + continue; + } + } + return result; + } +} diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java new file mode 100644 index 000000000..b6cb9a8fd --- /dev/null +++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java @@ -0,0 +1,353 @@ +package com.engine.salary.maintainer.salaryacct; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO; +import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculateBO; +import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculatePriorityBO; +import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO; +import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; +import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; +import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; +import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTempPO; +import com.engine.salary.entity.salaryformula.ExpressFormula; +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.entity.salarysob.po.SalarySobBackItemPO; +import com.engine.salary.entity.salarysob.po.SalarySobItemPO; +import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.salaryacct.SalaryAcctResultMapper; +import com.engine.salary.service.*; +import com.engine.salary.service.impl.*; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import com.engine.salary.util.valid.ValidUtil; +import com.google.common.collect.Lists; +import com.weaver.util.threadPool.ThreadPoolUtil; +import com.weaver.util.threadPool.constant.ModulePoolEnum; +import com.weaver.util.threadPool.entity.LocalRunnable; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import weaver.hrm.User; + +import java.math.BigDecimal; +import java.util.*; +import java.util.concurrent.BlockingDeque; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.stream.Collectors; + +/** + * 薪资核算维护类 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Slf4j +public class SalaryAcctManager extends Service { + private SalaryAcctResultMapper getSalaryAcctResultMapper() { + return MapperProxyFactory.getProxy(SalaryAcctResultMapper.class); + } + + private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) { + return ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user); + } + + private SalaryAcctResultService getSalaryAcctResultService(User user) { + return ServiceUtil.getService(SalaryAcctResultServiceImpl.class, user); + } + + private SalarySobItemService getSalarySobItemService(User user) { + return ServiceUtil.getService(SalarySobItemServiceImpl.class, user); + } + + private SalaryItemService getSalaryItemService(User user) { + return ServiceUtil.getService(SalaryItemServiceImpl.class, user); + } + + private SalarySobEmpFieldService getSalarySobEmpFieldService(User user) { + return ServiceUtil.getService(SalarySobEmpFieldServiceImpl.class, user); + } + + private SalarySobService getSalarySobService(User user) { + return ServiceUtil.getService(SalarySobServiceImpl.class, user); + } + + private SalaryAcctRecordService getSalaryAcctRecordService(User user) { + return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user); + } + + private TaxAgentService getTaxAgentService(User user) { + return ServiceUtil.getService(TaxAgentServiceImpl.class, user); + } + + private SalaryEmployeeService getSalaryEmployeeService(User user) { + return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); + } + + private SalaryFormulaService getSalaryFormulaService(User user) { + return ServiceUtil.getService(SalaryFormulaServiceImpl.class, user); + } + + private SalarySobAdjustRuleService getSalarySobAdjustRuleService(User user) { + return ServiceUtil.getService(SalarySobAdjustRuleServiceImpl.class, user); + } + + private SalarySobItemHideService getSalarySobItemHideService(User user) { + return ServiceUtil.getService(SalarySobItemHideServiceImpl.class, user); + } + + private SalaryAcctCalculateService getSalaryAcctCalculateService(User user) { + return ServiceUtil.getService(SalaryAcctCalculateServiceImpl.class, user); + } + + private SalaryAcctProgressService getSalaryAcctProgressService(User user) { + return ServiceUtil.getService(SalaryAcctProgressServiceImpl.class, user); + } + + private DataSourceTransactionManager dataSourceTransactionManager; + + private SalaryAcctResultTempService getSalaryAcctResultTempService(User user) { + return ServiceUtil.getService(SalaryAcctResultTempServiceImpl.class, user); + } +// private LoggerTemplate salaryAcctRecordLoggerTemplate; + + private SIAccountService getSIAccountService(User user) { + return ServiceUtil.getService(SIAccountServiceImpl.class, user); + } + + private AttendQuoteFieldService getAttendQuoteFieldService(User user) { + return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user); + } + + private SalaryAcctReportService getSalaryAcctReportService(User user) { + return ServiceUtil.getService(SalaryAcctReportServiceImpl.class, user); + } + + private SalarySobItemGroupService getSalarySobItemGroupService(User user) { + return ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user); + } + + private SalarySobBackItemService getSalarySobBackItemService(User user) { + return ServiceUtil.getService(SalarySobBackItemServiceImpl.class, user); + } + + + /** + * 补充核算 + * 核算已归档后，需要重新核算某一项 + */ + public void supplementAcctRecord(SalaryAcctSupplementParam param) { + ValidUtil.doValidator(param); + + List salaryItemIds = Arrays.stream(param.getSalaryItemStrIds().split(",")).map(Long::valueOf).collect(Collectors.toList()); + param.setSalaryItemIds(salaryItemIds); + + if(CollectionUtils.isEmpty(salaryItemIds)){ + throw new SalaryRunTimeException("薪资项目为空！"); + } + + calculate(param); + + } + + /** + * 补算 + * + * @param calculateParam 薪资核算的参数 + */ + public void calculate(SalaryAcctSupplementParam calculateParam) { + log.info("补算开始{}", calculateParam); + + //当前登陆人员 + DataCollectionEmployee simpleEmployee = new DataCollectionEmployee(); + simpleEmployee.setEmployeeId((long) user.getUID()); + + // 检查是否正在核算中 + SalaryAcctProgressDTO salaryAcctProgressDTO = getSalaryAcctProgressService(user).getProgress("SUPPLEMENT_ACCT_PROGRESS_" + calculateParam.getSalaryAcctRecordId()); + if (Objects.nonNull(salaryAcctProgressDTO) && salaryAcctProgressDTO.isStatus() && Optional.ofNullable(salaryAcctProgressDTO.getProgress()).orElse(BigDecimal.ZERO).compareTo(BigDecimal.ONE) < 0) { + return; + } + // 初始化进度 + SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO() + .setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")) + .setTitleLabelId(97515L) + .setTotalQuantity(NumberUtils.INTEGER_ONE) + .setCalculatedQuantity(NumberUtils.INTEGER_ZERO) + .setProgress(BigDecimal.ZERO) + .setStatus(true) + .setMessage(StringUtils.EMPTY); + getSalaryAcctProgressService(user).initProgress("SUPPLEMENT_ACCT_PROGRESS_" + calculateParam.getSalaryAcctRecordId(), initProgress); + new Thread() { + public void run() { + calculate(calculateParam, simpleEmployee); + } + }.start(); + + } + + + public void calculate(SalaryAcctSupplementParam calculateParam, DataCollectionEmployee simpleEmployee) { + try { + // 1、查询薪资核算记录 + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId()); + if (Objects.isNull(salaryAcctRecordPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + } + //查询对应账套 + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + if (Objects.isNull(salarySobPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资账套不存在或已被删除")); + } + // 2、查询薪资核算记录的薪资周期、考勤周期等 + SalarySobCycleDTO salarySobCycleDTO = getSalaryAcctRecordService(user).getSalarySobCycleById(calculateParam.getSalaryAcctRecordId()); + // 3、查询薪资核算记录所用薪资账套的薪资项目副本 + List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); + if (CollectionUtils.isEmpty(salarySobItemPOS)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99151, "当前所用的薪资账套未选择任何薪资项目，无法核算")); + } + // 回算薪资项目 + List salarySobBackItems = Collections.emptyList(); + if (Objects.equals(salaryAcctRecordPO.getBackCalcStatus(), 1)) { + salarySobBackItems = getSalarySobBackItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); + } + // 4、查询当前租户的所有薪资项目 + List salaryItemPOS = getSalaryItemService(user).listAll(); + // 5、查询薪资核算记录所用薪资账套的调薪计薪规则 + List salarySobAdjustRulePOS = getSalarySobAdjustRuleService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); + // 6、查询社保福利的所有字段 + Map welfareColumns = getSIAccountService(user).welfareColumns(); + // 7、查询考勤引用的所有字段 + List attendQuoteFieldListDTOS = getAttendQuoteFieldService(user).listAll(); + + //核算锁定值 + List lockSalaryItemIds = salaryAcctRecordPO.getLockSalaryItemIds(); + Map acctResults = new HashMap<>(); + if (CollectionUtils.isNotEmpty(lockSalaryItemIds)) { + List acctResultPOS = getSalaryAcctResultService(user).listBySalaryAcctRecordIds(Collections.singleton(calculateParam.getSalaryAcctRecordId())); + acctResults = Optional.ofNullable(acctResultPOS) + .orElse(new ArrayList<>()) + .stream() + .filter(po -> lockSalaryItemIds.contains(po.getSalaryItemId())) + .collect(Collectors.toMap(po -> po.getSalaryItemId() + "_" + po.getSalaryAcctEmpId(), a -> a, (a, b) -> a)); + } + + // 8、查询公式详情 + Set formulaIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getFormulaId); + formulaIds.addAll(SalaryEntityUtil.properties(salaryItemPOS, SalaryItemPO::getFormulaId)); + formulaIds.addAll(SalaryEntityUtil.properties(salarySobBackItems, SalarySobBackItemPO::getFormulaId)); + List expressFormulas = getSalaryFormulaService(user).listExpressFormula(formulaIds); + // 本次运算的回算薪资项目所涉及的变量 + Set issuedFieldIds = new HashSet<>(); + // 9、计算薪资项目的运算优先级 + List> salarySobItemsWithPriority = SalaryAcctCalculatePriorityBO.calculatePriority(salarySobItemPOS, salaryItemPOS, expressFormulas, salarySobBackItems, issuedFieldIds); + // 10、根据id查询其他合并计税的薪资核算记录 + List otherSalaryAcctRecordPOS = getSalaryAcctRecordService(user).listById4OtherConsolidatedTax(salaryAcctRecordPO.getId()); + // 11、查询本次核算人员 + List salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salaryAcctRecordPO.getId()); + if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(103378, "薪资核算人员不能为空")); + } + // 11.1、初始化进度 + SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")).setTitleLabelId(97515L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY); + getSalaryAcctProgressService(user).initProgress("SUPPLEMENT_ACCT_PROGRESS_" + calculateParam.getSalaryAcctRecordId(), initProgress); + // 12、对薪资核算人员进行拆分 + List> partition = Lists.partition(salaryAcctEmployeePOS, 5000); + // 12.1、监控子线程的任务执行 + CountDownLatch childMonitor = new CountDownLatch(partition.size()); + // 12.2、记录子线程的执行结果 + BlockingDeque calculateResults = new LinkedBlockingDeque<>(partition.size()); + // 12.3、生成本次运算的key + String calculateKey = UUID.randomUUID().toString(); + // 12.4、多线程运算，运算结果存放在临时表中 + for (List acctEmployeePOS : partition) { + SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO() + .setSalaryAcctRecordPO(salaryAcctRecordPO) + .setSalarySobPO(salarySobPO) + .setSalarySobCycleDTO(salarySobCycleDTO) + .setOtherSalaryAcctRecordPOS(otherSalaryAcctRecordPOS) + .setSalaryAcctLockResultPOS(MapUtils.emptyIfNull(acctResults)) + .setLockSalaryItemIds(lockSalaryItemIds) + .setSalarySobItemPOS(salarySobItemPOS) + .setSalaryItemIdWithPriorityList(salarySobItemsWithPriority) + .setExpressFormulas(expressFormulas) + .setSalaryItemPOS(salaryItemPOS) + .setSalarySobAdjustRulePOS(salarySobAdjustRulePOS) + .setWelfareColumns(MapUtils.emptyIfNull(welfareColumns)) + .setAttendQuoteFieldListDTOS(attendQuoteFieldListDTOS) + .setSalaryAcctEmployeePOS(acctEmployeePOS) + .setIssuedFieldIds(issuedFieldIds) + .setChildMonitor(childMonitor) + .setResults(calculateResults) + .setCalculateKey(calculateKey); + List finalSalarySobBackItems = salarySobBackItems; + LocalRunnable localRunnable = new LocalRunnable() { + @Override + public void execute() { + getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems); + } + }; + ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculateV2", localRunnable); + } + // 13、等待所有子线程执行完毕 + childMonitor.await(); + // 14、判断子线程执行结果 + boolean allSuccess = calculateResults.stream().allMatch(SalaryAcctCalculateBO.Result::isStatus); + if (!allSuccess) { + // 薪资核算实现的线程的错误信息 + String errorMsg = calculateResults.stream().filter(result -> !result.isStatus()).map(SalaryAcctCalculateBO.Result::getErrMsg).collect(Collectors.joining("|")); + getSalaryAcctProgressService(user).fail("SUPPLEMENT_ACCT_PROGRESS_" + calculateParam.getSalaryAcctRecordId(), errorMsg); + // 删除薪资核算临时存储表中的数据 + getSalaryAcctResultTempService(user).deleteByCalculateKey(calculateKey); + return; + } + // 15、处理核算结果临时表数据 + handleSalaryAcctResultTemp(calculateParam, calculateKey); + + getSalaryAcctProgressService(user).finish("SUPPLEMENT_ACCT_PROGRESS_" + calculateParam.getSalaryAcctRecordId(), true); + + } catch (Exception e) { + log.info("薪资核算出错：{}", e.getMessage(), e); + getSalaryAcctProgressService(user).fail("SUPPLEMENT_ACCT_PROGRESS_" + calculateParam.getSalaryAcctRecordId(), SalaryI18nUtil.getI18nLabel(99642, "薪资核算出错") + ": " + e.getMessage()); + } + } + + /** + * 处理薪资核算临时存储表中的数据 + * + * @param calculateParam + * @param calculateKey + */ + private void handleSalaryAcctResultTemp(SalaryAcctSupplementParam calculateParam, String calculateKey) { + // 查询薪资核算结果的临时存储 + List salaryAcctResultTempPOS = getSalaryAcctResultTempService(user).listByCalculateKey(calculateKey); + // 删除原来的薪资核算结果 + List salaryItemIds = calculateParam.getSalaryItemIds(); + getSalaryAcctResultMapper().deleteBySalaryAcctRecordIdAndSalaryItemIds(calculateParam.getSalaryAcctRecordId(), salaryItemIds); + // 保存薪资的薪资核算结果 + List salaryAcctResultPOS = salaryAcctResultTempPOS.stream().filter(salaryAcctResultTempPO -> salaryItemIds.contains(salaryAcctResultTempPO.getSalaryItemId())).map(e -> { + SalaryAcctResultPO salaryAcctResult = new SalaryAcctResultPO(); + BeanUtils.copyProperties(e, salaryAcctResult); + return salaryAcctResult; + }).collect(Collectors.toList()); + getSalaryAcctResultService(user).batchSave(salaryAcctResultPOS); + //保存核算报表数据 +// List salaryAcctResultReportPOS = SalaryAcctResultReportBO.convert2ReportPO(salaryAcctResultTempPOS, calculateParam.getEmps()); +// getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); + // 删除薪资核算临时存储表中的数据 + getSalaryAcctResultTempService(user).deleteByCalculateKey(calculateKey); + } + + +} diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctSupplementParam.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctSupplementParam.java new file mode 100644 index 000000000..d3e3c5b95 --- /dev/null +++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctSupplementParam.java @@ -0,0 +1,33 @@ +package com.engine.salary.maintainer.salaryacct; + +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 薪资补充核算的参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SalaryAcctSupplementParam { + + @DataCheck(require = true,message = "参数错误，薪资核算记录ID不能为空") + private Long salaryAcctRecordId; + + @DataCheck(require = true,message = "参数错误，薪资项目ID不能为空") + private String salaryItemStrIds; + + private List salaryItemIds; + +} diff --git a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml index 002e1b4fe..1a4e58158 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml @@ -19,6 +19,7 @@ + @@ -62,6 +63,7 @@ , t.add_up_illness_medical , t.add_up_tax_savings , t.add_up_infant_care + , t.add_up_private_pension @@ -118,6 +120,7 @@ t1.add_up_support_elderly, t1.add_up_illness_medical, t1.add_up_infant_care, + t1.add_up_private_pension, t1.add_up_enterprise_and_other, t1.add_up_other_deduction, t1.add_up_tax_exempt_income, @@ -434,7 +437,8 @@ tenant_key, add_up_tax_savings, add_up_illness_medical, - add_up_infant_care + add_up_infant_care, + add_up_private_pension ) VALUES @@ -463,7 +467,8 @@ #{item.tenantKey}, #{item.addUpTaxSavings}, #{item.addUpIllnessMedical}, - #{item.addUpInfantCare} + #{item.addUpInfantCare}, + #{item.addUpPrivatePension} ) @@ -493,7 +498,8 @@ tenant_key, add_up_tax_savings, add_up_illness_medical, - add_up_infant_care + add_up_infant_care, + add_up_private_pension ) @@ -522,7 +528,8 @@ #{item.tenantKey,jdbcType=VARCHAR}, #{item.addUpTaxSavings,jdbcType=VARCHAR}, #{item.addUpIllnessMedical,jdbcType=VARCHAR}, - #{item.addUpInfantCare,jdbcType=VARCHAR} + #{item.addUpInfantCare,jdbcType=VARCHAR}, + #{item.addUpPrivatePension,jdbcType=VARCHAR} from dual @@ -553,7 +560,8 @@ tenant_key, add_up_tax_savings, add_up_illness_medical, - add_up_infant_care + add_up_infant_care, + add_up_private_pension ) VALUES ( @@ -581,7 +589,8 @@ #{item.tenantKey}, #{item.addUpTaxSavings}, #{item.addUpIllnessMedical}, - #{item.addUpInfantCare} + #{item.addUpInfantCare}, + #{item.addUpPrivatePension} ) @@ -708,6 +717,13 @@ + + + + when id=#{item.id} then #{item.addUpPrivatePension} + + + where id in diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 806a1bf2d..5cec7b295 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -172,9 +172,12 @@ c.id as jobtitleId, e.companystartdate as companystartdate, e.mobile as mobile, - e.enddate as dismissdate + e.enddate as dismissdate, + sc.SUBCOMPANYNAME as subcompanyName, + sc.id as subcompanyid from hrmresource e left join hrmdepartment d on e.departmentid = d.id + left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id left join hrmjobtitles c on e.jobtitle = c.id where e.status not in (7) and (e.accounttype is null or e.accounttype = 0) diff --git a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml index 8ec6bffc5..2d377e0ea 100644 --- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml @@ -15,6 +15,7 @@ + @@ -34,6 +35,7 @@ , t.creator , t.delete_type , t.tenant_key + , t.private_pension @@ -77,7 +79,8 @@ t1.business_healthy_insurance, t1.tax_delay_endowment_insurance, t1.other_deduction, - t1.deduction_allowed_donation + t1.deduction_allowed_donation, + t1.private_pension @@ -332,6 +335,7 @@ tax_delay_endowment_insurance, other_deduction, deduction_allowed_donation, + private_pension, create_time, update_time, creator, @@ -347,6 +351,7 @@ #{item.taxDelayEndowmentInsurance}, #{item.otherDeduction}, #{item.deductionAllowedDonation}, + #{item.privatePension}, #{item.createTime}, #{item.updateTime}, #{item.creator}, @@ -363,6 +368,7 @@ tax_delay_endowment_insurance, other_deduction, deduction_allowed_donation, + private_pension, create_time, update_time, creator, @@ -378,6 +384,7 @@ #{item.taxDelayEndowmentInsurance,jdbcType=VARCHAR}, #{item.otherDeduction,jdbcType=VARCHAR}, #{item.deductionAllowedDonation,jdbcType=VARCHAR}, + #{item.privatePension,jdbcType=VARCHAR}, #{item.createTime,jdbcType=DATE}, #{item.updateTime,jdbcType=DATE}, #{item.creator,jdbcType=DOUBLE}, @@ -395,6 +402,7 @@ tax_delay_endowment_insurance, other_deduction, deduction_allowed_donation, + private_pension, create_time, update_time, creator, @@ -409,6 +417,7 @@ #{item.taxDelayEndowmentInsurance}, #{item.otherDeduction}, #{item.deductionAllowedDonation}, + #{item.privatePension}, #{item.createTime}, #{item.updateTime}, #{item.creator}, @@ -448,6 +457,13 @@ + + + + when id=#{item.id} then #{item.privatePension} + + + where id in diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.java b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.java index 8ef60131e..0ae008b62 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.java +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.java @@ -96,7 +96,7 @@ public interface SalaryAcctResultMapper { void deleteBySalaryAcctEmpIds(@Param("salaryAcctEmpIds") Collection salaryAcctEmpIds); /** - * 根据薪资核算id、薪资项目id删除薪资核算结果 + * 根据薪资核算人员id、薪资项目id删除薪资核算结果 * * @param salaryAcctEmpIds * @param salaryItemIds @@ -104,6 +104,14 @@ public interface SalaryAcctResultMapper { void deleteByAcctEmpIdsAndSalaryItemIds(@Param("salaryAcctEmpIds") Collection salaryAcctEmpIds, @Param("salaryItemIds") Collection salaryItemIds); + /** + * + * @param salaryAcctRecordId + * @param salaryItemIds + */ + void deleteBySalaryAcctRecordIdAndSalaryItemIds(@Param("salaryAcctRecordId") Long salaryAcctRecordId, + @Param("salaryItemIds") Collection salaryItemIds); + /** * 根据薪资核算id删除薪资核算结果 * diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml index 9d54a0004..afd3f4a83 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml @@ -535,6 +535,16 @@ + + DELETE FROM hrsa_salary_acct_result + WHERE delete_type = 0 + AND salary_acct_record_id =#{salaryAcctRecordId} + AND salary_item_id IN + + #{salaryItemId} + + + DELETE FROM hrsa_salary_acct_result WHERE delete_type = 0 diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.java b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.java index a252a430b..5785ed794 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.java +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.java @@ -1,7 +1,6 @@ package com.engine.salary.mapper.taxdeclaration; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Collection; @@ -41,4 +40,5 @@ public interface TaxDeclarationMapper { */ void deleteByIds(@Param("ids") Collection ids); + int deleteByIdZj(Long id); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml index fb270b1e1..6d37dab71 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml @@ -32,6 +32,14 @@ ,t.income_category + + UPDATE hrsa_tax_declaration + SET delete_type = 3 + WHERE delete_type = 0 + AND id = #{id} + + +