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

Merge branch 'release/2.18.1.2412.01' into custom/陕西万众 

# Conflicts:
#	src/com/engine/salary/service/SalarySobItemService.java
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
#	src/com/engine/salary/wrapper/SalarySobItemWrapper.java
This commit is contained in:
Harryxzy 2024-12-13 15:01:36 +08:00
parent 2ec3fa679d c13cc9d0a2
commit dad48112ee
484 changed files with 20552 additions and 2476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resource/WEB-INF/lib/hrmelog.jar
View File

Binary file not shown.

2
resource/WEB-INF/prop/hrmSalary.properties
View File

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

14
resource/sqlupgrade/DM/sql202303130202.sql
View File

@ -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;
/

19
resource/sqlupgrade/DM/sql202404251103.sql Normal file
View File

@ -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);
/

42
resource/sqlupgrade/DM/sql202408090103.sql Normal file
View File

@ -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)
);
/

3
resource/sqlupgrade/DM/sql202408120703.sql Normal file
View File

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

10
resource/sqlupgrade/DM/sql202408140203.sql Normal file
View File

@ -0,0 +1,10 @@
ALTER TABLE hrsa_tax_agent_manage_range ADD (
target varchar2(4000) NULL
);
/
ALTER TABLE hrsa_salary_sob_range ADD (
target varchar2(4000) NULL
);
/

24
resource/sqlupgrade/DM/sql202409130201.sql Normal file
View File

@ -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 ;
/

15
resource/sqlupgrade/DM/sql202409130302.sql Normal file
View File

@ -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;
/

54
resource/sqlupgrade/DM/sql202410090103.sql Normal file
View File

@ -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;
/

70
resource/sqlupgrade/DM/sql202410090203.sql Normal file
View File

@ -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
);
/

8
resource/sqlupgrade/DM/sql202410100103.sql Normal file
View File

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

13
resource/sqlupgrade/DM/sql202410110103.sql Normal file
View File

@ -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)
);
/

3
resource/sqlupgrade/DM/sql202410170303.sql Normal file
View File

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

3
resource/sqlupgrade/DM/sql202410250303.sql Normal file
View File

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

30
resource/sqlupgrade/DM/sql202411060203.sql Normal file
View File

@ -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)
);
/

5
resource/sqlupgrade/DM/sql202411250103.sql Normal file
View File

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

8
resource/sqlupgrade/DM/sql202412030103.sql Normal file
View File

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

14
resource/sqlupgrade/GS/sql202303130202.sql
View File

@ -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;
/

19
resource/sqlupgrade/GS/sql202404251103.sql Normal file
View File

@ -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);
/

42
resource/sqlupgrade/GS/sql202408090103.sql Normal file
View File

@ -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)
);
/

3
resource/sqlupgrade/GS/sql202408120703.sql Normal file
View File

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

10
resource/sqlupgrade/GS/sql202408140203.sql Normal file
View File

@ -0,0 +1,10 @@
ALTER TABLE hrsa_tax_agent_manage_range ADD (
target varchar2(4000) NULL
);
/
ALTER TABLE hrsa_salary_sob_range ADD (
target varchar2(4000) NULL
);
/

24
resource/sqlupgrade/GS/sql202409130201.sql Normal file
View File

@ -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 ;
/

15
resource/sqlupgrade/GS/sql202409130302.sql Normal file
View File

@ -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;
/

54
resource/sqlupgrade/GS/sql202410090103.sql Normal file
View File

@ -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;
/

70
resource/sqlupgrade/GS/sql202410090203.sql Normal file
View File

@ -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
);
/

8
resource/sqlupgrade/GS/sql202410100103.sql Normal file
View File

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

13
resource/sqlupgrade/GS/sql202410110103.sql Normal file
View File

@ -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)
);
/

3
resource/sqlupgrade/GS/sql202410170303.sql Normal file
View File

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

3
resource/sqlupgrade/GS/sql202410250303.sql Normal file
View File

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

30
resource/sqlupgrade/GS/sql202411060203.sql Normal file
View File

@ -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)
);
/

5
resource/sqlupgrade/GS/sql202411250103.sql Normal file
View File

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

8
resource/sqlupgrade/GS/sql202412030103.sql Normal file
View File

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

14
resource/sqlupgrade/JC/sql202303130202.sql
View File

@ -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;
/

