Merge branch 'release/3.0.2.2504.01' into custom/复旦大学附属儿科医院

# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/service/SalaryAcctResultService.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
This commit is contained in:
Harryxzy 2025-08-15 09:50:21 +08:00
commit 4f051fcf04
365 changed files with 16869 additions and 2991 deletions

Binary file not shown.

View File

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

View File

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="GB2312"?>
<config name="薪酬管理权限" key="salary">
<module name="算薪" key="calculate">
<page name="社保福利档案" key="siArchive">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="社保福利台账" key="siAccount">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资账套" key="salarySob">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资档案" key="salaryArchive">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="调薪管理" key="adjustRecord">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资核算" key="salaryAcct">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="工资单" key="salaryBill">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="个税申报" key="taxDeclaration">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
<module name="数据采集" key="collection">
<page name="累计专项附加扣除" key="addUpDeduction">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="专项附加扣除" key="specialAddDeduction">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="其他免税扣除" key="otherDeduction">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="往期累计情况" key="addUpSituation">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="考勤引用" key="attendQuote">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="浮动数据" key="variableArchive">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
<module name="报表" key="report">
<page name="报表" key="report">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
<module name="设置" key="config">
<page name="个税扣缴义务人" key="taxAgent">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="社保福利方案" key="siScheme">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资项目管理" key="salaryItem">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="字段管理" key="salaryField">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
</config>

View File

