Merge branch 'release/个税版本' into custom/艾志工业

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=2.15.1.2407.01
+version=2.19.1.2501.01
 openFormulaForcedEditing=false

resource/sqlupgrade/DM/sql202303130202.sql

@@ -1,14 +0,0 @@
-Delete from LeftMenuInfo where id=100186;
-/
-
-Delete from LeftMenuConfig where infoid=100186;
-/
-
-call LMConfig_U_ByInfoInsert (2,100118,9);
-/
-
-call LMInfo_Insert (100186,541290,'','',2,100118,9,18);
-/
-
-update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186;
-/

resource/sqlupgrade/DM/sql202404251103.sql

@@ -0,0 +1,19 @@
+CREATE TABLE hrsa_salary_approval_rule  (
+  id NUMBER(38,0) primary key,
+  salary_sob_id NUMBER(38,0),
+  open_approval NUMBER,
+  approval_group_setting clob,
+  workflow_url varchar2(500) DEFAULT NULL,
+  delete_type NUMBER,
+  create_time DATE default sysdate,
+  update_time DATE default sysdate,
+  creator NUMBER(38,0)
+);
+/
+
+alter table hrsa_salary_acct_record add approval_id varchar2(50);
+/
+
+alter table hrsa_salary_acct_record add approval_status varchar2(50);
+/
+

resource/sqlupgrade/DM/sql202408090103.sql

@@ -0,0 +1,42 @@
+CREATE TABLE hrsa_variable_archive (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NULL ,
+  salary_month DATE NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL,
+  PRIMARY KEY (id)
+);
+/
+
+CREATE TABLE hrsa_variable_archive_item  (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NOT NULL,
+  variable_archive_id NUMBER(38,0) NOT NULL,
+  variable_item_id NUMBER(38,0) NOT NULL,
+  item_value varchar2(255) NULL ,
+  create_time DATE NOT NULL ,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL ,
+  tenant_key varchar2(10)  NULL,
+  PRIMARY KEY (id)
+);
+/
+
+CREATE TABLE hrsa_variable_item  (
+  id NUMBER(38,0) NOT NULL ,
+  name varchar2(255) NOT NULL ,
+  code varchar2(255) NOT NULL,
+  data_type varchar2(20) NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL ,
+  PRIMARY KEY (id)
+);
+/
+

resource/sqlupgrade/DM/sql202408120703.sql

@@ -0,0 +1,3 @@
+alter table hrsa_variable_archive add tax_agent_id  NUMBER(38,0);
+/
+

resource/sqlupgrade/DM/sql202409130201.sql

@@ -0,0 +1,24 @@
+delete from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  548025,'浮动数据' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮动数据' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'Floating Data' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮動數據' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+

resource/sqlupgrade/DM/sql202409130302.sql

@@ -0,0 +1,15 @@
+Delete from LeftMenuInfo where id=100219;
+/
+
+Delete from LeftMenuConfig where infoid=100219;
+/
+
+call LMConfig_U_ByInfoInsert (2,100126,0);
+/
+
+call LMInfo_Insert (100219,548025,'','',2,100126,7,2);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/variableSalary' where id = 100219;
+/
+

resource/sqlupgrade/DM/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/DM/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/DM/sql202410100103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_acct_result_template ADD (
+	type number NULL
+);
+/
+
+update hrsa_acct_result_template set type = 0;
+/
+

resource/sqlupgrade/DM/sql202410110103.sql

@@ -0,0 +1,13 @@
+create table hrsa_page_list_setting
+(
+    id number primary key ,
+    setting     clob ,
+    page        varchar2(200),
+    creator     number,
+    create_time date ,
+    update_time date,
+    delete_type int  ,
+    tenant_key  varchar2(10)
+);
+/
+

resource/sqlupgrade/DM/sql202410170303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add lock_items varchar2(4000) NULL;
+/
+

resource/sqlupgrade/DM/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/DM/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/DM/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/DM/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/DM/sql202412160303.sql

@@ -0,0 +1,122 @@
+create table hrsa_other_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  other_deduction varchar2(50),
+  remark varchar2(255)
+);
+/
+
+create table hrsa_health_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  identification_number varchar2(255),
+  effective_date date,
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50)
+);
+/
+
+create table hrsa_grant_donation
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  recipient_name varchar2(255),
+  tax_code varchar2(255),
+  donation_number varchar2(255),
+  donate_date date,
+  donate_amount varchar2(50),
+  deduction_proportion varchar2(10),
+  actual_deduction varchar2(50)
+);
+/
+
+create table hrsa_endowment_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  account_number varchar2(255),
+  check_code varchar2(255),
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50),
+  deduction_month date
+);
+/
+
+create table hrsa_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  derate_item varchar2(255),
+  derate_property varchar2(255),
+  derate_amount varchar2(255)
+);
+/
+
+create table hrsa_free_income
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  free_item varchar2(255),
+  free_property varchar2(255),
+  free_amount varchar2(255)
+);
+/
+

resource/sqlupgrade/DM/sql202412160403.sql

