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

Merge branch 'develop' into release

This commit is contained in:
钱涛 2022-05-31 20:07:33 +08:00
parent 69c76ea687 2c71590c98
commit 7633a06636
6 changed files with 2665 additions and 4324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resource/ecology9/sqlupgrade/Mysql/sql202205310203.sql Normal file
View File

@ -0,0 +1,22 @@
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 (1653993466778, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房贷款利息}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47');
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 (1653993466787, '累计住房贷款利息', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{累计专项附加扣除.累计住房贷款利息}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47');
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 (1653993837931, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房租金}', 'addUpDeductions_addUpHousingRent', 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58');
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 (1653993837947, '累计住房租金', 1653993837931, 'addUpDeductions_addUpHousingRent', '{累计专项附加扣除.累计住房租金}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58');
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 (1653993954233, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计继续教育}', 'addUpDeductions_addUpContinuingEducation', 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54');
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 (1653993954257, '累计继续教育', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{累计专项附加扣除.累计继续教育}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54');
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 (1653994061764, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计赡养老人}', 'addUpDeductions_addUpSupportElderly', 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42');
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 (1653994061780, '累计赡养老人', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{累计专项附加扣除.累计赡养老人}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42');
delete from hrsa_salary_item where sys_salary_item_id in (674853617092214800,674853617092214801,674853617092214802,674853617092214803);
update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800;
update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801;
update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802;
update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803;

29
resource/ecology9/sqlupgrade/Oracle/sql202205310203.sql Normal file
View File

@ -0,0 +1,29 @@
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 (1653993466778, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房贷款利息}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
/
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 (1653993466787, '累计住房贷款利息', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{累计专项附加扣除.累计住房贷款利息}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
/
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 (1653993837931, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房租金}', 'addUpDeductions_addUpHousingRent', 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
/
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 (1653993837947, '累计住房租金', 1653993837931, 'addUpDeductions_addUpHousingRent', '{累计专项附加扣除.累计住房租金}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
/
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 (1653993954233, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计继续教育}', 'addUpDeductions_addUpContinuingEducation', 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
/
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 (1653993954257, '累计继续教育', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{累计专项附加扣除.累计继续教育}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
/
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 (1653994061764, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计赡养老人}', 'addUpDeductions_addUpSupportElderly', 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
/
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 (1653994061780, '累计赡养老人', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{累计专项附加扣除.累计赡养老人}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
/
update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800
/
update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801
/
update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802
/
update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803
/

10
resource/ecology9/sqlupgrade/SQLServer/sql202205200203.sql
View File

@ -1,11 +1,11 @@
ALTER TABLE hrsa_add_up_situation
ADD add_up_illness_medical varchar(255) NOT NULL DEFAULT ('') ,
add_up_tax_savings varchar(255) NOT NULL DEFAULT ('') ,
add_up_infant_care varchar(255) NOT NULL DEFAULT ('')
ADD add_up_illness_medical varchar(255) NULL ,
add_up_tax_savings varchar(255) NULL ,
add_up_infant_care varchar(255) NULL
GO
ALTER TABLE hrsa_add_up_deduction
ADD add_up_illness_medical varchar(255) NOT NULL DEFAULT (''),
add_up_infant_care varchar(255) NOT NULL DEFAULT ('')
ADD add_up_illness_medical varchar(255) NULL,
add_up_infant_care varchar(255) NULL
GO

30
resource/ecology9/sqlupgrade/SQLServer/sql202205310203.sql Normal file
View File

@ -0,0 +1,30 @@
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 (1653993466778, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房贷款利息}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
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 (1653993466787, '累计住房贷款利息', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{累计专项附加扣除.累计住房贷款利息}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
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 (1653993837931, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房租金}', 'addUpDeductions_addUpHousingRent', 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
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 (1653993837947, '累计住房租金', 1653993837931, 'addUpDeductions_addUpHousingRent', '{累计专项附加扣除.累计住房租金}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
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 (1653993954233, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计继续教育}', 'addUpDeductions_addUpContinuingEducation', 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
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 (1653993954257, '累计继续教育', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{累计专项附加扣除.累计继续教育}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
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 (1653994061764, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计赡养老人}', 'addUpDeductions_addUpSupportElderly', 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
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 (1653994061780, '累计赡养老人', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{累计专项附加扣除.累计赡养老人}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
GO
delete from hrsa_salary_item where sys_salary_item_id in (674853617092214800,674853617092214801,674853617092214802,674853617092214803)
GO
update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800
GO
update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801
GO
update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802
GO
update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803
GO

6867
resource/sql/mysql.sql
View File

File diff suppressed because it is too large Load Diff

31
resource/sql/公式配置修改.sql Normal file
View File

@ -0,0 +1,31 @@
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 (1653993466778, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房贷款利息}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
/
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 (1653993466787, '累计住房贷款利息', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{累计专项附加扣除.累计住房贷款利息}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
/
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 (1653993837931, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房租金}', 'addUpDeductions_addUpHousingRent', 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
/
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 (1653993837947, '累计住房租金', 1653993837931, 'addUpDeductions_addUpHousingRent', '{累计专项附加扣除.累计住房租金}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
/
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 (1653993954233, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计继续教育}', 'addUpDeductions_addUpContinuingEducation', 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
/
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 (1653993954257, '累计继续教育', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{累计专项附加扣除.累计继续教育}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
/
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 (1653994061764, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计赡养老人}', 'addUpDeductions_addUpSupportElderly', 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
/
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 (1653994061780, '累计赡养老人', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{累计专项附加扣除.累计赡养老人}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
/
delete from hrsa_salary_item where sys_salary_item_id in (674853617092214800,674853617092214801,674853617092214802,674853617092214803)
/
update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800
/
update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801
/
update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802
/
update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803
/