19
resource/sqlupgrade/JC/sql202404251103.sql Normal file
View File

@ -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);
/

42
resource/sqlupgrade/JC/sql202408090103.sql Normal file
View File

@ -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)
);
/

3
resource/sqlupgrade/JC/sql202408120703.sql Normal file
View File

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

10
resource/sqlupgrade/JC/sql202408140203.sql Normal file
View File

@ -0,0 +1,10 @@
ALTER TABLE hrsa_tax_agent_manage_range ADD (
target varchar2(4000) NULL
);
/
ALTER TABLE hrsa_salary_sob_range ADD (
target varchar2(4000) NULL
);
/

24
resource/sqlupgrade/JC/sql202409130201.sql Normal file
View File

@ -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 ;
/

15
resource/sqlupgrade/JC/sql202409130302.sql Normal file
View File

@ -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;
/

54
resource/sqlupgrade/JC/sql202410090103.sql Normal file
View File

@ -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;
/

70
resource/sqlupgrade/JC/sql202410090203.sql Normal file
View File

@ -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
);
/

8
resource/sqlupgrade/JC/sql202410100103.sql Normal file
View File

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

13
resource/sqlupgrade/JC/sql202410110103.sql Normal file
View File

@ -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)
);
/

3
resource/sqlupgrade/JC/sql202410170303.sql Normal file
View File

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

3
resource/sqlupgrade/JC/sql202410250303.sql Normal file
View File

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

30
resource/sqlupgrade/JC/sql202411060203.sql Normal file
View File

@ -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)
);
/

5
resource/sqlupgrade/JC/sql202411250103.sql Normal file
View File

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

8
resource/sqlupgrade/JC/sql202412030103.sql Normal file
View File

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

10
resource/sqlupgrade/Mysql/sql202303130202.sql
View File

@ -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
;

16
resource/sqlupgrade/Mysql/sql202404251103.sql Normal file
View File

@ -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);

43
resource/sqlupgrade/Mysql/sql202408090103.sql Normal file
View File

@ -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)
);

1
resource/sqlupgrade/Mysql/sql202408120703.sql Normal file
View File

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

2
resource/sqlupgrade/Mysql/sql202408140203.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE hrsa_tax_agent_manage_range ADD COLUMN target varchar(4000) NULL ;
ALTER TABLE hrsa_salary_sob_range ADD COLUMN target varchar(4000) NULL ;

16
resource/sqlupgrade/Mysql/sql202409130201.sql Normal file
View File

@ -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
;

10
resource/sqlupgrade/Mysql/sql202409130302.sql Normal file
View File

@ -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
;

22
resource/sqlupgrade/Mysql/sql202410090103.sql Normal file
View File

@ -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 ;

29
resource/sqlupgrade/Mysql/sql202410090203.sql Normal file
View File

@ -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;

3
resource/sqlupgrade/Mysql/sql202410100103.sql Normal file
View File

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

12
resource/sqlupgrade/Mysql/sql202410110103.sql Normal file
View File

@ -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)
);

1
resource/sqlupgrade/Mysql/sql202410170303.sql Normal file
View File

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

1
resource/sqlupgrade/Mysql/sql202410250303.sql Normal file
View File

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

28
resource/sqlupgrade/Mysql/sql202411060203.sql Normal file
View File

@ -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
);

1
resource/sqlupgrade/Mysql/sql202411250103.sql Normal file
View File

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

3
resource/sqlupgrade/Mysql/sql202412030103.sql Normal file
View File

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

10
resource/sqlupgrade/Oracle/sql202303130202.sql
View File

@ -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
/

18
resource/sqlupgrade/Oracle/sql202404251103.sql Normal file
View File

@ -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)
/

42
resource/sqlupgrade/Oracle/sql202408090103.sql Normal file
View File

@ -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)
)
/

2
resource/sqlupgrade/Oracle/sql202408120703.sql Normal file
View File

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

10
resource/sqlupgrade/Oracle/sql202408140203.sql Normal file
View File

@ -0,0 +1,10 @@
ALTER TABLE hrsa_tax_agent_manage_range ADD (
target varchar2(4000) NULL
)
/
ALTER TABLE hrsa_salary_sob_range ADD (
target varchar2(4000) NULL
)
/

16
resource/sqlupgrade/Oracle/sql202409130201.sql Normal file
View File

@ -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
/