@@ -0,0 +1,18 @@
+alter table hrsa_derate_deduction add employee_type int;
+/
+
+alter table hrsa_endowment_insurance add employee_type int;
+/
+
+alter table hrsa_free_income add employee_type int;
+/
+
+alter table hrsa_grant_donation add employee_type int;
+/
+
+alter table hrsa_health_insurance add employee_type int;
+/
+
+alter table hrsa_other_derate_deduction add employee_type int;
+/
+

resource/sqlupgrade/DM/sql202412230103.sql

@@ -0,0 +1,25 @@
+create table hrsa_personal_pension
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  voucher_type varchar2(255),
+  voucher_no varchar2(255),
+  pay_amount varchar2(255),
+  data_source int,
+  collect_source varchar2(50),
+  pay_month date,
+  eb_data_id number,
+  voucher_type_name varchar2(50),
+  employee_type int
+);
+/
+

resource/sqlupgrade/DM/sql202412240103.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_other_deduction ADD (
+	free_income varchar2(255) NULL
+);
+/
+
+ALTER TABLE hrsa_other_deduction ADD (
+	derate_deduction varchar2(255) NULL
+);
+/
+

resource/sqlupgrade/GS/sql202303130202.sql

@@ -1,14 +0,0 @@
-Delete from LeftMenuInfo where id=100186;
-/
-
-Delete from LeftMenuConfig where infoid=100186;
-/
-
-call LMConfig_U_ByInfoInsert (2,100118,9);
-/
-
-call LMInfo_Insert (100186,541290,'','',2,100118,9,18);
-/
-
-update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186;
-/

resource/sqlupgrade/GS/sql202404251103.sql

@@ -0,0 +1,19 @@
+CREATE TABLE hrsa_salary_approval_rule  (
+  id NUMBER(38,0) primary key,
+  salary_sob_id NUMBER(38,0),
+  open_approval NUMBER,
+  approval_group_setting clob,
+  workflow_url varchar2(500) DEFAULT NULL,
+  delete_type NUMBER,
+  create_time DATE default sysdate,
+  update_time DATE default sysdate,
+  creator NUMBER(38,0)
+);
+/
+
+alter table hrsa_salary_acct_record add approval_id varchar2(50);
+/
+
+alter table hrsa_salary_acct_record add approval_status varchar2(50);
+/
+

resource/sqlupgrade/GS/sql202408090103.sql

@@ -0,0 +1,42 @@
+CREATE TABLE hrsa_variable_archive (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NULL ,
+  salary_month DATE NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL,
+  PRIMARY KEY (id)
+);
+/
+
+CREATE TABLE hrsa_variable_archive_item  (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NOT NULL,
+  variable_archive_id NUMBER(38,0) NOT NULL,
+  variable_item_id NUMBER(38,0) NOT NULL,
+  item_value varchar2(255) NULL ,
+  create_time DATE NOT NULL ,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL ,
+  tenant_key varchar2(10)  NULL,
+  PRIMARY KEY (id)
+);
+/
+
+CREATE TABLE hrsa_variable_item  (
+  id NUMBER(38,0) NOT NULL ,
+  name varchar2(255) NOT NULL ,
+  code varchar2(255) NOT NULL,
+  data_type varchar2(20) NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL ,
+  PRIMARY KEY (id)
+);
+/
+

resource/sqlupgrade/GS/sql202408120703.sql

@@ -0,0 +1,3 @@
+alter table hrsa_variable_archive add tax_agent_id  NUMBER(38,0);
+/
+

resource/sqlupgrade/GS/sql202409130201.sql

@@ -0,0 +1,24 @@
+delete from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  548025,'浮动数据' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮动数据' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'Floating Data' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮動數據' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+

resource/sqlupgrade/GS/sql202409130302.sql

@@ -0,0 +1,15 @@
+Delete from LeftMenuInfo where id=100219;
+/
+
+Delete from LeftMenuConfig where infoid=100219;
+/
+
+call LMConfig_U_ByInfoInsert (2,100126,0);
+/
+
+call LMInfo_Insert (100219,548025,'','',2,100126,7,2);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/variableSalary' where id = 100219;
+/
+

resource/sqlupgrade/GS/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/GS/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/GS/sql202410100103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_acct_result_template ADD (
+	type number NULL
+);
+/
+
+update hrsa_acct_result_template set type = 0;
+/
+

resource/sqlupgrade/GS/sql202410110103.sql

@@ -0,0 +1,13 @@
+create table hrsa_page_list_setting
+(
+    id number primary key ,
+    setting     clob ,
+    page        varchar2(200),
+    creator     number,
+    create_time date ,
+    update_time date,
+    delete_type int  ,
+    tenant_key  varchar2(10)
+);
+/
+

resource/sqlupgrade/GS/sql202410170303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add lock_items varchar2(4000) NULL;
+/
+

resource/sqlupgrade/GS/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/GS/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/GS/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/GS/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/GS/sql202412160303.sql