@ -0,0 +1,24 @@
delete from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,15 @@
Delete from LeftMenuInfo where id=100220;
/
Delete from LeftMenuConfig where infoid=100220;
/
call LMConfig_U_ByInfoInsert (2,100181,0);
/
call LMInfo_Insert (100220,548105,'','',2,100181,5,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220;
/

View File

@ -0,0 +1,113 @@
CREATE TABLE hrsa_auth_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
link number NOT NULL,
target_type number NOT NULL,
target varchar2(4000),
target_name varchar2(4000),
sorted_index number NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_member
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target varchar2(4000) NOT NULL,
target_name varchar2(4000) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_opt
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
page varchar2(200) NOT NULL,
opt varchar2(200) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_role
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(255) NOT NULL,
description varchar2(400),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_emp
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_resource
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target NUMBER(38,0) NOT NULL,
target_name varchar2(255),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_sob_tax_link
(
id NUMBER(38,0) primary key NOT NULL,
sob_id NUMBER(38,0) NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,34 @@
CREATE TABLE hrsa_push_setting
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(200),
able number,
salary_sob_ids varchar2(2000),
mode_id number,
mode_name varchar2(200),
table_name varchar2(200),
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_setting_item
(
id NUMBER(38,0) NOT NULL,
setting_id NUMBER(38,0),
source varchar2(100),
item varchar2(200),
item_name varchar2(200),
field_name varchar2(200),
field_type number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,72 @@
CREATE TABLE hrsa_hrm_snapshot (
ID NUMBER(38,0) primary key NOT NULL,
snapshot_time date,
employee_id NUMBER(38,0),
loginid varchar2(100),
LASTNAME varchar2(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar2(60),
MOBILE varchar2(60) ,
MOBILECALL varchar2(60) ,
EMAIL varchar2(60),
LOCATIONID int,
WORKROOM varchar2(60),
HOMEADDRESS varchar2(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int ,
JOBTITLENAME varchar2(200) ,
JOBACTIVITYDESC varchar2(200),
JOBLEVEL int ,
SECLEVEL int ,
DEPARTMENTID int ,
DEPARTMENTNAME varchar2(200) ,
SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar2(200) ,
COSTCENTERID int ,
MANAGERID int ,
ASSISTANTID int,
BANKID1 int ,
ACCOUNTID1 varchar2(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar2(60) ,
NATIVEPLACE varchar2(100) ,
EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar2(60) ,
REGRESIDENTPLACE varchar2(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar2(200) ,
POLICY varchar2(30) ,
DEGREE varchar2(30) ,
USEKIND int ,
JOBCALL int ,
jobcallname varchar2(200) ,
ACCUMFUNDACCOUNT varchar2(30),
BIRTHPLACE varchar2(60) ,
FOLK varchar2(30) ,
RESIDENTPHONE varchar2(60) ,
RESIDENTPOSTCODE varchar2(60) ,
EXTPHONE varchar2(50) ,
MANAGERSTR varchar2(500),
STATUS int ,
FAX varchar2(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar2(60),
PROBATIONENDDATE char(10),
COUNTRYID int ,
ACCOUNTTYPE int ,
BELONGTO int ,
ACCOUNTNAME varchar2(200) ,
companystartdate varchar2(10),
workstartdate varchar2(10) ,
companyworkyear number ,
workyear number
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_page_list_template add file_id int;
/

View File

@ -0,0 +1,42 @@
CREATE TABLE hrsa_push_record
(
id NUMBER(38,0) NOT NULL,
name varchar2(200),
setting_id NUMBER(38,0),
mode_id number,
table_name varchar2(100),
acct_record_id NUMBER(38,0),
type number,
status number,
start_time date,
end_time date,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_record_detail
(
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER;
/
ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0);
/

View File

@ -0,0 +1,24 @@
delete from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,15 @@
Delete from LeftMenuInfo where id=100220;
/
Delete from LeftMenuConfig where infoid=100220;
/
call LMConfig_U_ByInfoInsert (2,100181,0);
/
call LMInfo_Insert (100220,548105,'','',2,100181,5,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220;
/

View File

@ -0,0 +1,113 @@
CREATE TABLE hrsa_auth_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
link number NOT NULL,
target_type number NOT NULL,
target varchar2(4000),
target_name varchar2(4000),
sorted_index number NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_member
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target varchar2(4000) NOT NULL,
target_name varchar2(4000) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_opt
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
page varchar2(200) NOT NULL,
opt varchar2(200) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_role
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(255) NOT NULL,
description varchar2(400),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_emp
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_resource
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target NUMBER(38,0) NOT NULL,
target_name varchar2(255),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_sob_tax_link
(
id NUMBER(38,0) primary key NOT NULL,
sob_id NUMBER(38,0) NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,34 @@
CREATE TABLE hrsa_push_setting
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(200),
able number,
salary_sob_ids varchar2(2000),
mode_id number,
mode_name varchar2(200),
table_name varchar2(200),
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_setting_item
(
id NUMBER(38,0) NOT NULL,
setting_id NUMBER(38,0),
source varchar2(100),
item varchar2(200),
item_name varchar2(200),
field_name varchar2(200),
field_type number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,72 @@
CREATE TABLE hrsa_hrm_snapshot (
ID NUMBER(38,0) primary key NOT NULL,
snapshot_time date,
employee_id NUMBER(38,0),
loginid varchar2(100),
LASTNAME varchar2(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar2(60),
MOBILE varchar2(60) ,
MOBILECALL varchar2(60) ,
EMAIL varchar2(60),
LOCATIONID int,
WORKROOM varchar2(60),
HOMEADDRESS varchar2(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int ,
JOBTITLENAME varchar2(200) ,
JOBACTIVITYDESC varchar2(200),
JOBLEVEL int ,
SECLEVEL int ,
DEPARTMENTID int ,
DEPARTMENTNAME varchar2(200) ,
SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar2(200) ,
COSTCENTERID int ,
MANAGERID int ,
ASSISTANTID int,
BANKID1 int ,
ACCOUNTID1 varchar2(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar2(60) ,
NATIVEPLACE varchar2(100) ,
EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar2(60) ,
REGRESIDENTPLACE varchar2(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar2(200) ,
POLICY varchar2(30) ,
DEGREE varchar2(30) ,
USEKIND int ,
JOBCALL int ,
jobcallname varchar2(200) ,
ACCUMFUNDACCOUNT varchar2(30),
BIRTHPLACE varchar2(60) ,
FOLK varchar2(30) ,
RESIDENTPHONE varchar2(60) ,
RESIDENTPOSTCODE varchar2(60) ,
EXTPHONE varchar2(50) ,
MANAGERSTR varchar2(500),
STATUS int ,
FAX varchar2(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar2(60),
PROBATIONENDDATE char(10),
COUNTRYID int ,
ACCOUNTTYPE int ,
BELONGTO int ,
ACCOUNTNAME varchar2(200) ,
companystartdate varchar2(10),
workstartdate varchar2(10) ,
companyworkyear number ,
workyear number
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_page_list_template add file_id int;
/

View File

@ -0,0 +1,42 @@
CREATE TABLE hrsa_push_record
(
id NUMBER(38,0) NOT NULL,
name varchar2(200),
setting_id NUMBER(38,0),
mode_id number,
table_name varchar2(100),
acct_record_id NUMBER(38,0),
type number,
status number,
start_time date,
end_time date,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_record_detail
(
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER;
/
ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0);
/

View File

@ -0,0 +1,24 @@
delete from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,15 @@
Delete from LeftMenuInfo where id=100220;
/
Delete from LeftMenuConfig where infoid=100220;
/
call LMConfig_U_ByInfoInsert (2,100181,0);
/
call LMInfo_Insert (100220,548105,'','',2,100181,5,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220;
/

View File

@ -0,0 +1,113 @@
CREATE TABLE hrsa_auth_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
link number NOT NULL,
target_type number NOT NULL,
target varchar2(4000),
target_name varchar2(4000),
sorted_index number NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_member
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target varchar2(4000) NOT NULL,
target_name varchar2(4000) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_opt
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
page varchar2(200) NOT NULL,
opt varchar2(200) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_role
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(255) NOT NULL,
description varchar2(400),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_emp
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_resource
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target NUMBER(38,0) NOT NULL,
target_name varchar2(255),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_sob_tax_link
(
id NUMBER(38,0) primary key NOT NULL,
sob_id NUMBER(38,0) NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,34 @@
CREATE TABLE hrsa_push_setting
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(200),
able number,
salary_sob_ids varchar2(2000),
mode_id number,
mode_name varchar2(200),
table_name varchar2(200),
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_setting_item
(
id NUMBER(38,0) NOT NULL,
setting_id NUMBER(38,0),
source varchar2(100),
item varchar2(200),
item_name varchar2(200),
field_name varchar2(200),
field_type number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,72 @@
CREATE TABLE hrsa_hrm_snapshot (
ID NUMBER(38,0) primary key NOT NULL,
snapshot_time date,
employee_id NUMBER(38,0),
loginid varchar2(100),
LASTNAME varchar2(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar2(60),
MOBILE varchar2(60) ,
MOBILECALL varchar2(60) ,
EMAIL varchar2(60),
LOCATIONID int,
WORKROOM varchar2(60),
HOMEADDRESS varchar2(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int ,
JOBTITLENAME varchar2(200) ,
JOBACTIVITYDESC varchar2(200),
JOBLEVEL int ,
SECLEVEL int ,
DEPARTMENTID int ,
DEPARTMENTNAME varchar2(200) ,
SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar2(200) ,
COSTCENTERID int ,
MANAGERID int ,
ASSISTANTID int,
BANKID1 int ,
ACCOUNTID1 varchar2(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar2(60) ,
NATIVEPLACE varchar2(100) ,
EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar2(60) ,
REGRESIDENTPLACE varchar2(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar2(200) ,
POLICY varchar2(30) ,
DEGREE varchar2(30) ,
USEKIND int ,
JOBCALL int ,
jobcallname varchar2(200) ,
ACCUMFUNDACCOUNT varchar2(30),
BIRTHPLACE varchar2(60) ,
FOLK varchar2(30) ,
RESIDENTPHONE varchar2(60) ,
RESIDENTPOSTCODE varchar2(60) ,
EXTPHONE varchar2(50) ,
MANAGERSTR varchar2(500),
STATUS int ,
FAX varchar2(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar2(60),
PROBATIONENDDATE char(10),
COUNTRYID int ,
ACCOUNTTYPE int ,
BELONGTO int ,
ACCOUNTNAME varchar2(200) ,
companystartdate varchar2(10),
workstartdate varchar2(10) ,
companyworkyear number ,
workyear number
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_page_list_template add file_id int;
/

View File

@ -0,0 +1,42 @@
CREATE TABLE hrsa_push_record
(
id NUMBER(38,0) NOT NULL,
name varchar2(200),
setting_id NUMBER(38,0),
mode_id number,
table_name varchar2(100),
acct_record_id NUMBER(38,0),
type number,
status number,
start_time date,
end_time date,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_record_detail
(
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER;
/
ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0);
/

View File

@ -0,0 +1,16 @@
delete from HtmlLabelIndex where id = 548105 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;

View File

@ -0,0 +1,10 @@
Delete from LeftMenuInfo where id=100220
;
Delete from LeftMenuConfig where infoid=100220
;
call LMConfig_U_ByInfoInsert (2,100181,0)
;
call LMInfo_Insert (100220,548105,'','',2,100181,5,2)
;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220
;

View File

@ -0,0 +1,120 @@
CREATE TABLE hrsa_auth_data
(
id bigint(0) NOT NULL,
role_id bigint(0) NOT NULL,
link int(0) NOT NULL,
target_type int(0) NOT NULL,
target varchar(4000),
target_name varchar(4000),
sorted_index int(0) NOT NULL,
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_auth_member
(
id bigint(0) NOT NULL,
role_id bigint(0) NOT NULL,
target_type int(0) NOT NULL,
target varchar(4000) NOT NULL,
target_name varchar(4000) NOT NULL,
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_auth_opt
(
id bigint(0) NOT NULL,
role_id bigint(0) NOT NULL,
page varchar(200) NOT NULL,
opt varchar(200) NOT NULL,
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_auth_role
(
id bigint(0) NOT NULL,
name varchar(255) NOT NULL,
description varchar(400),
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10) NOT NULL,
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_auth_role_data
(
id bigint(0) NOT NULL,
role_id bigint(0) NOT NULL,
employee_id bigint(0) NOT NULL,
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10) NOT NULL,
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_auth_role_emp
(
id bigint(0) NOT NULL,
role_id bigint(0) NOT NULL,
employee_id bigint(0) NOT NULL,
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10) NOT NULL,
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_auth_resource
(
id bigint(0) NOT NULL,
role_id bigint(0) NOT NULL,
target_type int(0) NOT NULL,
target bigint(0) NOT NULL,
target_name varchar(255),
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id) USING BTREE
);
CREATE TABLE hrsa_sob_tax_link
(
id bigint(0) NOT NULL,
sob_id bigint(0) NOT NULL,
tax_agent_id bigint(0) NOT NULL,
creator bigint(0) NOT NULL,
create_time datetime(0) NOT NULL,
update_time datetime(0) NOT NULL,
delete_type int(0) NOT NULL,
tenant_key varchar(10) ,
PRIMARY KEY (id) USING BTREE
) ;

View File

@ -0,0 +1,35 @@
CREATE TABLE hrsa_push_setting
(
id bigint(0) NOT NULL,
name varchar(200),
able int(0),
salary_sob_ids varchar(2000),
mode_id int(0),
mode_name varchar(200),
table_name varchar(200),
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_push_setting_item
(
id bigint(0) NOT NULL,
setting_id bigint(0),
source varchar(100),
item varchar(200),
item_name varchar(200),
field_name varchar(200),
field_type int(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
);

View File

@ -0,0 +1,71 @@
CREATE TABLE hrsa_hrm_snapshot (
ID bigint(0) NOT NULL,
snapshot_time datetime(0),
employee_id bigint(0),
loginid varchar(100),
LASTNAME varchar(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int(0) ,
MARITALSTATUS char(1) ,
TELEPHONE varchar(60),
MOBILE varchar(60) ,
MOBILECALL varchar(60) ,
EMAIL varchar(60),
LOCATIONID int(0),
WORKROOM varchar(60),
HOMEADDRESS varchar(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int(0) ,
JOBTITLENAME varchar(200) ,
JOBACTIVITYDESC varchar(200),
JOBLEVEL int(0) ,
SECLEVEL int(0) ,
DEPARTMENTID int(0) ,
DEPARTMENTNAME varchar(200) ,
SUBCOMPANYID1 int(0) ,
SUBCOMPANYNAME varchar(200) ,
COSTCENTERID int(0) ,
MANAGERID int(0) ,
ASSISTANTID int(0),
BANKID1 int(0) ,
ACCOUNTID1 varchar(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar(60) ,
NATIVEPLACE varchar(100) ,
EDUCATIONLEVEL int(0) ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar(60) ,
REGRESIDENTPLACE varchar(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar(200) ,
POLICY varchar(30) ,
DEGREE varchar(30) ,
USEKIND int(0) ,
JOBCALL int(0) ,
jobcallname varchar(200) ,
ACCUMFUNDACCOUNT varchar(30),
BIRTHPLACE varchar(60) ,
FOLK varchar(30) ,
RESIDENTPHONE varchar(60) ,
RESIDENTPOSTCODE varchar(60) ,
EXTPHONE varchar(50) ,
MANAGERSTR varchar(500),
STATUS int(0) ,
FAX varchar(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar(60),
PROBATIONENDDATE char(10),
COUNTRYID int(0) ,
ACCOUNTTYPE int(0) ,
BELONGTO int(0) ,
ACCOUNTNAME varchar(200) ,
companystartdate varchar(10),
workstartdate varchar(10) ,
companyworkyear decimal(10, 2) ,
workyear decimal(10, 2) ,
PRIMARY KEY (ID) USING BTREE
) ;

View File

@ -0,0 +1 @@
ALTER TABLE hrsa_page_list_template ADD COLUMN file_id int(0);

View File

@ -0,0 +1,39 @@
CREATE TABLE hrsa_push_record
(
id bigint(0) NOT NULL,
name varchar(200),
setting_id bigint(0),
mode_id int(0),
table_name varchar(100),
acct_record_id bigint(0),
type int(0),
status int(0),
start_time datetime(0),
end_time datetime(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_push_record_detail
(
id bigint(0) NOT NULL,
record_id bigint(0),
acct_emp_id bigint(0),
formula text,
execute_time datetime(0),
status int(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
);
ALTER TABLE hrsa_push_record ADD COLUMN fail_reason varchar(4000);
ALTER TABLE hrsa_push_record_detail ADD COLUMN fail_reason varchar(4000) ;

View File

@ -0,0 +1,3 @@
ALTER TABLE hrsa_push_setting_item ADD COLUMN sorted_index int(0);
ALTER TABLE hrsa_push_record_detail ADD COLUMN data_id bigint(0);

View File

@ -0,0 +1,16 @@
delete from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/

View File

@ -0,0 +1,10 @@
Delete from LeftMenuInfo where id=100220
/
Delete from LeftMenuConfig where infoid=100220
/
call LMConfig_U_ByInfoInsert (2,100181,0)
/
call LMInfo_Insert (100220,548105,'','',2,100181,5,2)
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220
/

View File

@ -0,0 +1,120 @@
CREATE TABLE hrsa_auth_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
link number NOT NULL,
target_type number NOT NULL,
target varchar2(4000),
target_name varchar2(4000),
sorted_index number NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
)
/
CREATE TABLE hrsa_auth_member
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target varchar2(4000) NOT NULL,
target_name varchar2(4000) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
)
/
CREATE TABLE hrsa_auth_opt
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
page varchar2(200) NOT NULL,
opt varchar2(200) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
)
/
CREATE TABLE hrsa_auth_role
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(255) NOT NULL,
description varchar2(400),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
)
/
CREATE TABLE hrsa_auth_role_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
)
/
CREATE TABLE hrsa_auth_role_emp
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
)
/
CREATE TABLE hrsa_auth_resource
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target NUMBER(38,0) NOT NULL,
target_name varchar2(255),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
)
/
CREATE TABLE hrsa_sob_tax_link
(
id NUMBER(38,0) primary key NOT NULL,
sob_id NUMBER(38,0) NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
)
/

View File

@ -0,0 +1,34 @@
CREATE TABLE hrsa_push_setting
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(200),
able number,
salary_sob_ids varchar2(2000),
mode_id number,
mode_name varchar2(200),
table_name varchar2(200),
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
)
/
CREATE TABLE hrsa_push_setting_item
(
id NUMBER(38,0) NOT NULL,
setting_id NUMBER(38,0),
source varchar2(100),
item varchar2(200),
item_name varchar2(200),
field_name varchar2(200),
field_type number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
)
/

View File

@ -0,0 +1,72 @@
CREATE TABLE hrsa_hrm_snapshot (
ID NUMBER(38,0) primary key NOT NULL,
snapshot_time date,
employee_id NUMBER(38,0),
loginid varchar2(100),
LASTNAME varchar2(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar2(60),
MOBILE varchar2(60) ,
MOBILECALL varchar2(60) ,
EMAIL varchar2(60),
LOCATIONID int,
WORKROOM varchar2(60),
HOMEADDRESS varchar2(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int ,
JOBTITLENAME varchar2(200) ,
JOBACTIVITYDESC varchar2(200),
JOBLEVEL int ,
SECLEVEL int ,
DEPARTMENTID int ,
DEPARTMENTNAME varchar2(200) ,
SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar2(200) ,
COSTCENTERID int ,
MANAGERID int ,
ASSISTANTID int,
BANKID1 int ,
ACCOUNTID1 varchar2(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar2(60) ,
NATIVEPLACE varchar2(100) ,
EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar2(60) ,
REGRESIDENTPLACE varchar2(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar2(200) ,
POLICY varchar2(30) ,
DEGREE varchar2(30) ,
USEKIND int ,
JOBCALL int ,
jobcallname varchar2(200) ,
ACCUMFUNDACCOUNT varchar2(30),
BIRTHPLACE varchar2(60) ,
FOLK varchar2(30) ,
RESIDENTPHONE varchar2(60) ,
RESIDENTPOSTCODE varchar2(60) ,
EXTPHONE varchar2(50) ,
MANAGERSTR varchar2(500),
STATUS int ,
FAX varchar2(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar2(60),
PROBATIONENDDATE char(10),
COUNTRYID int ,
ACCOUNTTYPE int ,
BELONGTO int ,
ACCOUNTNAME varchar2(200) ,
companystartdate varchar2(10),
workstartdate varchar2(10) ,
companyworkyear number ,
workyear number
)
/

View File

@ -0,0 +1,2 @@
alter table hrsa_page_list_template add file_id int
/

View File

@ -0,0 +1,41 @@
CREATE TABLE hrsa_push_record
(
id NUMBER(38,0) NOT NULL,
name varchar2(200),
setting_id NUMBER(38,0),
mode_id number,
table_name varchar2(100),
acct_record_id NUMBER(38,0),
type number,
status number,
start_time date,
end_time date,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
)
/
CREATE TABLE hrsa_push_record_detail
(
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
)
/
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000)
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000)
/

View File

@ -0,0 +1,5 @@
ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER
/
ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0)
/

View File

@ -0,0 +1,16 @@
delete from HtmlLabelIndex where id = 548105 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/

View File

@ -0,0 +1,10 @@
Delete from LeftMenuInfo where id=100220
;
Delete from LeftMenuConfig where infoid=100220
;
select LMConfig_U_ByInfoInsert (2,100181,0)
;
select LMInfo_Insert (100220,548105,'','',2,100181,5,2)
;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220
;

View File

@ -0,0 +1,120 @@
CREATE TABLE hrsa_auth_data
(
id bigint NOT NULL,
role_id bigint NOT NULL,
link int NOT NULL,
target_type int NOT NULL,
target varchar(4000),
target_name varchar(4000),
sorted_index int NOT NULL,
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id)
);
CREATE TABLE hrsa_auth_member
(
id bigint NOT NULL,
role_id bigint NOT NULL,
target_type int NOT NULL,
target varchar(4000) NOT NULL,
target_name varchar(4000) NOT NULL,
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id)
);
CREATE TABLE hrsa_auth_opt
(
id bigint NOT NULL,
role_id bigint NOT NULL,
page varchar(200) NOT NULL,
opt varchar(200) NOT NULL,
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id)
);
CREATE TABLE hrsa_auth_role
(
id bigint NOT NULL,
name varchar(255) NOT NULL,
description varchar(400),
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) NOT NULL,
PRIMARY KEY (id)
);
CREATE TABLE hrsa_auth_role_data
(
id bigint NOT NULL,
role_id bigint NOT NULL,
employee_id bigint NOT NULL,
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) NOT NULL,
PRIMARY KEY (id)
);
CREATE TABLE hrsa_auth_role_emp
(
id bigint NOT NULL,
role_id bigint NOT NULL,
employee_id bigint NOT NULL,
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) NOT NULL,
PRIMARY KEY (id)
);
CREATE TABLE hrsa_auth_resource
(
id bigint NOT NULL,
role_id bigint NOT NULL,
target_type int NOT NULL,
target bigint NOT NULL,
target_name varchar(255),
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10),
PRIMARY KEY (id)
);
CREATE TABLE hrsa_sob_tax_link
(
id bigint NOT NULL,
sob_id bigint NOT NULL,
tax_agent_id bigint NOT NULL,
creator bigint NOT NULL,
create_time timestamp NOT NULL,
update_time timestamp NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) ,
PRIMARY KEY (id)
) ;

View File

@ -0,0 +1,34 @@
CREATE TABLE hrsa_push_setting
(
id bigint NOT NULL,
name varchar(200),
able int,
salary_sob_ids varchar(2000),
mode_id int,
mode_name varchar(200),
table_name varchar(200),
creator bigint,
create_time timestamp,
update_time timestamp,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
);
CREATE TABLE hrsa_push_setting_item
(
id bigint NOT NULL,
setting_id bigint,
source varchar(100),
item varchar(200),
item_name varchar(200),
field_name varchar(200),
field_type int,
creator bigint,
create_time timestamp,
update_time timestamp,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
);

View File

@ -0,0 +1,71 @@
CREATE TABLE hrsa_hrm_snapshot (
ID bigint(0) NOT NULL,
snapshot_time timestamp,
employee_id bigint(0),
loginid varchar(100),
LASTNAME varchar(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int(0) ,
MARITALSTATUS char(1) ,
TELEPHONE varchar(60),
MOBILE varchar(60) ,
MOBILECALL varchar(60) ,
EMAIL varchar(60),
LOCATIONID int(0),
WORKROOM varchar(60),
HOMEADDRESS varchar(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int(0) ,
JOBTITLENAME varchar(200) ,
JOBACTIVITYDESC varchar(200),
JOBLEVEL int(0) ,
SECLEVEL int(0) ,
DEPARTMENTID int(0) ,
DEPARTMENTNAME varchar(200) ,
SUBCOMPANYID1 int(0) ,
SUBCOMPANYNAME varchar(200) ,
COSTCENTERID int(0) ,
MANAGERID int(0) ,
ASSISTANTID int(0),
BANKID1 int(0) ,
ACCOUNTID1 varchar(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar(60) ,
NATIVEPLACE varchar(100) ,
EDUCATIONLEVEL int(0) ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar(60) ,
REGRESIDENTPLACE varchar(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar(200) ,
POLICY varchar(30) ,
DEGREE varchar(30) ,
USEKIND int(0) ,
JOBCALL int(0) ,
jobcallname varchar(200) ,
ACCUMFUNDACCOUNT varchar(30),
BIRTHPLACE varchar(60) ,
FOLK varchar(30) ,
RESIDENTPHONE varchar(60) ,
RESIDENTPOSTCODE varchar(60) ,
EXTPHONE varchar(50) ,
MANAGERSTR varchar(500),
STATUS int(0) ,
FAX varchar(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar(60),
PROBATIONENDDATE char(10),
COUNTRYID int(0) ,
ACCOUNTTYPE int(0) ,
BELONGTO int(0) ,
ACCOUNTNAME varchar(200) ,
companystartdate varchar(10),
workstartdate varchar(10) ,
companyworkyear decimal(10, 2) ,
workyear decimal(10, 2) ,
PRIMARY KEY (ID)
) ;

View File

@ -0,0 +1 @@
alter table hrsa_page_list_template add file_id int;

View File

@ -0,0 +1,39 @@
CREATE TABLE hrsa_push_record
(
id bigint NOT NULL,
name varchar(200),
setting_id bigint,
mode_id int,
table_name varchar(100),
acct_record_id bigint,
type int,
status int,
start_time timestamp,
end_time timestamp,
creator bigint,
create_time timestamp,
update_time timestamp,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
);
CREATE TABLE hrsa_push_record_detail
(
id bigint NOT NULL,
record_id bigint,
acct_emp_id bigint,
formula text,
execute_time timestamp,
status int,
creator bigint,
create_time timestamp,
update_time timestamp,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
);
alter table hrsa_push_record add fail_reason VARCHAR(4000) ;
alter table hrsa_push_record_detail add fail_reason VARCHAR(4000) ;

View File

@ -0,0 +1,3 @@
alter table hrsa_push_setting_item add sorted_index int ;
alter table hrsa_push_record_detail add data_id bigint ;

View File

@ -0,0 +1,16 @@
delete from HtmlLabelIndex where id = 548105 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO

View File

@ -0,0 +1,10 @@
Delete from LeftMenuInfo where id=100220
GO
Delete from LeftMenuConfig where infoid=100220
GO
EXECUTE LMConfig_U_ByInfoInsert 2,100181,0
GO
EXECUTE LMInfo_Insert 100220,548105,'','',2,100181,5,2
GO
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220
GO

View File

@ -0,0 +1,117 @@
CREATE TABLE hrsa_auth_data
(
id bigint primary key,
role_id bigint NOT NULL,
link int NOT NULL,
target_type int NOT NULL,
target varchar(4000),
target_name varchar(4000),
sorted_index int NOT NULL,
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10)
)
GO
CREATE TABLE hrsa_auth_member
(
id bigint primary key,
role_id bigint NOT NULL,
target_type int NOT NULL,
target varchar(4000) NOT NULL,
target_name varchar(4000) NOT NULL,
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10)
)
GO
CREATE TABLE hrsa_auth_opt
(
id bigint primary key,
role_id bigint NOT NULL,
page varchar(200) NOT NULL,
opt varchar(200) NOT NULL,
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10)
)
GO
CREATE TABLE hrsa_auth_role
(
id bigint primary key,
name varchar(255) NOT NULL,
description varchar(400),
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) NOT NULL
)
GO
CREATE TABLE hrsa_auth_role_data
(
id bigint primary key,
role_id bigint NOT NULL,
employee_id bigint NOT NULL,
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) NOT NULL
)
GO
CREATE TABLE hrsa_auth_role_emp
(
id bigint primary key,
role_id bigint NOT NULL,
employee_id bigint NOT NULL,
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10) NOT NULL
)
GO
CREATE TABLE hrsa_auth_resource
(
id bigint NOT NULL,
role_id bigint NOT NULL,
target_type int NOT NULL,
target bigint NOT NULL,
target_name varchar(255),
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10)
)
GO
CREATE TABLE hrsa_sob_tax_link
(
id bigint NOT NULL,
sob_id bigint NOT NULL,
tax_agent_id bigint NOT NULL,
creator bigint NOT NULL,
create_time datetime NOT NULL,
update_time datetime NOT NULL,
delete_type int NOT NULL,
tenant_key varchar(10)
)
GO

View File

@ -0,0 +1,36 @@
CREATE TABLE hrsa_push_setting
(
id bigint NOT NULL,
name varchar(200),
able int,
salary_sob_ids varchar(2000),
mode_id int,
mode_name varchar(200),
table_name varchar(200),
creator bigint,
create_time datetime,
update_time datetime,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
)
GO
CREATE TABLE hrsa_push_setting_item
(
id bigint NOT NULL,
setting_id bigint,
source varchar(100),
item varchar(200),
item_name varchar(200),
field_name varchar(200),
field_type int,
creator bigint,
create_time datetime,
update_time datetime,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
)
GO

View File

@ -0,0 +1,72 @@
CREATE TABLE hrsa_hrm_snapshot (
ID bigint NOT NULL,
snapshot_time datetime,
employee_id bigint,
loginid varchar(100),
LASTNAME varchar(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar(60),
MOBILE varchar(60) ,
MOBILECALL varchar(60) ,
EMAIL varchar(60),
LOCATIONID int,
WORKROOM varchar(60),
HOMEADDRESS varchar(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int ,
JOBTITLENAME varchar(200) ,
JOBACTIVITYDESC varchar(200),
JOBLEVEL int ,
SECLEVEL int ,
DEPARTMENTID int ,
DEPARTMENTNAME varchar(200) ,
SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar(200) ,
COSTCENTERID int ,
MANAGERID int ,
ASSISTANTID int,
BANKID1 int ,
ACCOUNTID1 varchar(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar(60) ,
NATIVEPLACE varchar(100) ,
EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar(60) ,
REGRESIDENTPLACE varchar(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar(200) ,
POLICY varchar(30) ,
DEGREE varchar(30) ,
USEKIND int ,
JOBCALL int ,
jobcallname varchar(200) ,
ACCUMFUNDACCOUNT varchar(30),
BIRTHPLACE varchar(60) ,
FOLK varchar(30) ,
RESIDENTPHONE varchar(60) ,
RESIDENTPOSTCODE varchar(60) ,
EXTPHONE varchar(50) ,
MANAGERSTR varchar(500),
STATUS int ,
FAX varchar(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar(60),
PROBATIONENDDATE char(10),
COUNTRYID int ,
ACCOUNTTYPE int ,
BELONGTO int ,
ACCOUNTNAME varchar(200) ,
companystartdate varchar(10),
workstartdate varchar(10) ,
companyworkyear decimal(10, 2) ,
workyear decimal(10, 2),
PRIMARY KEY (id)
)
GO

View File

@ -0,0 +1,2 @@
alter table hrsa_page_list_template add file_id int
go

View File

@ -0,0 +1,43 @@
CREATE TABLE hrsa_push_record
(
id bigint NOT NULL,
name varchar(200),
setting_id bigint,
mode_id int,
table_name varchar(100),
acct_record_id bigint,
type int,
status int,
start_time datetime,
end_time datetime,
creator bigint,
create_time datetime,
update_time datetime,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
)
GO
CREATE TABLE hrsa_push_record_detail
(
id bigint NOT NULL,
record_id bigint,
acct_emp_id bigint,
formula text,
execute_time datetime,
status int,
creator bigint,
create_time datetime,
update_time datetime,
delete_type int,
tenant_key varchar(10),
PRIMARY KEY (id)
)
GO
alter table hrsa_push_record add fail_reason VARCHAR(4000)
go
alter table hrsa_push_record_detail add fail_reason VARCHAR(4000)
go

View File

@ -0,0 +1,5 @@
alter table hrsa_push_setting_item add sorted_index int
go
alter table hrsa_push_record_detail add data_id bigint
go

View File

@ -0,0 +1,24 @@
delete from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 548105,'业务线管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 548105 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'业务线管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'Business Line Management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 548105 as indexid ,'業務線管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 548105 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,15 @@
Delete from LeftMenuInfo where id=100220;
/
Delete from LeftMenuConfig where infoid=100220;
/
call LMConfig_U_ByInfoInsert (2,100181,0);
/
call LMInfo_Insert (100220,548105,'','',2,100181,5,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/roleManagement' where id = 100220;
/

View File

@ -0,0 +1,113 @@
CREATE TABLE hrsa_auth_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
link number NOT NULL,
target_type number NOT NULL,
target varchar2(4000),
target_name varchar2(4000),
sorted_index number NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_member
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target varchar2(4000) NOT NULL,
target_name varchar2(4000) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_opt
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
page varchar2(200) NOT NULL,
opt varchar2(200) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_auth_role
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(255) NOT NULL,
description varchar2(400),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_data
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_role_emp
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10) NOT NULL
);
/
CREATE TABLE hrsa_auth_resource
(
id NUMBER(38,0) primary key NOT NULL,
role_id NUMBER(38,0) NOT NULL,
target_type number NOT NULL,
target NUMBER(38,0) NOT NULL,
target_name varchar2(255),
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_sob_tax_link
(
id NUMBER(38,0) primary key NOT NULL,
sob_id NUMBER(38,0) NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
creator NUMBER(38,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
delete_type number NOT NULL,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,34 @@
CREATE TABLE hrsa_push_setting
(
id NUMBER(38,0) primary key NOT NULL,
name varchar2(200),
able number,
salary_sob_ids varchar2(2000),
mode_id number,
mode_name varchar2(200),
table_name varchar2(200),
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_setting_item
(
id NUMBER(38,0) NOT NULL,
setting_id NUMBER(38,0),
source varchar2(100),
item varchar2(200),
item_name varchar2(200),
field_name varchar2(200),
field_type number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/

View File

@ -0,0 +1,72 @@
CREATE TABLE hrsa_hrm_snapshot (
ID NUMBER(38,0) primary key NOT NULL,
snapshot_time date,
employee_id NUMBER(38,0),
loginid varchar2(100),
LASTNAME varchar2(60),
SEX char(1),
BIRTHDAY char(10) ,
NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar2(60),
MOBILE varchar2(60) ,
MOBILECALL varchar2(60) ,
EMAIL varchar2(60),
LOCATIONID int,
WORKROOM varchar2(60),
HOMEADDRESS varchar2(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
JOBTITLE int ,
JOBTITLENAME varchar2(200) ,
JOBACTIVITYDESC varchar2(200),
JOBLEVEL int ,
SECLEVEL int ,
DEPARTMENTID int ,
DEPARTMENTNAME varchar2(200) ,
SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar2(200) ,
COSTCENTERID int ,
MANAGERID int ,
ASSISTANTID int,
BANKID1 int ,
ACCOUNTID1 varchar2(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar2(60) ,
NATIVEPLACE varchar2(100) ,
EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar2(60) ,
REGRESIDENTPLACE varchar2(200) ,
HEALTHINFO char(1) ,
RESIDENTPLACE varchar2(200) ,
POLICY varchar2(30) ,
DEGREE varchar2(30) ,
USEKIND int ,
JOBCALL int ,
jobcallname varchar2(200) ,
ACCUMFUNDACCOUNT varchar2(30),
BIRTHPLACE varchar2(60) ,
FOLK varchar2(30) ,
RESIDENTPHONE varchar2(60) ,
RESIDENTPOSTCODE varchar2(60) ,
EXTPHONE varchar2(50) ,
MANAGERSTR varchar2(500),
STATUS int ,
FAX varchar2(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar2(60),
PROBATIONENDDATE char(10),
COUNTRYID int ,
ACCOUNTTYPE int ,
BELONGTO int ,
ACCOUNTNAME varchar2(200) ,
companystartdate varchar2(10),
workstartdate varchar2(10) ,
companyworkyear number ,
workyear number
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_page_list_template add file_id int;
/

View File

@ -0,0 +1,42 @@
CREATE TABLE hrsa_push_record
(
id NUMBER(38,0) NOT NULL,
name varchar2(200),
setting_id NUMBER(38,0),
mode_id number,
table_name varchar2(100),
acct_record_id NUMBER(38,0),
type number,
status number,
start_time date,
end_time date,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
CREATE TABLE hrsa_push_record_detail
(
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
create_time date,
update_time date,
delete_type number,
tenant_key varchar2(10)
);
/
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER;
/
ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0);
/

View File

@ -20,10 +20,27 @@ where item.name = '工资薪金合计'
# 获取档案信息
select i.item_value from hrsa_salary_archive_item i
left join hrsa_salary_archive a on a.id = i.salary_archive_id
left join hrsa_salary_item c on c.id=i.salary_item_id
left join hrsa_tax_agent t on a.tax_agent_id=t.id
where a.delete_type=0 and i.delete_type=0 and t.delete_type=0 and c.delete_type=0
and a.employee_id=人员id and t.name=扣缴义务人名称
and c.name='基本工资' order by effective_time desc
select i.item_value from hrsa_salary_archive_item i
left join hrsa_salary_archive a on a.id = i.salary_archive_id
left join hrsa_salary_item c on c.id=i.salary_item_id
left join hrsa_tax_agent t on a.tax_agent_id=t.id
where a.delete_type=0 and i.delete_type=0 and t.delete_type=0 and c.delete_type=0
and a.employee_id=人员id and t.name=扣缴义务人名称
and c.name='基本工资' order by effective_time desc
# 删除系统项目
UPDATE set hrsa_sys_salary_item where delete_type =3 where delete_type =0;
update hrsa_salary_sob_default_item set delete_type =3 where delete_type =0;
update hrsa_salary_sob_item set delete_type= 3 where delete_type =0 and salary_item_id in (select id from hrsa_salary_item where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal')
);
UPDATE hrsa_salary_item set delete_type = 3 where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal');
# 开启系统算税
update hrsa_salary_sys_conf set conf_value = '1' where conf_key = 'taxDeclarationFunction'

View File

@ -64,8 +64,8 @@ delete from hrsa_salary_archive_item where 1=1
;
delete from hrsa_salary_archive_tax_agent where 1=1
;
delete from hrsa_salary_item where 1=1
;
--delete from hrsa_salary_item where 1=1;
delete from hrsa_salary_send where 1=1
;
delete from hrsa_salary_send_info where 1=1

View File

@ -0,0 +1,8 @@
package com.api.salary.web;
import javax.ws.rs.Path;
@Path("/bs/hrmsalary/auth")
public class AuthController extends com.engine.salary.web.AuthController {
}

View File

@ -0,0 +1,8 @@
package com.api.salary.web;
import javax.ws.rs.Path;
@Path("/bs/hrmsalary/push")
public class PushController extends com.engine.salary.web.PushController{
}

View File

@ -96,15 +96,18 @@ public class CheckStopSalaryAction implements Action {
List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
if(CollectionUtils.isEmpty(taxAgentPOS)){
requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在!");
log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在!");
return FAILURE_AND_CONTINUE;
}
Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() );
Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){
requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段!");
log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段!");
return FAILURE_AND_CONTINUE;
}else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){
requestInfo.getRequestManager().setMessage("最后发薪日期格式错误格式为yyyy-MM-dd");
log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString());
return FAILURE_AND_CONTINUE;
}
@ -115,15 +118,17 @@ public class CheckStopSalaryAction implements Action {
List<SalaryArchivePO> salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build());
if(CollectionUtils.isEmpty(salaryArchiveList)){
requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案,请检查后重试!");
log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案,请检查后重试!");
return FAILURE_AND_CONTINUE;
}
if(salaryArchiveList.size() > 1){
requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录,请检查后重试!");
log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录,请检查后重试!");
return FAILURE_AND_CONTINUE;
}
} catch (Exception e) {
log.error("停薪校验异常", e);
log.error("停薪检查异常", e);
requestInfo.getRequestManager().setMessage(e.getMessage());
return FAILURE_AND_CONTINUE;
}

View File

@ -107,15 +107,18 @@ public class StopSalaryAction implements Action {
List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
if(CollectionUtils.isEmpty(taxAgentPOS)){
requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在!");
log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在!");
return FAILURE_AND_CONTINUE;
}
Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() );
Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){
requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段!");
log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段!");
return FAILURE_AND_CONTINUE;
}else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){
requestInfo.getRequestManager().setMessage("最后发薪日期格式错误格式为yyyy-MM-dd");
log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString());
return FAILURE_AND_CONTINUE;
}
@ -123,10 +126,12 @@ public class StopSalaryAction implements Action {
List<SalaryArchivePO> salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build());
if(CollectionUtils.isEmpty(salaryArchiveList)){
requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案,请检查后重试!");
log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案,请检查后重试!");
return FAILURE_AND_CONTINUE;
}
if(salaryArchiveList.size() > 1){
requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录,请检查后重试!");
log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录,请检查后重试!");
return FAILURE_AND_CONTINUE;
}
// 设置最后发薪日期

View File

@ -0,0 +1,29 @@
package com.engine.salary.annotation;
import com.engine.salary.enums.auth.AuthCheckTypeEnum;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* 权限验证字段
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Auth {
String page();
AuthCheckTypeEnum checkType() default AuthCheckTypeEnum.TAX_EMP;
String taxAgentIdField() default "taxAgentId";
String employeeIdField() default "employeeId";
String sobIdField() default "salarySobId";
String optsField() default "opts";
}

View File

@ -0,0 +1,22 @@
package com.engine.salary.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* 权限验证字段
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface AuthField {
String fieldType();
}

View File

@ -0,0 +1,20 @@
package com.engine.salary.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* 权限验证字段
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface AuthOpt {
}

View File

@ -96,7 +96,9 @@ public class AddUpDeductionBiz extends BaseBean {
try {
AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class);
List<AddUpDeductionRecordDTO> addUpDeductionRecordStrDTOS = mapper.recordList(param);
return encryptUtil.decryptList(addUpDeductionRecordStrDTOS, AddUpDeductionRecordDTO.class);
encryptUtil.decryptList(addUpDeductionRecordStrDTOS, AddUpDeductionRecordDTO.class);
SalaryI18nUtil.i18nList(addUpDeductionRecordStrDTOS);
return addUpDeductionRecordStrDTOS;
} finally {
sqlSession.close();
}

View File

@ -2,11 +2,9 @@ package com.engine.salary.biz;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO;
import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO;
import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam;
import com.engine.salary.mapper.datacollection.AddUpSituationMapper;
import com.engine.salary.util.SalaryI18nUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.ibatis.session.SqlSession;
@ -20,23 +18,6 @@ public class AddUpSituationBiz extends BaseBean {
private EncryptUtil encryptUtil = new EncryptUtil();
/**
* 关联查询查询列表
*
* @param param
* @return
*/
public List<AddUpSituationDTO> list(AddUpSituationQueryParam param) {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class);
List<AddUpSituationDTO> list = mapper.list(param);
encryptUtil.decryptList(list, AddUpSituationDTO.class);
return SalaryI18nUtil.i18nList(list);
} finally {
sqlSession.close();
}
}
/**
* 条件查询

View File

@ -439,11 +439,11 @@ public class SIAccountBiz extends Service {
public List<Long> listCanPayEmpIds(Long paymentOrganization, String billMonth) {
List<Long> listCanPayEmpIds = new ArrayList<>();
//社保档案中可进行缴纳的人员
List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
//公积金档案中可进行缴纳的人员
List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
//其他福利档案中可进行缴纳的人员
List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) {
listCanPayEmpIds.addAll(socialCanPayEmpIds);
}

View File

@ -7,6 +7,8 @@ import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeTaxAgentDTO;
import com.engine.salary.mapper.salarybill.SalarySendRangeObjMapper;
import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.db.MapperProxyFactory;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.ibatis.session.SqlSession;
import weaver.conn.mybatis.MyBatisFactory;
@ -23,6 +25,10 @@ public class SalarySendRangeObjBiz {
return ServiceUtil.getService(TaxAgentServiceImpl.class);
}
private SalarySendRangeObjMapper getSalarySendRangeObjMapper() {
return MapperProxyFactory.getProxy(SalarySendRangeObjMapper.class);
}
public <R> R applyMapper(Function<SalarySendRangeObjMapper, R> mapper) {
try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) {
final SalarySendRangeObjMapper salarySendRangeObjMapper = sqlSession.getMapper(SalarySendRangeObjMapper.class);
@ -41,7 +47,13 @@ public class SalarySendRangeObjBiz {
}
public List<SalarySendUserInfoDTO> getSalarySendUserInfoDTOs(List<Long> employees) {
List<SalarySendUserInfoDTO> userDTOs = applyMapper(mapper -> mapper.getUserInfoByEmployeeIds(employees));
List<SalarySendUserInfoDTO> userDTOs = new ArrayList<>();
List<List<Long>> partition = Lists.partition(employees, 500);
partition.forEach(l->{
List<SalarySendUserInfoDTO> userInfos = getSalarySendRangeObjMapper().getUserInfoByEmployeeIds(l);
userDTOs.addAll(userInfos);
});
Map<Long, SalarySendUserInfoDTO> userMap = userDTOs.stream()
.collect(Collectors.toMap(SalarySendUserInfoDTO::getResourceId, Function.identity()));

View File

@ -1,5 +1,6 @@
package com.engine.salary.common;
import com.engine.salary.enums.auth.AuthFilterTypeEnum;
import com.engine.salary.sys.entity.vo.OrderRuleVO;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -24,4 +25,9 @@ public class BaseQueryParam {
* 排序规则
*/
private OrderRuleVO orderRule;
/**
* 数据过滤级别
*/
private AuthFilterTypeEnum filterType ;
}

View File

@ -317,4 +317,9 @@ public class SalaryElogConfig {
* @return
*/
public static LoggerTemplate salaryStatReportLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "statreport");
/**
* 业务线
*/
public static LoggerTemplate authLinkLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "authlink");
}

View File

@ -1,7 +1,7 @@
package com.engine.salary.constant;
/**
* 默认租户
* 默认租户key
* <p>Copyright: Copyright (c) 2024</p>
* <p>Company: 泛微软件</p>
*

View File

@ -0,0 +1,38 @@
package com.engine.salary.entity.auth.dto;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.enums.auth.DataLinkEnum;
import com.engine.salary.enums.auth.DataTargetTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthDataDTO {
private Long id;
/**
* 连接符
*/
@TableTitle(title = "连接",dataIndex = "linkName",key = "linkName")
private String linkName;
private DataLinkEnum link;
@TableTitle(title = "对象类型",dataIndex = "targetTypeName",key = "targetTypeName")
private String targetTypeName;
private DataTargetTypeEnum targetType;
@TableTitle(title = "对象",dataIndex = "targetName",key = "targetName")
private String targetName;
private String target;
@TableTitle(title = "批次",dataIndex = "sortedIndex",key = "sortedIndex")
private Integer sortedIndex;
}

View File

@ -0,0 +1,18 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthLimitDTO {
private Long taxAgentId;
private List<RoleLimit> roleLimits;
}

View File

@ -0,0 +1,26 @@
package com.engine.salary.entity.auth.dto;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.enums.auth.MemberTargetTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthMemberDTO {
private Long id;
@TableTitle(title = "对象类型",dataIndex = "targetTypeName",key = "targetTypeName")
private String targetTypeName;
private MemberTargetTypeEnum targetType;
@TableTitle(title = "对象",dataIndex = "targetName",key = "targetName")
private String targetName;
private String target;
}

View File

@ -0,0 +1,77 @@
package com.engine.salary.entity.auth.dto;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@XStreamAlias("config")
public class AuthOptDTO {
@XStreamAlias("name")
@XStreamAsAttribute
private String name;
@XStreamAlias("key")
@XStreamAsAttribute
private String key;
@XStreamImplicit(itemFieldName = "module")
private List<Module> modules;
@Data
public static class Module {
@XStreamAlias("name")
@XStreamAsAttribute
private String name;
@XStreamAlias("key")
@XStreamAsAttribute
private String key;
@XStreamImplicit(itemFieldName = "page")
private List<Page> pages;
@Data
public static class Page {
@XStreamAlias("name")
@XStreamAsAttribute
private String name;
@XStreamAlias("key")
@XStreamAsAttribute
private String key;
@XStreamAlias("limit")
@XStreamAsAttribute
private String limit;
@XStreamImplicit(itemFieldName = "opt")
private List<Opt> opts;
@Data
public static class Opt {
@XStreamAlias("name")
@XStreamAsAttribute
private String name;
@XStreamAlias("key")
@XStreamAsAttribute
private String key;
@XStreamAlias("able")
@XStreamAsAttribute
private boolean able;
}
}
}
}

View File

@ -0,0 +1,53 @@
package com.engine.salary.entity.auth.dto;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 角色
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthRoleDTO {
private Long id;
@TableTitle(title = "业务线", dataIndex = "name", key = "name")
private String name;
@TableTitle(title = "描述", dataIndex = "description", key = "description")
private String description;
/**
* 扣缴义务人资源
*/
private List<TaxAgentPO> taxAgentIds;
/**
* 账套资源
*/
private List<SalarySobPO> sobIds;
@TableTitle(title = "资源", dataIndex = "resources", key = "resources")
private Integer resources;
@TableTitle(title = "成员", dataIndex = "members", key = "members")
private Integer members;
@TableTitle(title = "权限", dataIndex = "opts", key = "opts")
private Integer opts;
@TableTitle(title = "数据", dataIndex = "datas", key = "datas")
private Integer datas;
}

View File

@ -0,0 +1,32 @@
package com.engine.salary.entity.auth.dto;
import com.engine.salary.annotation.I18n;
import com.engine.salary.annotation.TableTitle;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthRoleDataDTO {
private Long id;
@TableTitle(title = "姓名",dataIndex = "username",key = "username")
private String username;
@TableTitle(title = "工号",dataIndex = "workCode",key = "workCode")
private String workCode;
@I18n
@TableTitle(title = "部门",dataIndex = "departmentName",key = "departmentName")
private String departmentName;
@I18n
@TableTitle(title = "岗位",dataIndex = "jobtitleName",key = "jobtitleName")
private String jobtitleName;
}

View File

@ -0,0 +1,32 @@
package com.engine.salary.entity.auth.dto;
import com.engine.salary.annotation.I18n;
import com.engine.salary.annotation.TableTitle;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthRoleEmpDTO {
private Long id;
@TableTitle(title = "姓名",dataIndex = "username",key = "username")
private String username;
@TableTitle(title = "工号",dataIndex = "workcode",key = "workcode")
private String workCode;
@I18n
@TableTitle(title = "部门",dataIndex = "departmentName",key = "departmentName")
private String departmentName;
@I18n
@TableTitle(title = "岗位",dataIndex = "jobtitleName",key = "jobtitleName")
private String jobtitleName;
}

View File

@ -0,0 +1,62 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthTreeDTO {
private Long roleEmpId;
private List<Role> roles;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class Role {
private Long roleId;
private String roleName;
private List<Resource> resources;
private List<Opt> opts;
private List<Data> datas;
@lombok.Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class Resource {
private Long resourceId;
private String resourceName;
private String resourceType;
}
@lombok.Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class Opt {
private Long optId;
private String page;
private String opt;
}
@lombok.Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class Data {
private Long dataId;
private Long employeeId;
}
}
}

View File

@ -0,0 +1,19 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Set;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EmpOpt {
private Long employeeId;
private Set<String> opts;
}

View File

@ -0,0 +1,15 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class Opt {
private String opt;
}

View File

@ -0,0 +1,5 @@
package com.engine.salary.entity.auth.dto;
public class PermissionDTO {
}

View File

@ -0,0 +1,19 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RoleLimit {
private Long roleId;
private List<Long> sobIds;
}

View File

@ -0,0 +1,19 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Set;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SobOptAuth {
private Long sobId;
private Set<String> opts;
}

View File

@ -0,0 +1,19 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TaxEmpOptAuth {
private Long taxAgentId;
private List<EmpOpt> emps;
}

View File

@ -0,0 +1,19 @@
package com.engine.salary.entity.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Set;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TaxOptAuth {
private Long taxAgentId;
private Set<String> opts;
}

View File

@ -0,0 +1,20 @@
package com.engine.salary.entity.auth.param;
import com.engine.salary.common.BaseQueryParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthDataQueryParam extends BaseQueryParam {
private Long roleId;
private String username;
}

View File

@ -0,0 +1,41 @@
package com.engine.salary.entity.auth.param;
import com.engine.salary.enums.auth.DataLinkEnum;
import com.engine.salary.enums.auth.DataTargetTypeEnum;
import com.engine.salary.util.valid.Modify;
import com.engine.salary.util.valid.ModifyTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 数据
* <p>Copyright: Copyright (c) 2024</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AuthDataSaveParam {
private Long id;
private Long roleId;
private DataLinkEnum link;
private DataTargetTypeEnum targetType;
@Modify(modifyType = ModifyTypeEnum.RESTORE_SQL)
private String target;
@Modify(modifyType = ModifyTypeEnum.RESTORE_SQL)
private String targetName;
private Integer sortedIndex;
}

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