10
resource/sqlupgrade/Oracle/sql202409130302.sql Normal file
View File

@ -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
/

37
resource/sqlupgrade/Oracle/sql202410090103.sql Normal file
View File

@ -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
/

69
resource/sqlupgrade/Oracle/sql202410090203.sql Normal file
View File

@ -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
)
/

7
resource/sqlupgrade/Oracle/sql202410100103.sql Normal file
View File

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

12
resource/sqlupgrade/Oracle/sql202410110103.sql Normal file
View File

@ -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)
)
/

2
resource/sqlupgrade/Oracle/sql202410170303.sql Normal file
View File

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

2
resource/sqlupgrade/Oracle/sql202410250303.sql Normal file
View File

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

29
resource/sqlupgrade/Oracle/sql202411060203.sql Normal file
View File

@ -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)
)
/

4
resource/sqlupgrade/Oracle/sql202411250103.sql Normal file
View File

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

7
resource/sqlupgrade/Oracle/sql202412030103.sql Normal file
View File

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

10
resource/sqlupgrade/PG/sql202303130202.sql
View File

@ -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;
/

18
resource/sqlupgrade/PG/sql202404251103.sql Normal file
View File

@ -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)
/

38
resource/sqlupgrade/PG/sql202408090103.sql Normal file
View File

@ -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)
);

1
resource/sqlupgrade/PG/sql202408120703.sql Normal file
View File

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

3
resource/sqlupgrade/PG/sql202408140203.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_tax_agent_manage_range add target VARCHAR(4000) null ;
alter table hrsa_salary_sob_range add target VARCHAR(4000) null ;

16
resource/sqlupgrade/PG/sql202409130201.sql Normal file
View File

@ -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)!=octet_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)=octet_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 ;
/

10
resource/sqlupgrade/PG/sql202409130302.sql Normal file
View File

@ -0,0 +1,10 @@
Delete from LeftMenuInfo where id=100219
;
Delete from LeftMenuConfig where infoid=100219
;
select LMConfig_U_ByInfoInsert (2,100126,0)
;
select 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
;

54
resource/sqlupgrade/PG/sql202410090103.sql Normal file
View File

@ -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;
/

68
resource/sqlupgrade/PG/sql202410090203.sql Normal file
View File

@ -0,0 +1,68 @@
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
);

3
resource/sqlupgrade/PG/sql202410100103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_acct_result_template add type int null ;
update hrsa_acct_result_template set type = 0;

11
resource/sqlupgrade/PG/sql202410110103.sql Normal file
View File

@ -0,0 +1,11 @@
create table hrsa_page_list_setting
(
id bigint primary key ,
setting text ,
page varchar(200),
creator bigint,
create_time timestamp ,
update_time timestamp,
delete_type int ,
tenant_key varchar(10)
);

1
resource/sqlupgrade/PG/sql202410170303.sql Normal file
View File

@ -0,0 +1 @@
alter table hrsa_salary_acct_emp add lock_items varchar(4000);

1
resource/sqlupgrade/PG/sql202410250303.sql Normal file
View File

@ -0,0 +1 @@
alter table hrsa_salary_acct_emp add account_type int;

27
resource/sqlupgrade/PG/sql202411060203.sql Normal file
View File

@ -0,0 +1,27 @@
create table hrsa_page_link
(
id bigint primary key,
employee_id bigint,
page varchar(200),
template_id bigint,
creator bigint,
create_time timestamp,
update_time timestamp,
delete_type int,
tenant_key varchar(10)
);
create table hrsa_page_list_template
(
id bigint primary key,
name varchar(200),
page varchar(200),
shared_type int,
limit_ids varchar(2000),
setting text,
creator bigint,
create_time timestamp,
update_time timestamp,
delete_type int,
tenant_key varchar(10)
);

1
resource/sqlupgrade/PG/sql202411250103.sql Normal file
View File

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

3
resource/sqlupgrade/PG/sql202412030103.sql Normal file
View File

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

10
resource/sqlupgrade/SQLServer/sql202303130202.sql
View File

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

19
resource/sqlupgrade/SQLServer/sql202404251103.sql Normal file
View File

@ -0,0 +1,19 @@
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)
)
GO
alter table hrsa_salary_acct_record add approval_id varchar(50)
GO
alter table hrsa_salary_acct_record add approval_status varchar(50)
GO

Some files were not shown because too many files have changed in this diff Show More