@@ -0,0 +1,122 @@
+create table hrsa_other_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  other_deduction varchar2(50),
+  remark varchar2(255)
+);
+/
+
+create table hrsa_health_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  identification_number varchar2(255),
+  effective_date date,
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50)
+);
+/
+
+create table hrsa_grant_donation
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  recipient_name varchar2(255),
+  tax_code varchar2(255),
+  donation_number varchar2(255),
+  donate_date date,
+  donate_amount varchar2(50),
+  deduction_proportion varchar2(10),
+  actual_deduction varchar2(50)
+);
+/
+
+create table hrsa_endowment_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  account_number varchar2(255),
+  check_code varchar2(255),
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50),
+  deduction_month date
+);
+/
+
+create table hrsa_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  derate_item varchar2(255),
+  derate_property varchar2(255),
+  derate_amount varchar2(255)
+);
+/
+
+create table hrsa_free_income
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  free_item varchar2(255),
+  free_property varchar2(255),
+  free_amount varchar2(255)
+);
+/
+

resource/sqlupgrade/GS/sql202412160403.sql

@@ -0,0 +1,18 @@
+alter table hrsa_derate_deduction add employee_type int;
+/
+
+alter table hrsa_endowment_insurance add employee_type int;
+/
+
+alter table hrsa_free_income add employee_type int;
+/
+
+alter table hrsa_grant_donation add employee_type int;
+/
+
+alter table hrsa_health_insurance add employee_type int;
+/
+
+alter table hrsa_other_derate_deduction add employee_type int;
+/
+

resource/sqlupgrade/GS/sql202412230103.sql

@@ -0,0 +1,25 @@
+create table hrsa_personal_pension
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  voucher_type varchar2(255),
+  voucher_no varchar2(255),
+  pay_amount varchar2(255),
+  data_source int,
+  collect_source varchar2(50),
+  pay_month date,
+  eb_data_id number,
+  voucher_type_name varchar2(50),
+  employee_type int
+);
+/
+

resource/sqlupgrade/GS/sql202412240103.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_other_deduction ADD (
+	free_income varchar2(255) NULL
+);
+/
+
+ALTER TABLE hrsa_other_deduction ADD (
+	derate_deduction varchar2(255) NULL
+);
+/
+

resource/sqlupgrade/JC/sql202303130202.sql

@@ -1,14 +0,0 @@
-Delete from LeftMenuInfo where id=100186;
-/
-
-Delete from LeftMenuConfig where infoid=100186;
-/
-
-call LMConfig_U_ByInfoInsert (2,100118,9);
-/
-
-call LMInfo_Insert (100186,541290,'','',2,100118,9,18);
-/
-
-update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186;
-/

resource/sqlupgrade/JC/sql202404251103.sql

@@ -0,0 +1,19 @@
+CREATE TABLE hrsa_salary_approval_rule  (
+  id NUMBER(38,0) primary key,
+  salary_sob_id NUMBER(38,0),
+  open_approval NUMBER,
+  approval_group_setting clob,
+  workflow_url varchar2(500) DEFAULT NULL,
+  delete_type NUMBER,
+  create_time DATE default sysdate,
+  update_time DATE default sysdate,
+  creator NUMBER(38,0)
+);
+/
+
+alter table hrsa_salary_acct_record add approval_id varchar2(50);
+/
+
+alter table hrsa_salary_acct_record add approval_status varchar2(50);
+/
+

resource/sqlupgrade/JC/sql202408090103.sql

@@ -0,0 +1,42 @@
+CREATE TABLE hrsa_variable_archive (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NULL ,
+  salary_month DATE NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL,
+  PRIMARY KEY (id)
+);
+/
+
+CREATE TABLE hrsa_variable_archive_item  (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NOT NULL,
+  variable_archive_id NUMBER(38,0) NOT NULL,
+  variable_item_id NUMBER(38,0) NOT NULL,
+  item_value varchar2(255) NULL ,
+  create_time DATE NOT NULL ,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL ,
+  tenant_key varchar2(10)  NULL,
+  PRIMARY KEY (id)
+);
+/
+
+CREATE TABLE hrsa_variable_item  (
+  id NUMBER(38,0) NOT NULL ,
+  name varchar2(255) NOT NULL ,
+  code varchar2(255) NOT NULL,
+  data_type varchar2(20) NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL ,
+  PRIMARY KEY (id)
+);
+/
+

resource/sqlupgrade/JC/sql202408120703.sql

@@ -0,0 +1,3 @@
+alter table hrsa_variable_archive add tax_agent_id  NUMBER(38,0);
+/
+

resource/sqlupgrade/JC/sql202409130201.sql

@@ -0,0 +1,24 @@
+delete from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  548025,'浮动数据' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮动数据' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'Floating Data' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮動數據' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+

resource/sqlupgrade/JC/sql202409130302.sql

@@ -0,0 +1,15 @@
+Delete from LeftMenuInfo where id=100219;
+/
+
+Delete from LeftMenuConfig where infoid=100219;
+/
+
+call LMConfig_U_ByInfoInsert (2,100126,0);
+/
+
+call LMInfo_Insert (100219,548025,'','',2,100126,7,2);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/variableSalary' where id = 100219;
+/
+

resource/sqlupgrade/JC/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/JC/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/JC/sql202410100103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_acct_result_template ADD (
+	type number NULL
+);
+/
+
+update hrsa_acct_result_template set type = 0;
+/
+

resource/sqlupgrade/JC/sql202410110103.sql

@@ -0,0 +1,13 @@
+create table hrsa_page_list_setting
+(
+    id number primary key ,
+    setting     clob ,
+    page        varchar2(200),
+    creator     number,
+    create_time date ,
+    update_time date,
+    delete_type int  ,
+    tenant_key  varchar2(10)
+);
+/
+

resource/sqlupgrade/JC/sql202410170303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add lock_items varchar2(4000) NULL;
+/
+

resource/sqlupgrade/JC/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/JC/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/JC/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/JC/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/JC/sql202412160303.sql

@@ -0,0 +1,122 @@
+create table hrsa_other_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  other_deduction varchar2(50),
+  remark varchar2(255)
+);
+/
+
+create table hrsa_health_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  identification_number varchar2(255),
+  effective_date date,
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50)
+);
+/
+
+create table hrsa_grant_donation
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  recipient_name varchar2(255),
+  tax_code varchar2(255),
+  donation_number varchar2(255),
+  donate_date date,
+  donate_amount varchar2(50),
+  deduction_proportion varchar2(10),
+  actual_deduction varchar2(50)
+);
+/
+
+create table hrsa_endowment_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  account_number varchar2(255),
+  check_code varchar2(255),
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50),
+  deduction_month date
+);
+/
+
+create table hrsa_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  derate_item varchar2(255),
+  derate_property varchar2(255),
+  derate_amount varchar2(255)
+);
+/
+
+create table hrsa_free_income
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  free_item varchar2(255),
+  free_property varchar2(255),
+  free_amount varchar2(255)
+);
+/
+

resource/sqlupgrade/JC/sql202412160403.sql

@@ -0,0 +1,18 @@
+alter table hrsa_derate_deduction add employee_type int;
+/
+
+alter table hrsa_endowment_insurance add employee_type int;
+/
+
+alter table hrsa_free_income add employee_type int;
+/
+
+alter table hrsa_grant_donation add employee_type int;
+/
+
+alter table hrsa_health_insurance add employee_type int;
+/
+
+alter table hrsa_other_derate_deduction add employee_type int;
+/
+

resource/sqlupgrade/JC/sql202412230103.sql

@@ -0,0 +1,25 @@
+create table hrsa_personal_pension
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  voucher_type varchar2(255),
+  voucher_no varchar2(255),
+  pay_amount varchar2(255),
+  data_source int,
+  collect_source varchar2(50),
+  pay_month date,
+  eb_data_id number,
+  voucher_type_name varchar2(50),
+  employee_type int
+);
+/
+

resource/sqlupgrade/JC/sql202412240103.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_other_deduction ADD (
+	free_income varchar2(255) NULL
+);
+/
+
+ALTER TABLE hrsa_other_deduction ADD (
+	derate_deduction varchar2(255) NULL
+);
+/
+

resource/sqlupgrade/Mysql/sql202303130202.sql

@@ -1,10 +0,0 @@
-Delete from LeftMenuInfo where id=100186
-;
-Delete from LeftMenuConfig where infoid=100186
-;
-call LMConfig_U_ByInfoInsert (2,100118,9)
-;
-call LMInfo_Insert (100186,541290,'','',2,100118,9,18)
-;
-update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186
-;

resource/sqlupgrade/Mysql/sql202404251103.sql

@@ -0,0 +1,16 @@
+CREATE TABLE hrsa_salary_approval_rule  (
+  id bigint NOT NULL,
+  salary_sob_id bigint NOT NULL,
+  open_approval int NOT NULL,
+  approval_group_setting text NULL,
+  workflow_url varchar(500) NULL DEFAULT NULL,
+  delete_type int NOT NULL,
+  create_time datetime NOT NULL ,
+  update_time datetime NOT NULL,
+  creator bigint NOT NULL,
+  PRIMARY KEY (id)
+);
+
+alter table hrsa_salary_acct_record add approval_id varchar(50);
+
+alter table hrsa_salary_acct_record add approval_status varchar(50);

resource/sqlupgrade/Mysql/sql202408090103.sql

@@ -0,0 +1,43 @@
+CREATE TABLE hrsa_variable_archive (
+  id bigint NOT NULL,
+  employee_id bigint NULL ,
+  salary_month datetime NULL,
+  create_time datetime NOT NULL,
+  update_time datetime NOT NULL,
+  creator bigint NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar(10) NULL,
+  PRIMARY KEY (id)
+)
+;
+
+
+
+CREATE TABLE hrsa_variable_archive_item  (
+  id bigint NOT NULL,
+  employee_id bigint NOT NULL,
+  variable_archive_id bigint NOT NULL,
+  variable_item_id bigint NOT NULL,
+  item_value varchar(255) NULL ,
+  create_time datetime NOT NULL ,
+  update_time datetime NOT NULL,
+  creator bigint NOT NULL,
+  delete_type int NOT NULL ,
+  tenant_key varchar(10)  NULL,
+  PRIMARY KEY (id)
+) ;
+
+
+
+CREATE TABLE hrsa_variable_item  (
+  id bigint NOT NULL,
+  name varchar(255) NOT NULL,
+  code varchar(255)  NOT NULL,
+  data_type varchar(20) NULL,
+  create_time datetime NOT NULL,
+  update_time datetime NOT NULL,
+  creator bigint NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar(10) NULL,
+  PRIMARY KEY (id)
+);

resource/sqlupgrade/Mysql/sql202408120703.sql

@@ -0,0 +1 @@
+alter table hrsa_variable_archive add tax_agent_id   bigint;

resource/sqlupgrade/Mysql/sql202409130201.sql

@@ -0,0 +1,16 @@
+delete from HtmlLabelIndex where id = 548025 and ( indexdesc is null or indexdesc = '' ) 
+;
+insert into HtmlLabelIndex(id,indexdesc) select  548025,'浮动数据' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548025 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 
+;
+delete from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( labelname is null or labelname = ''    ) 
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮动数据' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 
+;
+delete from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  ) 
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'Floating Data' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1 
+;
+delete from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( labelname is null or labelname = ''    ) 
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮動數據' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 
+;

resource/sqlupgrade/Mysql/sql202409130302.sql

@@ -0,0 +1,10 @@
+Delete from LeftMenuInfo where id=100219
+;
+Delete from LeftMenuConfig where infoid=100219
+;
+call LMConfig_U_ByInfoInsert (2,100126,0)
+;
+call LMInfo_Insert (100219,548025,'','',2,100126,7,2)
+;
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/variableSalary' where id = 100219
+;

resource/sqlupgrade/Mysql/sql202410090103.sql

@@ -0,0 +1,22 @@
+ALTER TABLE hrsa_bill_detail_temp
+ADD COLUMN subcompany_name text ,
+ADD COLUMN subcompany_id bigint(0),
+ADD COLUMN department_name text ,
+ADD COLUMN department_id bigint(0),
+ADD COLUMN jobtitle_name text ,
+ADD COLUMN jobtitle_id bigint(0) ,
+ADD COLUMN jobcall text ,
+ADD COLUMN jobcall_id bigint(0),
+ADD COLUMN status text ;
+
+
+ALTER TABLE hrsa_bill_detail
+ADD COLUMN subcompany_name text ,
+ADD COLUMN subcompany_id bigint(0),
+ADD COLUMN department_name text ,
+ADD COLUMN department_id bigint(0),
+ADD COLUMN jobtitle_name text  ,
+ADD COLUMN jobtitle_id bigint(0) ,
+ADD COLUMN jobcall text ,
+ADD COLUMN jobcall_id bigint(0),
+ADD COLUMN status text ;

resource/sqlupgrade/Mysql/sql202410090203.sql

@@ -0,0 +1,29 @@
+update  hrsa_bill_detail a INNER JOIN (
+    select e.id as employeeId,
+    d.departmentname as departmentName,
+    d.id as departmentId,
+    sc.SUBCOMPANYNAME as subcompanyName,
+    sc.id as subcompanyid,
+    c.jobtitlename as jobtitleName,
+    c.id as jobtitleId,
+    e.status as status,
+    e.jobcall as jobcallId,
+    job.name as jobcall
+    from hrmresource e
+    left join hrmdepartment d on e.departmentid = d.id
+    left join hrmjobtitles c on e.jobtitle = c.id
+    left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+    left join hrmjobcall job on e.jobcall=job.id
+    where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    ) as b
+on a.employee_id = b.employeeId
+    set a.department_id = b.departmentId,
+        a.department_name = b.departmentName,
+        a.subcompany_id = b.subcompanyid,
+        a.subcompany_name = b.subcompanyName,
+        a.jobtitle_id = b.jobtitleId,
+        a.jobtitle_name = b.jobtitleName,
+        a.jobcall_id = b.jobcallId,
+        a.jobcall = b.jobcall,
+        a.status = b.status
+where a.delete_type=0;

resource/sqlupgrade/Mysql/sql202410100103.sql

@@ -0,0 +1,3 @@
+ALTER TABLE hrsa_acct_result_template ADD COLUMN type int(0) NULL ;
+
+update hrsa_acct_result_template set type = 0;

resource/sqlupgrade/Mysql/sql202410110103.sql

@@ -0,0 +1,12 @@
+CREATE TABLE hrsa_page_list_setting
+(
+    id          bigint(0) NOT NULL ,
+    setting     text ,
+    page        varchar(200),
+    creator     bigint(0),
+    create_time datetime(0) ,
+    update_time datetime(0),
+    delete_type int(0)  ,
+    tenant_key  varchar(10) ,
+    PRIMARY KEY (id)
+);

resource/sqlupgrade/Mysql/sql202410170303.sql

@@ -0,0 +1 @@
+ALTER TABLE hrsa_salary_acct_emp ADD COLUMN lock_items varchar(4000);

resource/sqlupgrade/Mysql/sql202410250303.sql

@@ -0,0 +1 @@
+ALTER TABLE hrsa_salary_acct_emp ADD COLUMN account_type int(0);

resource/sqlupgrade/Mysql/sql202411060203.sql

@@ -0,0 +1,28 @@
+CREATE TABLE hrsa_page_link
+(
+    id              bigint(0) NOT NULL,
+    employee_id     bigint(0),
+    page            varchar(200),
+    template_id bigint(0),
+    creator         bigint(0),
+    create_time     datetime(0),
+    update_time     datetime(0),
+    delete_type     int(0),
+    tenant_key      varchar(10),
+    PRIMARY KEY (id) USING BTREE
+);
+
+CREATE TABLE hrsa_page_list_template  (
+id bigint(0) NOT NULL,
+name varchar(200),
+page varchar(200),
+shared_type int(0),
+limit_ids varchar(2000),
+setting text,
+creator bigint(0),
+create_time datetime(0),
+update_time datetime(0),
+delete_type int(0),
+tenant_key varchar(10),
+PRIMARY KEY (id) USING BTREE
+);

resource/sqlupgrade/Mysql/sql202411250103.sql

@@ -0,0 +1 @@
+ALTER TABLE hrsa_page_list_setting ADD COLUMN default_setting int;

resource/sqlupgrade/Mysql/sql202412030103.sql

@@ -0,0 +1,3 @@
+ALTER TABLE hrsa_page_list_template ADD COLUMN system_type int;
+
+update hrsa_page_list_template set system_type=0;

resource/sqlupgrade/Mysql/sql202412160303.sql

@@ -0,0 +1,132 @@
+create table hrsa_other_derate_deduction
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  other_deduction varchar(50) comment '其他减免税额'  ,
+  remark varchar(255) comment '备注' 
+)
+;
+
+
+create table hrsa_health_insurance
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  identification_number varchar(255) comment '税优识别码' ,
+  effective_date date comment '保单生效日期' ,
+  year_premium varchar(50) comment '年度保费' ,
+  month_premium varchar(50) comment '月度保费' ,
+  current_deduction varchar(50) comment '本期扣除金额' 
+)
+;
+
+
+create table hrsa_grant_donation
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  recipient_name varchar(255) comment '受赠单位名称' ,
+  tax_code varchar(255) comment '受赠单位纳税人识别号' ,
+  donation_number varchar(255) comment '捐赠凭证号' ,
+  donate_date date comment '捐赠日期' ,
+  donate_amount varchar(50) comment '捐赠金额' ,
+  deduction_proportion varchar(10) comment '扣除比例' ,
+  actual_deduction varchar(50) comment '实际扣除金额' 
+)
+;
+
+
+
+create table hrsa_endowment_insurance
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  account_number varchar(255) comment '税延养老账户编号' ,
+  check_code varchar(255) comment '报税校验码' ,
+  year_premium varchar(50) comment '年度保费' ,
+  month_premium varchar(50) comment '月度保费' ,
+  current_deduction varchar(50) comment '本期扣除金额'  ,
+  deduction_month date comment '申请扣除月份' 
+)
+;
+
+
+create table hrsa_derate_deduction
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  derate_item varchar(255) comment '减免事项' ,
+  derate_property varchar(255) comment '减免性质' ,
+  derate_amount varchar(255) comment '减免税额' 
+)
+;
+
+
+
+create table hrsa_free_income
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  free_item varchar(255) comment '免税事项' ,
+  free_property varchar(255) comment '免税性质' ,
+  free_amount varchar(255) comment '免税金额' 
+)
+;
+
+
+
+

resource/sqlupgrade/Mysql/sql202412160403.sql

@@ -0,0 +1,12 @@
+alter table hrsa_derate_deduction add employee_type int
+;
+alter table hrsa_endowment_insurance add employee_type int
+;
+alter table hrsa_free_income add employee_type int
+;
+alter table hrsa_grant_donation add employee_type int
+;
+alter table hrsa_health_insurance add employee_type int
+;
+alter table hrsa_other_derate_deduction add employee_type int
+;

resource/sqlupgrade/Mysql/sql202412230103.sql

@@ -0,0 +1,24 @@
+create table hrsa_personal_pension
+(
+  id bigint primary key  comment 'ID' ,
+  create_time datetime comment '创建时间' ,
+  update_time datetime comment '修改时间' ,
+  creator bigint comment '创建人id' ,
+  delete_type int default 0 comment '是否删除' ,
+  tenant_key varchar(10) comment '租户KEY' ,
+  main_id bigint comment '主表数据id' ,
+  tax_year_month date comment '税款所属期' ,
+  employee_id bigint comment '人员id' ,
+  tax_agent_id bigint comment '个税扣缴义务人id' ,
+  file_status int comment '归档状态 0未归档 1已归档' ,
+  voucher_type varchar(255) comment '凭证类型' ,
+  voucher_no varchar(255) comment '凭证编码' ,
+  pay_amount varchar(255) comment '金额' ,
+  data_source int comment '数据来源' ,
+  collect_source varchar(50) comment '采集来源' ,
+  pay_month date comment '缴费月度' ,
+  eb_data_id bigint comment 'eb数据id' ,
+  voucher_type_name varchar(50) comment '凭证类型' ,
+  employee_type int comment '人员类型' 
+)
+;

resource/sqlupgrade/Mysql/sql202412240103.sql

@@ -0,0 +1,3 @@
+ALTER TABLE hrsa_other_deduction
+ADD COLUMN free_income varchar(255) ,
+ADD COLUMN derate_deduction varchar(255) ;

resource/sqlupgrade/Oracle/sql202303130202.sql

@@ -1,10 +0,0 @@
-Delete from LeftMenuInfo where id=100186
-/
-Delete from LeftMenuConfig where infoid=100186
-/
-call LMConfig_U_ByInfoInsert (2,100118,9)
-/
-call LMInfo_Insert (100186,541290,'','',2,100118,9,18)
-/
-update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186
-/

resource/sqlupgrade/Oracle/sql202404251103.sql

@@ -0,0 +1,18 @@
+CREATE TABLE hrsa_salary_approval_rule  (
+  id NUMBER(38,0) primary key,
+  salary_sob_id NUMBER(38,0),
+  open_approval NUMBER,
+  approval_group_setting clob,
+  workflow_url varchar2(500) DEFAULT NULL,
+  delete_type NUMBER,
+  create_time DATE default sysdate,
+  update_time DATE default sysdate,
+  creator NUMBER(38,0)
+)
+/
+
+alter table hrsa_salary_acct_record add approval_id varchar2(50)
+/
+
+alter table hrsa_salary_acct_record add approval_status varchar2(50)
+/

resource/sqlupgrade/Oracle/sql202408090103.sql

@@ -0,0 +1,42 @@
+CREATE TABLE hrsa_variable_archive (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NULL ,
+  salary_month DATE NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL,
+  PRIMARY KEY (id)
+)
+/
+
+CREATE TABLE hrsa_variable_archive_item  (
+  id NUMBER(38,0) NOT NULL,
+  employee_id NUMBER(38,0) NOT NULL,
+  variable_archive_id NUMBER(38,0) NOT NULL,
+  variable_item_id NUMBER(38,0) NOT NULL,
+  item_value varchar2(255) NULL ,
+  create_time DATE NOT NULL ,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL ,
+  tenant_key varchar2(10)  NULL,
+  PRIMARY KEY (id)
+) 
+/
+
+
+CREATE TABLE hrsa_variable_item  (
+  id NUMBER(38,0) NOT NULL ,
+  name varchar2(255) NOT NULL ,
+  code varchar2(255) NOT NULL,
+  data_type varchar2(20) NULL,
+  create_time DATE NOT NULL,
+  update_time DATE NOT NULL,
+  creator NUMBER(38,0) NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar2(10) NULL ,
+  PRIMARY KEY (id)
+)
+/

resource/sqlupgrade/Oracle/sql202408120703.sql

@@ -0,0 +1,2 @@
+alter table hrsa_variable_archive add tax_agent_id  NUMBER(38,0)
+/

resource/sqlupgrade/Oracle/sql202409130201.sql

@@ -0,0 +1,16 @@
+delete from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is null ) 
+/
+insert into HtmlLabelIndex(id,indexdesc) select  548025,'浮动数据' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548025 and ( trim(indexdesc) is not null ))  and rownum = 1 
+/
+delete from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is null    ) 
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮动数据' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 
+/
+delete from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) 
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'Floating Data' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 
+/
+delete from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is null    ) 
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  548025 as indexid ,'浮動數據' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548025 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 
+/

resource/sqlupgrade/Oracle/sql202409130302.sql

@@ -0,0 +1,10 @@
+Delete from LeftMenuInfo where id=100219
+/
+Delete from LeftMenuConfig where infoid=100219
+/
+call LMConfig_U_ByInfoInsert (2,100126,0)
+/
+call LMInfo_Insert (100219,548025,'','',2,100126,7,2)
+/
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/variableSalary' where id = 100219
+/

resource/sqlupgrade/Oracle/sql202410090103.sql

@@ -0,0 +1,37 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null
+/
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add department_id NUMBER null
+/
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL
+/
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL
+/
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail add subcompany_id NUMBER null
+/
+alter table hrsa_bill_detail add department_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail add department_id NUMBER null
+/
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL
+/
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL
+/
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL
+/
+alter table hrsa_bill_detail add status varchar2(200) NULL
+/

resource/sqlupgrade/Oracle/sql202410090203.sql

@@ -0,0 +1,69 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          )
+/

resource/sqlupgrade/Oracle/sql202410100103.sql

@@ -0,0 +1,7 @@
+ALTER TABLE hrsa_acct_result_template ADD (
+	type number NULL
+)
+/
+
+update hrsa_acct_result_template set type = 0
+/

resource/sqlupgrade/Oracle/sql202410110103.sql

@@ -0,0 +1,12 @@
+create table hrsa_page_list_setting
+(
+    id number primary key ,
+    setting     clob ,
+    page        varchar2(200),
+    creator     number,
+    create_time date ,
+    update_time date,
+    delete_type int  ,
+    tenant_key  varchar2(10)
+)
+/

resource/sqlupgrade/Oracle/sql202410170303.sql

@@ -0,0 +1,2 @@
+alter table hrsa_salary_acct_emp add lock_items varchar2(4000) NULL
+/

resource/sqlupgrade/Oracle/sql202410250303.sql

@@ -0,0 +1,2 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER
+/

resource/sqlupgrade/Oracle/sql202411060203.sql

@@ -0,0 +1,29 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+)
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+)
+/

resource/sqlupgrade/Oracle/sql202411250103.sql

@@ -0,0 +1,4 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+)
+/

resource/sqlupgrade/Oracle/sql202412030103.sql

@@ -0,0 +1,7 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+)
+/
+
+update hrsa_page_list_template set system_type=0
+/

resource/sqlupgrade/Oracle/sql202412160303.sql

@@ -0,0 +1,127 @@
+create table hrsa_other_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  other_deduction varchar2(50),
+  remark varchar2(255)
+)
+/
+
+
+create table hrsa_health_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  identification_number varchar2(255),
+  effective_date date,
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50)
+)
+/
+
+
+
+create table hrsa_grant_donation
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  recipient_name varchar2(255),
+  tax_code varchar2(255),
+  donation_number varchar2(255),
+  donate_date date,
+  donate_amount varchar2(50),
+  deduction_proportion varchar2(10),
+  actual_deduction varchar2(50)
+)
+/
+
+
+create table hrsa_endowment_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  account_number varchar2(255),
+  check_code varchar2(255),
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50),
+  deduction_month date
+)
+/
+
+
+create table hrsa_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  derate_item varchar2(255),
+  derate_property varchar2(255),
+  derate_amount varchar2(255)
+)
+/
+
+
+create table hrsa_free_income
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  free_item varchar2(255),
+  free_property varchar2(255),
+  free_amount varchar2(255)
+)
+/

resource/sqlupgrade/Oracle/sql202412160403.sql

@@ -0,0 +1,12 @@
+alter table hrsa_derate_deduction add employee_type int
+/
+alter table hrsa_endowment_insurance add employee_type int
+/
+alter table hrsa_free_income add employee_type int
+/
+alter table hrsa_grant_donation add employee_type int
+/
+alter table hrsa_health_insurance add employee_type int
+/
+alter table hrsa_other_derate_deduction add employee_type int
+/

resource/sqlupgrade/Oracle/sql202412230103.sql

@@ -0,0 +1,24 @@
+create table hrsa_personal_pension
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  voucher_type varchar2(255),
+  voucher_no varchar2(255),
+  pay_amount varchar2(255),
+  data_source int,
+  collect_source varchar2(50),
+  pay_month date,
+  eb_data_id number,
+  voucher_type_name varchar2(50),
+  employee_type int
+)
+/

resource/sqlupgrade/Oracle/sql202412240103.sql

@@ -0,0 +1,9 @@
+ALTER TABLE hrsa_other_deduction ADD (
+	free_income varchar2(255) NULL
+)
+/
+
+ALTER TABLE hrsa_other_deduction ADD (
+	derate_deduction varchar2(255) NULL
+)
+/

resource/sqlupgrade/PG/sql202303130202.sql

@@ -1,10 +0,0 @@
-Delete from LeftMenuInfo where id=100186;
-/
-Delete from LeftMenuConfig where infoid=100186;
-/
-select LMConfig_U_ByInfoInsert (2,100118,9);
-/
-select LMInfo_Insert (100186,541290,'','',2,100118,9,18);
-/
-update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186;
-/

resource/sqlupgrade/PG/sql202404251103.sql

@@ -0,0 +1,18 @@
+CREATE TABLE hrsa_salary_approval_rule  (
+  id bigint primary key,
+  salary_sob_id bigint,
+  open_approval int,
+  approval_group_setting text,
+  workflow_url varchar(500) DEFAULT NULL,
+  delete_type int,
+  create_time timestamp,
+  update_time timestamp,
+  creator bigint
+)
+/
+
+alter table hrsa_salary_acct_record add approval_id varchar(50)
+/
+
+alter table hrsa_salary_acct_record add approval_status varchar(50)
+/

resource/sqlupgrade/PG/sql202408090103.sql

@@ -0,0 +1,38 @@
+CREATE TABLE hrsa_variable_archive_item  (
+  id bigint NOT NULL,
+  employee_id bigint NOT NULL,
+  variable_archive_id bigint NOT NULL,
+  variable_item_id bigint NOT NULL,
+  item_value varchar(255) NULL,
+  create_time timestamp NOT NULL,
+  update_time timestamp NOT NULL,
+  creator bigint NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar(10) NULL,
+  PRIMARY KEY (id)
+) ;
+
+CREATE TABLE hrsa_variable_archive (
+  id bigint NOT NULL,
+  employee_id bigint NULL,
+  salary_month timestamp NULL ,
+  create_time timestamp NOT NULL,
+  update_time timestamp NOT NULL,
+  creator bigint NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar(10) NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE hrsa_variable_item  (
+  id bigint NOT NULL,
+  name varchar(255) NOT NULL,
+  code varchar(255) NOT NULL,
+  data_type varchar(20)NULL ,
+  create_time timestamp NOT NULL,
+  update_time timestamp NOT NULL,
+  creator bigint NOT NULL,
+  delete_type int NOT NULL,
+  tenant_key varchar(10) NULL,
+  PRIMARY KEY (id) 
+);