diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar index 7589cfeae..ba4091f61 100644 Binary files a/resource/WEB-INF/lib/hrmelog.jar and b/resource/WEB-INF/lib/hrmelog.jar differ diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index e8125608b..c558fd72d 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=2.19.1.2501.01 +version=3.0.2.2504.04 openFormulaForcedEditing=false \ No newline at end of file diff --git a/resource/WEB-INF/salaryoptconfig.xml b/resource/WEB-INF/salaryoptconfig.xml new file mode 100644 index 000000000..cc4c607b8 --- /dev/null +++ b/resource/WEB-INF/salaryoptconfig.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resource/sqlupgrade/DM/sql202409240201.sql b/resource/sqlupgrade/DM/sql202409240201.sql new file mode 100644 index 000000000..36b6745cc --- /dev/null +++ b/resource/sqlupgrade/DM/sql202409240201.sql @@ -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 ; +/ + diff --git a/resource/sqlupgrade/DM/sql202409240302.sql b/resource/sqlupgrade/DM/sql202409240302.sql new file mode 100644 index 000000000..9573a689b --- /dev/null +++ b/resource/sqlupgrade/DM/sql202409240302.sql @@ -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; +/ + diff --git a/resource/sqlupgrade/DM/sql202409240403.sql b/resource/sqlupgrade/DM/sql202409240403.sql new file mode 100644 index 000000000..10b2b4813 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202409240403.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/DM/sql202411190103.sql b/resource/sqlupgrade/DM/sql202411190103.sql new file mode 100644 index 000000000..a02da0e03 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202411190103.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/DM/sql202501150103.sql b/resource/sqlupgrade/DM/sql202501150103.sql new file mode 100644 index 000000000..a51508d84 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202501150103.sql @@ -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 +); +/ + diff --git a/resource/sqlupgrade/DM/sql202502060103.sql b/resource/sqlupgrade/DM/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/DM/sql202504020203.sql b/resource/sqlupgrade/DM/sql202504020203.sql new file mode 100644 index 000000000..fb88e05b0 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202504020203.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/DM/sql202504030103.sql b/resource/sqlupgrade/DM/sql202504030103.sql new file mode 100644 index 000000000..013d261c1 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202504030103.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/GS/sql202409240201.sql b/resource/sqlupgrade/GS/sql202409240201.sql new file mode 100644 index 000000000..36b6745cc --- /dev/null +++ b/resource/sqlupgrade/GS/sql202409240201.sql @@ -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 ; +/ + diff --git a/resource/sqlupgrade/GS/sql202409240302.sql b/resource/sqlupgrade/GS/sql202409240302.sql new file mode 100644 index 000000000..9573a689b --- /dev/null +++ b/resource/sqlupgrade/GS/sql202409240302.sql @@ -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; +/ + diff --git a/resource/sqlupgrade/GS/sql202409240403.sql b/resource/sqlupgrade/GS/sql202409240403.sql new file mode 100644 index 000000000..10b2b4813 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202409240403.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/GS/sql202411190103.sql b/resource/sqlupgrade/GS/sql202411190103.sql new file mode 100644 index 000000000..a02da0e03 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202411190103.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/GS/sql202501150103.sql b/resource/sqlupgrade/GS/sql202501150103.sql new file mode 100644 index 000000000..a51508d84 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202501150103.sql @@ -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 +); +/ + diff --git a/resource/sqlupgrade/GS/sql202502060103.sql b/resource/sqlupgrade/GS/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/GS/sql202504020203.sql b/resource/sqlupgrade/GS/sql202504020203.sql new file mode 100644 index 000000000..fb88e05b0 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202504020203.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/GS/sql202504030103.sql b/resource/sqlupgrade/GS/sql202504030103.sql new file mode 100644 index 000000000..013d261c1 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202504030103.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/JC/sql202409240201.sql b/resource/sqlupgrade/JC/sql202409240201.sql new file mode 100644 index 000000000..36b6745cc --- /dev/null +++ b/resource/sqlupgrade/JC/sql202409240201.sql @@ -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 ; +/ + diff --git a/resource/sqlupgrade/JC/sql202409240302.sql b/resource/sqlupgrade/JC/sql202409240302.sql new file mode 100644 index 000000000..9573a689b --- /dev/null +++ b/resource/sqlupgrade/JC/sql202409240302.sql @@ -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; +/ + diff --git a/resource/sqlupgrade/JC/sql202409240403.sql b/resource/sqlupgrade/JC/sql202409240403.sql new file mode 100644 index 000000000..10b2b4813 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202409240403.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/JC/sql202411190103.sql b/resource/sqlupgrade/JC/sql202411190103.sql new file mode 100644 index 000000000..a02da0e03 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202411190103.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/JC/sql202501150103.sql b/resource/sqlupgrade/JC/sql202501150103.sql new file mode 100644 index 000000000..a51508d84 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202501150103.sql @@ -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 +); +/ + diff --git a/resource/sqlupgrade/JC/sql202502060103.sql b/resource/sqlupgrade/JC/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/JC/sql202504020203.sql b/resource/sqlupgrade/JC/sql202504020203.sql new file mode 100644 index 000000000..fb88e05b0 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202504020203.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/JC/sql202504030103.sql b/resource/sqlupgrade/JC/sql202504030103.sql new file mode 100644 index 000000000..013d261c1 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202504030103.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/Mysql/sql202409240201.sql b/resource/sqlupgrade/Mysql/sql202409240201.sql new file mode 100644 index 000000000..b81eb2e8d --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202409240201.sql @@ -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 +; diff --git a/resource/sqlupgrade/Mysql/sql202409240302.sql b/resource/sqlupgrade/Mysql/sql202409240302.sql new file mode 100644 index 000000000..8b215461e --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202409240302.sql @@ -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 +; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/sql202409240403.sql b/resource/sqlupgrade/Mysql/sql202409240403.sql new file mode 100644 index 000000000..17c461f3c --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202409240403.sql @@ -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 +) ; diff --git a/resource/sqlupgrade/Mysql/sql202411190103.sql b/resource/sqlupgrade/Mysql/sql202411190103.sql new file mode 100644 index 000000000..9ceb2c5b9 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202411190103.sql @@ -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 +); + diff --git a/resource/sqlupgrade/Mysql/sql202501150103.sql b/resource/sqlupgrade/Mysql/sql202501150103.sql new file mode 100644 index 000000000..2bff4f801 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202501150103.sql @@ -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 +) ; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/sql202502060103.sql b/resource/sqlupgrade/Mysql/sql202502060103.sql new file mode 100644 index 000000000..0ed0d6acb --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202502060103.sql @@ -0,0 +1 @@ +ALTER TABLE hrsa_page_list_template ADD COLUMN file_id int(0); diff --git a/resource/sqlupgrade/Mysql/sql202504020203.sql b/resource/sqlupgrade/Mysql/sql202504020203.sql new file mode 100644 index 000000000..43798afc8 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202504020203.sql @@ -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) ; diff --git a/resource/sqlupgrade/Mysql/sql202504030103.sql b/resource/sqlupgrade/Mysql/sql202504030103.sql new file mode 100644 index 000000000..f21868d14 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202504030103.sql @@ -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); diff --git a/resource/sqlupgrade/Oracle/sql202409240201.sql b/resource/sqlupgrade/Oracle/sql202409240201.sql new file mode 100644 index 000000000..83a4826ec --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202409240201.sql @@ -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 +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202409240302.sql b/resource/sqlupgrade/Oracle/sql202409240302.sql new file mode 100644 index 000000000..8435e8635 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202409240302.sql @@ -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 +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202409240403.sql b/resource/sqlupgrade/Oracle/sql202409240403.sql new file mode 100644 index 000000000..cf2f25c2e --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202409240403.sql @@ -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) +) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202411190103.sql b/resource/sqlupgrade/Oracle/sql202411190103.sql new file mode 100644 index 000000000..68b19ec3e --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202411190103.sql @@ -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) +) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202501150103.sql b/resource/sqlupgrade/Oracle/sql202501150103.sql new file mode 100644 index 000000000..ee779a50f --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202501150103.sql @@ -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 +) + +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202502060103.sql b/resource/sqlupgrade/Oracle/sql202502060103.sql new file mode 100644 index 000000000..25da649a0 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202502060103.sql @@ -0,0 +1,2 @@ +alter table hrsa_page_list_template add file_id int +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202504020203.sql b/resource/sqlupgrade/Oracle/sql202504020203.sql new file mode 100644 index 000000000..b6737d61f --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202504020203.sql @@ -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) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202504030103.sql b/resource/sqlupgrade/Oracle/sql202504030103.sql new file mode 100644 index 000000000..37869d261 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202504030103.sql @@ -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) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202409240201.sql b/resource/sqlupgrade/PG/sql202409240201.sql new file mode 100644 index 000000000..42589c50b --- /dev/null +++ b/resource/sqlupgrade/PG/sql202409240201.sql @@ -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 ; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202409240302.sql b/resource/sqlupgrade/PG/sql202409240302.sql new file mode 100644 index 000000000..755116704 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202409240302.sql @@ -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 +; \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202409240403.sql b/resource/sqlupgrade/PG/sql202409240403.sql new file mode 100644 index 000000000..1e8fb2d15 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202409240403.sql @@ -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) +) ; \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202411190103.sql b/resource/sqlupgrade/PG/sql202411190103.sql new file mode 100644 index 000000000..3874c397f --- /dev/null +++ b/resource/sqlupgrade/PG/sql202411190103.sql @@ -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) +); \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202501150103.sql b/resource/sqlupgrade/PG/sql202501150103.sql new file mode 100644 index 000000000..d62aea72f --- /dev/null +++ b/resource/sqlupgrade/PG/sql202501150103.sql @@ -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) +) ; \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202502060103.sql b/resource/sqlupgrade/PG/sql202502060103.sql new file mode 100644 index 000000000..267d3416c --- /dev/null +++ b/resource/sqlupgrade/PG/sql202502060103.sql @@ -0,0 +1 @@ +alter table hrsa_page_list_template add file_id int; \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202504020203.sql b/resource/sqlupgrade/PG/sql202504020203.sql new file mode 100644 index 000000000..6643f1adf --- /dev/null +++ b/resource/sqlupgrade/PG/sql202504020203.sql @@ -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) ; \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202504030103.sql b/resource/sqlupgrade/PG/sql202504030103.sql new file mode 100644 index 000000000..a0bda613d --- /dev/null +++ b/resource/sqlupgrade/PG/sql202504030103.sql @@ -0,0 +1,3 @@ +alter table hrsa_push_setting_item add sorted_index int ; + +alter table hrsa_push_record_detail add data_id bigint ; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202409240201.sql b/resource/sqlupgrade/SQLServer/sql202409240201.sql new file mode 100644 index 000000000..1aa307c31 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202409240201.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202409240302.sql b/resource/sqlupgrade/SQLServer/sql202409240302.sql new file mode 100644 index 000000000..718a8538f --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202409240302.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202409240403.sql b/resource/sqlupgrade/SQLServer/sql202409240403.sql new file mode 100644 index 000000000..6edd92d19 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202409240403.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202411190103.sql b/resource/sqlupgrade/SQLServer/sql202411190103.sql new file mode 100644 index 000000000..334e78b42 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202411190103.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202501150103.sql b/resource/sqlupgrade/SQLServer/sql202501150103.sql new file mode 100644 index 000000000..e500a3b90 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202501150103.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202502060103.sql b/resource/sqlupgrade/SQLServer/sql202502060103.sql new file mode 100644 index 000000000..b6a038a58 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202502060103.sql @@ -0,0 +1,2 @@ +alter table hrsa_page_list_template add file_id int +go \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202504020203.sql b/resource/sqlupgrade/SQLServer/sql202504020203.sql new file mode 100644 index 000000000..fbedb9edd --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202504020203.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202504030103.sql b/resource/sqlupgrade/SQLServer/sql202504030103.sql new file mode 100644 index 000000000..db030fdb3 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202504030103.sql @@ -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 \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202409240201.sql b/resource/sqlupgrade/ST/sql202409240201.sql new file mode 100644 index 000000000..36b6745cc --- /dev/null +++ b/resource/sqlupgrade/ST/sql202409240201.sql @@ -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 ; +/ + diff --git a/resource/sqlupgrade/ST/sql202409240302.sql b/resource/sqlupgrade/ST/sql202409240302.sql new file mode 100644 index 000000000..9573a689b --- /dev/null +++ b/resource/sqlupgrade/ST/sql202409240302.sql @@ -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; +/ + diff --git a/resource/sqlupgrade/ST/sql202409240403.sql b/resource/sqlupgrade/ST/sql202409240403.sql new file mode 100644 index 000000000..10b2b4813 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202409240403.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/ST/sql202411190103.sql b/resource/sqlupgrade/ST/sql202411190103.sql new file mode 100644 index 000000000..a02da0e03 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202411190103.sql @@ -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) +); +/ + diff --git a/resource/sqlupgrade/ST/sql202501150103.sql b/resource/sqlupgrade/ST/sql202501150103.sql new file mode 100644 index 000000000..a51508d84 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202501150103.sql @@ -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 +); +/ + diff --git a/resource/sqlupgrade/ST/sql202502060103.sql b/resource/sqlupgrade/ST/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/ST/sql202504020203.sql b/resource/sqlupgrade/ST/sql202504020203.sql new file mode 100644 index 000000000..fb88e05b0 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202504020203.sql @@ -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); +/ + diff --git a/resource/sqlupgrade/ST/sql202504030103.sql b/resource/sqlupgrade/ST/sql202504030103.sql new file mode 100644 index 000000000..013d261c1 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202504030103.sql @@ -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); +/ + diff --git a/resource/wiki/甯哥敤鏌ヨ.md b/resource/wiki/甯哥敤鏌ヨ.md index 637ebc08f..1d72b1e99 100644 --- a/resource/wiki/甯哥敤鏌ヨ.md +++ b/resource/wiki/甯哥敤鏌ヨ.md @@ -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 \ No newline at end of file +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' + diff --git a/resource/wiki/钖叕杩樺師鑴氭湰.sql b/resource/wiki/钖叕杩樺師鑴氭湰.sql index cf29ff247..62e7bae3c 100644 --- a/resource/wiki/钖叕杩樺師鑴氭湰.sql +++ b/resource/wiki/钖叕杩樺師鑴氭湰.sql @@ -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 diff --git a/src/com/api/salary/web/AuthController.java b/src/com/api/salary/web/AuthController.java new file mode 100644 index 000000000..3a2c0374c --- /dev/null +++ b/src/com/api/salary/web/AuthController.java @@ -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 { + +} diff --git a/src/com/api/salary/web/PushController.java b/src/com/api/salary/web/PushController.java new file mode 100644 index 000000000..854a3b9b7 --- /dev/null +++ b/src/com/api/salary/web/PushController.java @@ -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{ + +} diff --git a/src/com/engine/salary/action/CheckStopSalaryAction.java b/src/com/engine/salary/action/CheckStopSalaryAction.java index 78b3c0a7c..6243e6ed5 100644 --- a/src/com/engine/salary/action/CheckStopSalaryAction.java +++ b/src/com/engine/salary/action/CheckStopSalaryAction.java @@ -96,15 +96,18 @@ public class CheckStopSalaryAction implements Action { List 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("鏈鍚庡彂钖棩鏈熸牸寮忛敊璇紝鏍煎紡涓簓yyy-MM-dd"); + log.error("鍋滆柂妫鏌ュ紓甯 requestId:{} msg:{}", requestInfo.getRequestid(), "鏈鍚庡彂钖棩鏈熸牸寮忛敊璇紝鏍煎紡涓簓yyy-MM-dd" + importDataMap.get("鏈鍚庡彂钖棩鏈").toString()); return FAILURE_AND_CONTINUE; } @@ -115,15 +118,17 @@ public class CheckStopSalaryAction implements Action { List 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; } diff --git a/src/com/engine/salary/action/StopSalaryAction.java b/src/com/engine/salary/action/StopSalaryAction.java index 6433e4e95..10d4d765a 100644 --- a/src/com/engine/salary/action/StopSalaryAction.java +++ b/src/com/engine/salary/action/StopSalaryAction.java @@ -107,15 +107,18 @@ public class StopSalaryAction implements Action { List 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("鏈鍚庡彂钖棩鏈熸牸寮忛敊璇紝鏍煎紡涓簓yyy-MM-dd"); + log.error("鍋滆柂寮傚父 requestId:{} msg:{}", requestInfo.getRequestid(), "鏈鍚庡彂钖棩鏈熸牸寮忛敊璇紝鏍煎紡涓簓yyy-MM-dd" + importDataMap.get("鏈鍚庡彂钖棩鏈").toString()); return FAILURE_AND_CONTINUE; } @@ -123,10 +126,12 @@ public class StopSalaryAction implements Action { List 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; } // 璁剧疆鏈鍚庡彂钖棩鏈 diff --git a/src/com/engine/salary/annotation/Auth.java b/src/com/engine/salary/annotation/Auth.java new file mode 100644 index 000000000..78cc19097 --- /dev/null +++ b/src/com/engine/salary/annotation/Auth.java @@ -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; + +/** + * 鏉冮檺楠岃瘉瀛楁 + *

Copyright: Copyright (c) 2022

+ *

Company: 娉涘井杞欢

+ * + * @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"; +} diff --git a/src/com/engine/salary/annotation/AuthField.java b/src/com/engine/salary/annotation/AuthField.java new file mode 100644 index 000000000..b51cd44f3 --- /dev/null +++ b/src/com/engine/salary/annotation/AuthField.java @@ -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; + +/** + * 鏉冮檺楠岃瘉瀛楁 + *

Copyright: Copyright (c) 2022

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface AuthField { + + String fieldType(); + +} diff --git a/src/com/engine/salary/annotation/AuthOpt.java b/src/com/engine/salary/annotation/AuthOpt.java new file mode 100644 index 000000000..e4ffcb499 --- /dev/null +++ b/src/com/engine/salary/annotation/AuthOpt.java @@ -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; + +/** + * 鏉冮檺楠岃瘉瀛楁 + *

Copyright: Copyright (c) 2022

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface AuthOpt { + +} diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index 14ba5933c..3e7f8330c 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -96,7 +96,9 @@ public class AddUpDeductionBiz extends BaseBean { try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); List addUpDeductionRecordStrDTOS = mapper.recordList(param); - return encryptUtil.decryptList(addUpDeductionRecordStrDTOS, AddUpDeductionRecordDTO.class); + encryptUtil.decryptList(addUpDeductionRecordStrDTOS, AddUpDeductionRecordDTO.class); + SalaryI18nUtil.i18nList(addUpDeductionRecordStrDTOS); + return addUpDeductionRecordStrDTOS; } finally { sqlSession.close(); } diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index 68515ff23..41068ef88 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -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 list(AddUpSituationQueryParam param) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - List list = mapper.list(param); - encryptUtil.decryptList(list, AddUpSituationDTO.class); - return SalaryI18nUtil.i18nList(list); - } finally { - sqlSession.close(); - } - } /** * 鏉′欢鏌ヨ diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 9b2bbb180..56a1ce4b8 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -439,11 +439,11 @@ public class SIAccountBiz extends Service { public List listCanPayEmpIds(Long paymentOrganization, String billMonth) { List listCanPayEmpIds = new ArrayList<>(); //绀句繚妗ｆ涓彲杩涜缂寸撼鐨勪汉鍛 - List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); //鍏Н閲戞。妗堜腑鍙繘琛岀即绾崇殑浜哄憳 - List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); //鍏朵粬绂忓埄妗ｆ涓彲杩涜缂寸撼鐨勪汉鍛 - List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) { listCanPayEmpIds.addAll(socialCanPayEmpIds); } diff --git a/src/com/engine/salary/biz/SalarySendRangeObjBiz.java b/src/com/engine/salary/biz/SalarySendRangeObjBiz.java index 05ccaaadb..53633dce6 100644 --- a/src/com/engine/salary/biz/SalarySendRangeObjBiz.java +++ b/src/com/engine/salary/biz/SalarySendRangeObjBiz.java @@ -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 applyMapper(Function mapper) { try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) { final SalarySendRangeObjMapper salarySendRangeObjMapper = sqlSession.getMapper(SalarySendRangeObjMapper.class); @@ -41,7 +47,13 @@ public class SalarySendRangeObjBiz { } public List getSalarySendUserInfoDTOs(List employees) { - List userDTOs = applyMapper(mapper -> mapper.getUserInfoByEmployeeIds(employees)); + List userDTOs = new ArrayList<>(); + List> partition = Lists.partition(employees, 500); + partition.forEach(l->{ + List userInfos = getSalarySendRangeObjMapper().getUserInfoByEmployeeIds(l); + userDTOs.addAll(userInfos); + }); + Map userMap = userDTOs.stream() .collect(Collectors.toMap(SalarySendUserInfoDTO::getResourceId, Function.identity())); diff --git a/src/com/engine/salary/common/BaseQueryParam.java b/src/com/engine/salary/common/BaseQueryParam.java index dd9a8bc3c..703231be8 100644 --- a/src/com/engine/salary/common/BaseQueryParam.java +++ b/src/com/engine/salary/common/BaseQueryParam.java @@ -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 ; } diff --git a/src/com/engine/salary/config/SalaryElogConfig.java b/src/com/engine/salary/config/SalaryElogConfig.java index 7d9f79321..909fdb9c4 100644 --- a/src/com/engine/salary/config/SalaryElogConfig.java +++ b/src/com/engine/salary/config/SalaryElogConfig.java @@ -317,4 +317,9 @@ public class SalaryElogConfig { * @return */ public static LoggerTemplate salaryStatReportLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "statreport"); + + /** + * 涓氬姟绾 + */ + public static LoggerTemplate authLinkLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "authlink"); } diff --git a/src/com/engine/salary/constant/SalaryDefaultTenantConstant.java b/src/com/engine/salary/constant/SalaryDefaultTenantConstant.java index 4e60d65e0..2d5ca8a1b 100644 --- a/src/com/engine/salary/constant/SalaryDefaultTenantConstant.java +++ b/src/com/engine/salary/constant/SalaryDefaultTenantConstant.java @@ -1,7 +1,7 @@ package com.engine.salary.constant; /** - * 榛樿绉熸埛 + * 榛樿鐨勭鎴穔ey *

Copyright: Copyright (c) 2024

*

Company: 娉涘井杞欢

* diff --git a/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java b/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java new file mode 100644 index 000000000..cd3d3600b --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java @@ -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; + +} diff --git a/src/com/engine/salary/entity/auth/dto/AuthLimitDTO.java b/src/com/engine/salary/entity/auth/dto/AuthLimitDTO.java new file mode 100644 index 000000000..1861a0251 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthLimitDTO.java @@ -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 roleLimits; +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java b/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java new file mode 100644 index 000000000..fe0b24e98 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java @@ -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; + +} diff --git a/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java b/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java new file mode 100644 index 000000000..2a71e4129 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java @@ -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 modules; + + @Data + public static class Module { + @XStreamAlias("name") + @XStreamAsAttribute + private String name; + + @XStreamAlias("key") + @XStreamAsAttribute + private String key; + + @XStreamImplicit(itemFieldName = "page") + private List 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 opts; + + @Data + public static class Opt { + @XStreamAlias("name") + @XStreamAsAttribute + private String name; + + @XStreamAlias("key") + @XStreamAsAttribute + private String key; + + @XStreamAlias("able") + @XStreamAsAttribute + private boolean able; + } + } + } +} + diff --git a/src/com/engine/salary/entity/auth/dto/AuthRoleDTO.java b/src/com/engine/salary/entity/auth/dto/AuthRoleDTO.java new file mode 100644 index 000000000..2dac34f8f --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthRoleDTO.java @@ -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 taxAgentIds; + + /** + * 璐﹀璧勬簮 + */ + private List 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; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/dto/AuthRoleDataDTO.java b/src/com/engine/salary/entity/auth/dto/AuthRoleDataDTO.java new file mode 100644 index 000000000..58ca3cc21 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthRoleDataDTO.java @@ -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; +} diff --git a/src/com/engine/salary/entity/auth/dto/AuthRoleEmpDTO.java b/src/com/engine/salary/entity/auth/dto/AuthRoleEmpDTO.java new file mode 100644 index 000000000..981bf9b0d --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthRoleEmpDTO.java @@ -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; +} diff --git a/src/com/engine/salary/entity/auth/dto/AuthTreeDTO.java b/src/com/engine/salary/entity/auth/dto/AuthTreeDTO.java new file mode 100644 index 000000000..9583bce12 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/AuthTreeDTO.java @@ -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 roles; + + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class Role { + private Long roleId; + + private String roleName; + + private List resources; + private List opts; + private List 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; + } + } +} + diff --git a/src/com/engine/salary/entity/auth/dto/EmpOpt.java b/src/com/engine/salary/entity/auth/dto/EmpOpt.java new file mode 100644 index 000000000..d85e24fe4 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/EmpOpt.java @@ -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 opts; +} + diff --git a/src/com/engine/salary/entity/auth/dto/Opt.java b/src/com/engine/salary/entity/auth/dto/Opt.java new file mode 100644 index 000000000..f9171e390 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/Opt.java @@ -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; +} + diff --git a/src/com/engine/salary/entity/auth/dto/PermissionDTO.java b/src/com/engine/salary/entity/auth/dto/PermissionDTO.java new file mode 100644 index 000000000..eb13937eb --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/PermissionDTO.java @@ -0,0 +1,5 @@ +package com.engine.salary.entity.auth.dto; + +public class PermissionDTO { + +} diff --git a/src/com/engine/salary/entity/auth/dto/RoleLimit.java b/src/com/engine/salary/entity/auth/dto/RoleLimit.java new file mode 100644 index 000000000..bad2017a1 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/RoleLimit.java @@ -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 sobIds; +} + diff --git a/src/com/engine/salary/entity/auth/dto/SobOptAuth.java b/src/com/engine/salary/entity/auth/dto/SobOptAuth.java new file mode 100644 index 000000000..cbae0bfd7 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/SobOptAuth.java @@ -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 opts; +} + diff --git a/src/com/engine/salary/entity/auth/dto/TaxEmpOptAuth.java b/src/com/engine/salary/entity/auth/dto/TaxEmpOptAuth.java new file mode 100644 index 000000000..fffb519db --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/TaxEmpOptAuth.java @@ -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 emps; +} + diff --git a/src/com/engine/salary/entity/auth/dto/TaxOptAuth.java b/src/com/engine/salary/entity/auth/dto/TaxOptAuth.java new file mode 100644 index 000000000..57b4765c7 --- /dev/null +++ b/src/com/engine/salary/entity/auth/dto/TaxOptAuth.java @@ -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 opts; +} + diff --git a/src/com/engine/salary/entity/auth/param/AuthDataQueryParam.java b/src/com/engine/salary/entity/auth/param/AuthDataQueryParam.java new file mode 100644 index 000000000..28f53f712 --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthDataQueryParam.java @@ -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; + +} diff --git a/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java new file mode 100644 index 000000000..86784082f --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java @@ -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; + +/** + * 鏁版嵁 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @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; +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/param/AuthMemberQueryParam.java b/src/com/engine/salary/entity/auth/param/AuthMemberQueryParam.java new file mode 100644 index 000000000..e540a1590 --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthMemberQueryParam.java @@ -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 AuthMemberQueryParam extends BaseQueryParam { + + private Long roleId; + + private String username; + +} diff --git a/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java new file mode 100644 index 000000000..9486d1e96 --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java @@ -0,0 +1,29 @@ +package com.engine.salary.entity.auth.param; + + +import com.engine.salary.enums.auth.MemberTargetTypeEnum; +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; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthMemberSaveParam { + + private Long id; + + private Long roleId; + + private MemberTargetTypeEnum targetType; + + @Modify(modifyType = ModifyTypeEnum.RESTORE_SQL) + private String target; + + @Modify(modifyType = ModifyTypeEnum.RESTORE_SQL) + private String targetName; +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java new file mode 100644 index 000000000..c720fedcc --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java @@ -0,0 +1,26 @@ +package com.engine.salary.entity.auth.param; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthOptSaveParam { + private Long roleId; + private List opts; + + @Data + public static class Opt { + + private String page; + + private String opt; + } +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/param/AuthRoleListQueryParam.java b/src/com/engine/salary/entity/auth/param/AuthRoleListQueryParam.java new file mode 100644 index 000000000..ab71eb23a --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthRoleListQueryParam.java @@ -0,0 +1,59 @@ +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; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthRoleListQueryParam extends BaseQueryParam { + + /** + * 涓氬姟绾垮悕绉 + */ + private String name; + + /** + * 涓氬姟绾縤d + */ + private List roleIds; + + /** + * 鎵ｇ即涔夊姟浜鸿祫婧 + */ + private List taxAgentIds; + + /** + * 璐﹀璧勬簮 + */ + private List sobIds; + + /** + * 鎴愬憳id + */ + private List roleEmpIds; + + + /** + * 鏉冮檺椤甸潰 + */ + private List pages; + + /** + * 鏉冮檺椤 + */ + private List opts; + + + /** + * 鏁版嵁id + */ + private List employeeIds; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java new file mode 100644 index 000000000..f1075d4ab --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java @@ -0,0 +1,44 @@ +package com.engine.salary.entity.auth.param; + +import com.engine.salary.util.valid.DataCheck; +import com.engine.salary.util.valid.RuntimeTypeEnum; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.entity.salarysob.po.SalarySobPO; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthRoleSaveParam { + + @JsonSerialize(using = ToStringSerializer.class) + @DataCheck(require = true, runtime = {RuntimeTypeEnum.UPDATE}, message = "id涓嶅厑璁镐负绌") + private Long id; + + + @DataCheck(require = true, max = 40, message = "鍚嶇О涓嶅厑璁镐负绌,鍚嶇О涓嶈兘瓒呰繃40涓瓧绗") + private String name; + + @DataCheck(require = false, max = 400, message = "鎻忚堪涓嶈兘瓒呰繃400涓瓧绗") + private String description; + + /** + * 鎵ｇ即涔夊姟浜鸿祫婧 + */ + private List taxAgentIds; + + + /** + * 璐﹀璧勬簮 + */ + private List sobIds; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/param/AuthSyncParam.java b/src/com/engine/salary/entity/auth/param/AuthSyncParam.java new file mode 100644 index 000000000..1ac9be40c --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthSyncParam.java @@ -0,0 +1,17 @@ +package com.engine.salary.entity.auth.param; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthSyncParam { + + private Long roleId; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/param/AuthTreeQueryParam.java b/src/com/engine/salary/entity/auth/param/AuthTreeQueryParam.java new file mode 100644 index 000000000..101faec0e --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthTreeQueryParam.java @@ -0,0 +1,28 @@ +package com.engine.salary.entity.auth.param; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthTreeQueryParam { + + private Long roleEmpId; + + private List roleIds; + + private List employeeIds; + + private List pages; + + private List opts; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthDataPO.java b/src/com/engine/salary/entity/auth/po/AuthDataPO.java new file mode 100644 index 000000000..b29b6992a --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthDataPO.java @@ -0,0 +1,92 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.auth.DataLinkEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏁版嵁 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthDataPO { + @ElogTransform(name = "id") + private Long id; + + /** + * 瑙掕壊id + */ + @ElogTransform(name = "瑙掕壊id") + private Long roleId; + + /** + * 杩炴帴绗︼紝浜ゃ佸苟銆佽ˉ + * @see DataLinkEnum + */ + @ElogTransform(name = "杩炴帴绗︼紝浜ゃ佸苟銆佽ˉ") + private Integer link; + + /** + * 鏁版嵁绫诲瀷锛1锛氫汉鍛樸2锛氶儴闂ㄣ3锛氬矖浣嶃4锛氬垎閮ㄣ5锛氳鑹层6锛氬畨鍏ㄧ骇鍒 銆7锛氭墍鏈変汉 銆8锛氱櫥褰曚汉銆9锛氳处濂椼10锛歴ql + */ + @ElogTransform(name = "鏁版嵁绫诲瀷") + private Integer targetType; + + /** + * 瀵硅薄id + */ + @ElogTransform(name = "瀵硅薄id") + private String target; + + /** + * 瀵硅薄鍚嶇О + */ + @ElogTransform(name = "瀵硅薄鍚嶇О") + private String targetName; + + @ElogTransform(name = "鎺掑簭") + private Integer sortedIndex; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthMemberPO.java b/src/com/engine/salary/entity/auth/po/AuthMemberPO.java new file mode 100644 index 000000000..218c1b3ae --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthMemberPO.java @@ -0,0 +1,71 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鎴愬憳 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ElogTransform( name="鎴愬憳" ) +public class AuthMemberPO { + private Long id; + /** + * 瑙掕壊id + */ + @ElogTransform( name="瑙掕壊id" ) + private Long roleId; + /** + * 瀵硅薄绫诲瀷锛1锛氫汉鍛樸2锛氶儴闂ㄣ3锛氬矖浣嶃4锛氬垎閮ㄣ5锛氳鑹层6锛歴ql + */ + @ElogTransform( name="瀵硅薄绫诲瀷" ) + private Integer targetType; + /** + * 瀵硅薄 + */ + @ElogTransform( name="瀵硅薄" ) + private String target; + /** + * 瀵硅薄 + */ + @ElogTransform( name="瀵硅薄鏄剧ず鍚" ) + private String targetName; + /** + * 鍒涘缓浜 + */ + @ElogTransform( name="鍒涘缓浜" ) + private Long creator; + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform( name="鍒涘缓鏃堕棿" ) + private Date createTime; + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform( name="鏇存柊鏃堕棿" ) + private Date updateTime; + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform( name="鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎" ) + private Integer deleteType; + /** + * 绉熸埛ID + */ + @ElogTransform( name="绉熸埛ID" ) + private String tenantKey; + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthOptPO.java b/src/com/engine/salary/entity/auth/po/AuthOptPO.java new file mode 100644 index 000000000..10da3aed9 --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthOptPO.java @@ -0,0 +1,75 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏉冮檺椤 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthOptPO { + @ElogTransform(name = "id") + private Long id; + + /** + * 瑙掕壊id + */ + @ElogTransform(name = "瑙掕壊id") + private Long roleId; + + /** + * 椤甸潰 + */ + @ElogTransform(name = "椤甸潰") + private String page; + + /** + * 鏉冮檺椤 + */ + @ElogTransform(name = "鏉冮檺椤") + private String opt; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthResourcePO.java b/src/com/engine/salary/entity/auth/po/AuthResourcePO.java new file mode 100644 index 000000000..a7fecdd46 --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthResourcePO.java @@ -0,0 +1,83 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 瑙掕壊 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthResourcePO { + + + @ElogTransform(name = "") + private Long id; + + /** + * 瑙掕壊id + */ + @ElogTransform(name = "瑙掕壊id") + private Long roleId; + + /** + * 瀵硅薄绫诲瀷锛1锛氭墸缂翠箟鍔′汉 2锛氳处濂 + */ + @ElogTransform( name="瀵硅薄绫诲瀷" ) + private Integer targetType; + + /** + * 瀵硅薄 + */ + @ElogTransform( name="瀵硅薄" ) + private Long target; + + /** + * 瀵硅薄 + */ + @ElogTransform( name="瀵硅薄鏄剧ず鍚" ) + private String targetName; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthRoleDataPO.java b/src/com/engine/salary/entity/auth/po/AuthRoleDataPO.java new file mode 100644 index 000000000..a28e5dbe1 --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthRoleDataPO.java @@ -0,0 +1,69 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 瑙掕壊鏁版嵁鏄庣粏 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthRoleDataPO { + @ElogTransform(name = "id") + private Long id; + + /** + * 瑙掕壊id + */ + @ElogTransform(name = "瑙掕壊id") + private Long roleId; + + /** + * 浜哄憳id + */ + @ElogTransform(name = "浜哄憳id") + private Long employeeId; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthRoleEmpPO.java b/src/com/engine/salary/entity/auth/po/AuthRoleEmpPO.java new file mode 100644 index 000000000..f3963f3f7 --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthRoleEmpPO.java @@ -0,0 +1,61 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 瑙掕壊 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthRoleEmpPO { + @ElogTransform(name = "") + private Long id; + /** + * 瑙掕壊id + */ + @ElogTransform(name = "瑙掕壊id") + private Long roleId; + /** + * 浜哄憳id + */ + @ElogTransform(name = "浜哄憳id") + private Long employeeId; + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/po/AuthRolePO.java b/src/com/engine/salary/entity/auth/po/AuthRolePO.java new file mode 100644 index 000000000..0475c9b08 --- /dev/null +++ b/src/com/engine/salary/entity/auth/po/AuthRolePO.java @@ -0,0 +1,69 @@ +package com.engine.salary.entity.auth.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 瑙掕壊 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ElogTransform(name = "涓氬姟绾") +public class AuthRolePO { + + private Long id; + + /** + * 鍚嶇О + */ + @ElogTransform(name = "鍚嶇О") + private String name; + + /** + * 鎻忚堪 + */ + @ElogTransform(name = "鎻忚堪") + private String description; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/auth/vo/Permission.java b/src/com/engine/salary/entity/auth/vo/Permission.java new file mode 100644 index 000000000..6faaa3a62 --- /dev/null +++ b/src/com/engine/salary/entity/auth/vo/Permission.java @@ -0,0 +1,40 @@ +package com.engine.salary.entity.auth.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class Permission { + /** + * 鏄惁寮鍚簡鍒嗘潈 + */ + private Boolean isOpenDevolution; + + /** + * 鏄惁鎬荤鐞嗗憳 + */ + private Boolean isChief; + + /** + * 鏄惁鎵ｇ即涔夊姟浜虹鐞嗗憳 + */ + private Boolean isAdminEnable; + + /** + * 褰撳墠椤甸潰鏄惁鏈夋潈闄 + */ + private boolean able; + + /** + * 鏉冮檺椤 + */ + private List opts; + +} diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java index b6d456bb8..b9d7278c6 100644 --- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java +++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java @@ -1,9 +1,6 @@ package com.engine.salary.entity.datacollection; -import com.engine.salary.annotation.Encrypt; -import com.engine.salary.annotation.SalaryFormulaVar; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableOperate; +import com.engine.salary.annotation.*; import com.engine.hrmelog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; @@ -13,6 +10,7 @@ import lombok.NoArgsConstructor; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Set; /** * 鏁版嵁閲囬泦-绱鎯呭喌琛 @@ -24,6 +22,7 @@ import java.util.List; @SalaryTable(pageId = "a4f83287-e3f9-4275-9527-7d06e54y6238", fields = "id,addUpSubtraction", operates = {@SalaryTableOperate(text = "鍒犻櫎",index = "0")}) //hrsa_add_up_situation @ElogTransform(name = "寰鏈熺疮璁℃儏鍐") +@Auth(page = "addUpSituation") public class AddUpSituation { /** * 涓婚敭id @@ -234,4 +233,7 @@ public class AddUpSituation { Collection employeeIds; Collection taxAgentIds; + + private Set opts; + } \ No newline at end of file diff --git a/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java b/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java index 313ddc1d4..56f7a14b0 100644 --- a/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java +++ b/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java @@ -1,14 +1,14 @@ package com.engine.salary.entity.datacollection.bo; +import cn.hutool.core.util.NumberUtil; import com.engine.core.impl.Service; -import com.engine.salary.constant.SalaryArchiveConstant; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.param.VariableArchiveImportHandleParam; import com.engine.salary.entity.datacollection.po.VariableArchiveItemPO; import com.engine.salary.entity.datacollection.po.VariableArchivePO; import com.engine.salary.entity.datacollection.po.VariableItemPO; -import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveFieldTypeEnum; import com.engine.salary.util.SalaryI18nUtil; @@ -23,7 +23,6 @@ import weaver.general.Util; import weaver.hrm.User; import java.util.*; -import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -178,7 +177,7 @@ public class VariableArchiveExcelBO extends Service { // 涓◣鎵ｇ即涔夊姟浜 String taxAgentCellVal = Optional.ofNullable(map.get(taxAgentI18n)).orElse("").toString(); map.put("taxAgent", taxAgentCellVal); - Optional optionalTaxAgent = importHandleParam.getTaxAgentList().stream().filter(m -> m.getTaxAgentName().equals(taxAgentCellVal)).findFirst(); + Optional optionalTaxAgent = importHandleParam.getTaxAgentList().stream().filter(m -> m.getName().equals(taxAgentCellVal)).findFirst(); if (!optionalTaxAgent.isPresent()) { Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + "涓◣鎵ｇ即涔夊姟浜轰笉瀛樺湪锛屾垨涓嶅湪鏉冮檺鑼冨洿鍐"); @@ -186,12 +185,12 @@ public class VariableArchiveExcelBO extends Service { isError = true; return isError; } - Long taxAgentId = optionalTaxAgent.get().getTaxAgentId(); + Long taxAgentId = optionalTaxAgent.get().getId(); map.put("taxAgentId", taxAgentId); // 鐢ㄤ簬鍒濆鍖栧鍏ユ暟鎹牎楠 map.put("employeeId", employeeId); - String repeatKey = optionalTaxAgent.get().getTaxAgentId() + "-" + employeeId.toString(); + String repeatKey = optionalTaxAgent.get().getId() + "-" + employeeId.toString(); if (allTodoVariableArchives.contains(repeatKey)) { Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + "瀛樺湪閲嶅鏁版嵁"); @@ -232,7 +231,7 @@ public class VariableArchiveExcelBO extends Service { if (optionalVariableItem.isPresent()) { VariableItemPO variableItemPO = optionalVariableItem.get(); // 鏁板肩被鍨嬪垽鏂 - boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal); + boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal); if (isNotNumber) { Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + key + numberErr); diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index b16ebacf6..78b4ac20a 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -9,6 +9,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + /** * 鏁版嵁閲囬泦-绱涓撻」闄勫姞鎵ｉ櫎 *

Copyright: Copyright (c) 2022

@@ -24,6 +26,7 @@ import lombok.NoArgsConstructor; @SalaryTable(pageId = "a4f85287-e3f9-4275-adn9-7d06e54y67j8", tableType = WeaTableType.CHECKBOX, operates = { @SalaryTableOperate(text = "鏌ョ湅鏄庣粏") }) +@Auth(page = "addUpDeduction") public class AddUpDeductionDTO { /** @@ -163,5 +166,5 @@ public class AddUpDeductionDTO { @SalaryTableColumn(text = "鎿嶄綔", width = "20%", column = "operate") @TableTitle(title = "鎿嶄綔", dataIndex = "operate", key = "operate") - private String operate; + private Set opts; } diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java index 4de554f12..2c34eaef4 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; @Data @@ -18,6 +19,7 @@ import java.util.Date; @AllArgsConstructor //鏁版嵁閲囬泦-绱涓撻」闄勫姞鎵ｉ櫎璁板綍 @SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX) +@Auth(page = "addUpDeduction") public class AddUpDeductionRecordDTO { //涓婚敭id @@ -124,4 +126,6 @@ public class AddUpDeductionRecordDTO { @Encrypt private String addUpInfantCare; + private Set opts; + } diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index bd4a80aaa..e4aac1565 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -10,6 +10,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + /** * 鏁版嵁閲囬泦-绱鎯呭喌琛 */ @@ -20,6 +22,7 @@ import lombok.NoArgsConstructor; @SalaryTable(pageId = "a4f85287-e3f9-7841-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = { @SalaryTableOperate(text = "鏌ョ湅鏄庣粏") }) +@Auth(page = "addUpSituation") public class AddUpSituationDTO { //涓婚敭id @JsonSerialize(using = ToStringSerializer.class) @@ -215,5 +218,5 @@ public class AddUpSituationDTO { @SalaryTableColumn(text = "鎿嶄綔", width = "20%", column = "operate") @TableTitle(title = "鎿嶄綔", dataIndex = "operate", key = "operate") - private String operate; + private Set opts; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java index e8c2fd0aa..5a9686b89 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java @@ -1,10 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.Encrypt; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; import com.engine.salary.util.excel.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -28,6 +25,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @SalaryTable(pageId = "a5f85287-3354-4275-adn9-7d06e54y6rj8",tableType = WeaTableType.CHECKBOX) +@Auth(page = "addUpSituation") public class AddUpSituationRecordDTO { @SalaryTableColumn(column = "id", display = false) diff --git a/src/com/engine/salary/entity/datacollection/dto/AttendQuoteListDTO.java b/src/com/engine/salary/entity/datacollection/dto/AttendQuoteListDTO.java index f058c3d91..f5c6fce5f 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AttendQuoteListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AttendQuoteListDTO.java @@ -1,9 +1,7 @@ package com.engine.salary.entity.datacollection.dto; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.SalaryTableOperate; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -13,6 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** * 鏁版嵁閲囬泦-鑰冨嫟寮曠敤鍒楄〃 @@ -30,6 +29,7 @@ import java.util.Date; @SalaryTableOperate(text = "鏌ョ湅", index = "0"), @SalaryTableOperate(text = "鍒犻櫎", index = "1") }) +@Auth(page = "attendQuote",checkType = AuthCheckTypeEnum.SOB) public class AttendQuoteListDTO { @SalaryTableColumn(column = "id", display = false) @@ -79,4 +79,6 @@ public class AttendQuoteListDTO { * 钖祫璐﹀id */ private Long salarySobId; + + private Set opts; } diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java index 94f3580d0..a3c68530c 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java @@ -2,12 +2,15 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.*; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.engine.salary.util.excel.ExcelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + /** * 鏁版嵁閲囬泦-鍏朵粬鍏嶇◣鎵ｉ櫎鍒楄〃 *

Copyright: Copyright (c) 2022

@@ -23,6 +26,7 @@ import lombok.NoArgsConstructor; @SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = { @SalaryTableOperate(text = "鏌ョ湅鏄庣粏") }) +@Auth(page = "otherDeduction", checkType = AuthCheckTypeEnum.TAX_EMP) public class OtherDeductionListDTO { @@ -119,4 +123,6 @@ public class OtherDeductionListDTO { @SalaryTableColumn(text = "鎿嶄綔", width = "20%", column = "operate") @TableTitle(title = "鎿嶄綔", dataIndex = "operate", key = "operate") private String operate; + + private Set opts; } diff --git a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java index 5e480bb21..5a993906f 100644 --- a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + /** * 鏁版嵁閲囬泦-涓撻」闄勫姞鎵ｉ櫎鍒楄〃 *

Copyright: Copyright (c) 2022

@@ -23,6 +25,7 @@ import lombok.NoArgsConstructor; @SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = { @SalaryTableOperate(text = "鏌ョ湅鏄庣粏") }) +@Auth(page = "specialAddDeduction") public class SpecialAddDeductionListDTO { @@ -133,5 +136,5 @@ public class SpecialAddDeductionListDTO { @SalaryTableColumn(text = "鎿嶄綔", width = "20%", column = "operate") @TableTitle(title = "鎿嶄綔", dataIndex = "operate", key = "operate") - private String operate; + private Set opts; } diff --git a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java index f872279e1..f371232f5 100644 --- a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java @@ -1,10 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.Encrypt; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -23,6 +20,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d98e54y6rj8", tableType = WeaTableType.CHECKBOX) +@Auth(page = "specialAddDeduction") public class SpecialAddDeductionRecordDTO { //涓婚敭id diff --git a/src/com/engine/salary/entity/datacollection/dto/VariableArchiveListDTO.java b/src/com/engine/salary/entity/datacollection/dto/VariableArchiveListDTO.java index 6d5905390..b3faa7e4c 100644 --- a/src/com/engine/salary/entity/datacollection/dto/VariableArchiveListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/VariableArchiveListDTO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.I18n; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.TableTitle; @@ -10,6 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** * 娴姩钖祫妗ｆ鍒楄〃 @@ -24,6 +26,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @SalaryTable(pageId = "bd985583-f84j-p2aj-p288-2hw3hosy6r6,", tableType = WeaTableType.CHECKBOX) +@Auth(page = "variableArchive") public class VariableArchiveListDTO { @TableTitle(title = "id", dataIndex = "id", key = "id") @@ -96,4 +99,6 @@ public class VariableArchiveListDTO { */ private String dismissdate; + private Set opts; + } diff --git a/src/com/engine/salary/entity/datacollection/param/VariableArchiveImportHandleParam.java b/src/com/engine/salary/entity/datacollection/param/VariableArchiveImportHandleParam.java index ab12ad1a0..b5ef4a61a 100644 --- a/src/com/engine/salary/entity/datacollection/param/VariableArchiveImportHandleParam.java +++ b/src/com/engine/salary/entity/datacollection/param/VariableArchiveImportHandleParam.java @@ -4,7 +4,7 @@ import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.po.VariableArchiveItemPO; import com.engine.salary.entity.datacollection.po.VariableArchivePO; import com.engine.salary.entity.datacollection.po.VariableItemPO; -import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -75,7 +75,7 @@ public class VariableArchiveImportHandleParam { /** * 鑾峰彇鎵鏈変釜绋庢墸缂翠箟鍔′汉 */ - Collection taxAgentList; + Collection taxAgentList; /** * 褰撳墠鏃堕棿 diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java index 83f1ec932..033c82842 100644 --- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java @@ -1,8 +1,9 @@ package com.engine.salary.entity.datacollection.po; +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryFormulaVar; -import com.engine.hrmelog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -20,6 +21,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @ElogTransform( name = "鍏朵粬鍏嶇◣鎵ｉ櫎") +@Auth(page = "otherDeduction") public class OtherDeductionPO { /** diff --git a/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java b/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java new file mode 100644 index 000000000..83f356300 --- /dev/null +++ b/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java @@ -0,0 +1,57 @@ +package com.engine.salary.entity.extemp.dto; + + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 澶栭儴浜哄憳 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_external_employee +@ElogTransform( name = "闈炵郴缁熶汉鍛") +public class ExtEmpDTO { + + @ElogTransform(name = "涓婚敭id") + private Long id; + + /** + * 濮撳悕 + */ + @TableTitle(title = "濮撳悕", dataIndex = "username", key = "username") + private String username; + + /** + * 閮ㄩ棬 + */ + @TableTitle(title = "閮ㄩ棬", dataIndex = "departmentName", key = "departmentName") + private String departmentName; + + + /** + * 鍒嗛儴 + */ + @TableTitle(title = "鍒嗛儴", dataIndex = "subcompanyName", key = "subcompanyName") + private String subcompanyName; + + /** + * 鍏ヨ亴鏃ユ湡 + */ + @TableTitle(title = "鍏ヨ亴鏃ユ湡", dataIndex = "companystartdate", key = "companystartdate") + private String companystartdate; + + + /** + * 宸ュ彿 + */ + @TableTitle(title = "宸ュ彿", dataIndex = "workcode", key = "workcode") + private String workcode; + +} diff --git a/src/com/engine/salary/entity/push/dto/PushRecordDTO.java b/src/com/engine/salary/entity/push/dto/PushRecordDTO.java new file mode 100644 index 000000000..74df0f8d4 --- /dev/null +++ b/src/com/engine/salary/entity/push/dto/PushRecordDTO.java @@ -0,0 +1,116 @@ +package com.engine.salary.entity.push.dto; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +import com.engine.salary.enums.push.PushRecordStatusEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏁版嵁鎺ㄩ佽褰曞垪琛 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushRecordDTO { + + @ElogTransform(name = "") + private Long id; + + + /** + * 璁板綍鍚 + */ + @TableTitle(title = "璁板綍鍚", dataIndex = "name", key = "name") + private String name; + + + /** + * 鏍哥畻璁板綍id + */ + private Long acctRecordId; + + + /** + * 鎺ㄩ侀厤缃甶d + */ + private Long settingId; + + /** + * 寤烘āid + */ + private Integer modeId; + + /** + * 鏁版嵁搴撹〃鍚 + */ + @TableTitle(title = "鏁版嵁琛ㄥ悕", dataIndex = "tableName", key = "tableName") + private String tableName; + + + /** + * 鎺ㄩ佺姸鎬 + * + * @see PushRecordStatusEnum + */ + @TableTitle(title = "鎺ㄩ佺姸鎬", dataIndex = "statusName", key = "statusName") + private String statusName; + private Integer status; + + /** + * 鎵ц鏃堕棿 + */ + @TableTitle(title = "鎵ц寮濮嬫椂闂", dataIndex = "startTime", key = "startTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date startTime; + + /** + * 缁撴潫鏃堕棿 + */ + @TableTitle(title = "鎵ц缁撴潫鏃堕棿", dataIndex = "endTime", key = "endTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date endTime; + + + /** + * 鎺ㄩ佺被鍨嬶紝0鎺ㄩ侊紝1鎾ゅ洖 + */ + private Integer type; + + /** + * 鍒涘缓鏃堕棿 + */ + private Date createTime; + + /** + * 鍒涘缓浜 + */ + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + private Integer deleteType; + + /** + * 绉熸埛ID + */ + private String tenantKey; + + /** + * 鏇存柊鏃堕棿 + */ + private Date updateTime; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java b/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java new file mode 100644 index 000000000..de9d56fe5 --- /dev/null +++ b/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java @@ -0,0 +1,94 @@ +package com.engine.salary.entity.push.dto; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushRecordDetailDTO { + + + @ElogTransform(name = "id") + private Long id; + + /** + * 鎺ㄩ佽褰昳d + */ + private Long recordId; + + /** + * 鏍哥畻浜哄憳id + */ + private Long acctEmpId; + + @TableTitle(title = "浜哄憳", dataIndex = "username",key = "username") + private String username; + + /** + * 鎵ц鐘舵 + * @see com.engine.salary.enums.push.PushRecordDetailStatusEnum + */ + @TableTitle(title = "鎵ц鐘舵", dataIndex = "statusName",key = "statusName") + private String statusName; + private Integer status; + + /** + * 澶辫触鍘熷洜 + */ + @TableTitle(title = "澶辫触鍘熷洜", dataIndex = "fail_reason",key = "status") + private String failReason; + + /** + * 鎵цsql + */ + @ElogTransform(name = "鎵цsql") + private String execute; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/dto/PushSettingDTO.java b/src/com/engine/salary/entity/push/dto/PushSettingDTO.java new file mode 100644 index 000000000..114d6fa5b --- /dev/null +++ b/src/com/engine/salary/entity/push/dto/PushSettingDTO.java @@ -0,0 +1,61 @@ +package com.engine.salary.entity.push.dto; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +import com.engine.salary.entity.salarysob.po.SalarySobPO; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingDTO { + + @ElogTransform(name = "") + private Long id; + + + + @TableTitle(title = "浠诲姟鍚嶇О", key = "name", dataIndex = "name") + private String name; + + /** + * 鏄惁鍚敤锛0鍚 1鏄 + */ + @TableTitle(title = "鏄惁鍚敤", key = "able", dataIndex = "able") + private Integer able; + + + /** + * 钖祫甯愬闆嗗悎 + */ + @TableTitle(title = "钖祫甯愬闆嗗悎", key = "salarySobs", dataIndex = "salarySobs") + private List salarySobs; + + /** + * 寤烘āid + */ + @TableTitle(title = "寤烘āid", key = "modeId", dataIndex = "modeId") + private Integer modeId; + + /** + * 妯″潡鍚嶇О + */ + @TableTitle(title = "妯″潡鍚嶇О", key = "modeName", dataIndex = "modeName") + private String modeName; + + /** + * 鏁版嵁搴撹〃 + */ + @TableTitle(title = "鏁版嵁搴撹〃鍚", key = "tableName", dataIndex = "tableName") + private String tableName; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/dto/PushSettingItemDTO.java b/src/com/engine/salary/entity/push/dto/PushSettingItemDTO.java new file mode 100644 index 000000000..22c8832d6 --- /dev/null +++ b/src/com/engine/salary/entity/push/dto/PushSettingItemDTO.java @@ -0,0 +1,65 @@ +package com.engine.salary.entity.push.dto; + +import com.engine.salary.annotation.TableTitle; +import com.engine.salary.enums.push.PushItemFieldEnum; +import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 鏁版嵁鎺ㄩ侀厤缃槑缁 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingItemDTO { + + + private Long id; + + /** + * 璁剧疆id + */ + private Long settingId; + + /** + * 椤圭洰 + */ + private String item; + + /** + * 椤圭洰鍚 + */ + @TableTitle(title = "椤圭洰鍚", dataIndex = "itemName", key = "itemName") + private String itemName; + + /** + * 椤圭洰绫诲瀷 + * @see SalarySQLReferenceEnum + */ + private String source; + + private String sourceName; + + /** + * 鏁版嵁搴撳瓧娈 + */ + @TableTitle(title = "鏁版嵁搴撳瓧娈", dataIndex = "fieldName", key = "fieldName") + private String fieldName; + + /** + * 瀛楁绫诲瀷 + * @see PushItemFieldEnum + */ + private PushItemFieldEnum fieldType; + + @TableTitle(title = "瀛楁绫诲瀷", dataIndex = "fieldTypeName", key = "fieldTypeName") + private String fieldTypeName; + + @TableTitle(title = "鎺掑簭", dataIndex = "sortedIndex", key = "sortedIndex") + private Integer sortedIndex; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/CreatePushParam.java b/src/com/engine/salary/entity/push/param/CreatePushParam.java new file mode 100644 index 000000000..5ef10fef4 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/CreatePushParam.java @@ -0,0 +1,29 @@ +package com.engine.salary.entity.push.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +/** + * 鍒涘缓鎺ㄩ佽褰 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CreatePushParam { + + + private List salaryAcctRecordIds; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/PushParam.java b/src/com/engine/salary/entity/push/param/PushParam.java new file mode 100644 index 000000000..36aefd747 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/PushParam.java @@ -0,0 +1,20 @@ +package com.engine.salary.entity.push.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushParam { + + + private List ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/PushSettingItemQueryParam.java b/src/com/engine/salary/entity/push/param/PushSettingItemQueryParam.java new file mode 100644 index 000000000..a24bc3b40 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/PushSettingItemQueryParam.java @@ -0,0 +1,22 @@ +package com.engine.salary.entity.push.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 PushSettingItemQueryParam extends BaseQueryParam { + + private Long settingId; + + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/PushSettingItemSaveParam.java b/src/com/engine/salary/entity/push/param/PushSettingItemSaveParam.java new file mode 100644 index 000000000..d095b9697 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/PushSettingItemSaveParam.java @@ -0,0 +1,71 @@ +package com.engine.salary.entity.push.param; + +import com.engine.salary.enums.push.PushItemFieldEnum; +import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum; +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; + +/** + * 鏁版嵁鎺ㄩ侀厤缃槑缁 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingItemSaveParam { + + + private Long id; + + /** + * 璁剧疆id + */ + @DataCheck(require = true, message = "璁剧疆id涓虹┖") + private Long settingId; + + /** + * 椤圭洰 + */ + @DataCheck(require = true, message = "椤圭洰涓虹┖") + private String item; + + /** + * 椤圭洰鍚 + */ + @DataCheck(require = true, message = "椤圭洰鍚嶄负绌") + private String itemName; + + /** + * 椤圭洰绫诲瀷 + * @see SalarySQLReferenceEnum + */ + @DataCheck(require = true, message = "鏁版嵁鏉ユ簮") + private String source; + + /** + * 鏁版嵁搴撳瓧娈 + */ + @DataCheck(require = true, message = "鏁版嵁搴撳瓧娈典负绌") + private String fieldName; + + /** + * 瀛楁绫诲瀷 + */ + @DataCheck(require = true, message = "瀛楁绫诲瀷涓虹┖") + private PushItemFieldEnum fieldType; + + /** + * 鎺掑簭 + */ + private Integer sortedIndex; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/PushSettingQueryParam.java b/src/com/engine/salary/entity/push/param/PushSettingQueryParam.java new file mode 100644 index 000000000..8d0a96e10 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/PushSettingQueryParam.java @@ -0,0 +1,28 @@ +package com.engine.salary.entity.push.param; + +import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.util.valid.DataCheck; +import com.engine.salary.util.valid.ValidTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingQueryParam extends BaseQueryParam { + + + /** + * 浠诲姟鍚嶇О + */ + @DataCheck(require = true, type = ValidTypeEnum.STRING, max = 50, labelId = 86185, message = "浠诲姟鍚嶇О涓虹┖") + private String name; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/PushSettingSaveParam.java b/src/com/engine/salary/entity/push/param/PushSettingSaveParam.java new file mode 100644 index 000000000..cdc28d327 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/PushSettingSaveParam.java @@ -0,0 +1,59 @@ +package com.engine.salary.entity.push.param; + +import com.engine.salary.util.valid.DataCheck; +import com.engine.salary.util.valid.ValidTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingSaveParam { + + private Long id; + + /** + * 浠诲姟鍚嶇О + */ + @DataCheck(require = true, type = ValidTypeEnum.STRING, max = 50, labelId = 86185, message = "浠诲姟鍚嶇О涓虹┖") + private String name; + + /** + * 鏄惁鍚敤锛0鍚 1鏄 + */ + @DataCheck(require = true, type = ValidTypeEnum.NUMBER, message = "鏄惁鍚敤涓虹┖") + private Integer able; + + + /** + * 钖祫甯愬闆嗗悎 + */ + private List salarySobIds; + + /** + * 寤烘āid + */ + private Integer modeId; + + /** + * 妯″潡鍚嶇О + */ + private String modeName; + + + /** + * 鏁版嵁搴撹〃 + */ + @DataCheck(require = true, message = "鏁版嵁搴撹〃涓虹┖") + private String tableName; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java b/src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java new file mode 100644 index 000000000..7a4619d2d --- /dev/null +++ b/src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java @@ -0,0 +1,22 @@ +package com.engine.salary.entity.push.param; + +import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordDetailListQueryParam extends BaseQueryParam { + + @DataCheck(require = true, message = "鎺ㄩ佽褰昳d涓嶈兘涓虹┖") + private Long recordId; + + private String name; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/RecordListQueryParam.java b/src/com/engine/salary/entity/push/param/RecordListQueryParam.java new file mode 100644 index 000000000..0dfe41108 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/RecordListQueryParam.java @@ -0,0 +1,17 @@ +package com.engine.salary.entity.push.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 RecordListQueryParam extends BaseQueryParam { + private String name; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/WithdrawParam.java b/src/com/engine/salary/entity/push/param/WithdrawParam.java new file mode 100644 index 000000000..2535db525 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/WithdrawParam.java @@ -0,0 +1,20 @@ +package com.engine.salary.entity.push.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WithdrawParam { + + + private List ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/WithdrawPushParam.java b/src/com/engine/salary/entity/push/param/WithdrawPushParam.java new file mode 100644 index 000000000..cc0915bc2 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/WithdrawPushParam.java @@ -0,0 +1,29 @@ +package com.engine.salary.entity.push.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +/** + * 鍒涘缓鎺ㄩ佽褰 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WithdrawPushParam { + + + private List ids; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java new file mode 100644 index 000000000..88308a8b6 --- /dev/null +++ b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java @@ -0,0 +1,96 @@ +package com.engine.salary.entity.push.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushRecordDetailPO { + + + @ElogTransform(name = "id") + private Long id; + + /** + * 鎺ㄩ佽褰昳d + */ + @ElogTransform(name = "鎺ㄩ佽褰昳d") + private Long recordId; + + /** + * 鏍哥畻浜哄憳id + */ + @ElogTransform(name = "鏍哥畻浜哄憳id") + private Long acctEmpId; + + /** + * 鏍哥畻浜哄憳id + */ + private Long dataId; + + /** + * 鎵ц鐘舵 + * @see com.engine.salary.enums.push.PushRecordDetailStatusEnum + */ + @ElogTransform(name = "鎵ц鐘舵") + private Integer status; + + /** + * 澶辫触鍘熷洜 + */ + @ElogTransform(name = "澶辫触鍘熷洜") + private String failReason; + + /** + * 鎵цsql + */ + @ElogTransform(name = "鎵цsql") + private String formula; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/po/PushRecordPO.java b/src/com/engine/salary/entity/push/po/PushRecordPO.java new file mode 100644 index 000000000..a0ed7080a --- /dev/null +++ b/src/com/engine/salary/entity/push/po/PushRecordPO.java @@ -0,0 +1,123 @@ +package com.engine.salary.entity.push.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.push.PushRecordStatusEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushRecordPO { + + @ElogTransform(name = "id") + private Long id; + + /** + * 璁板綍鍚 + */ + @ElogTransform(name = "璁板綍鍚") + private String name; + + + /** + * 鏍哥畻璁板綍id + */ + @ElogTransform(name = "鏍哥畻璁板綍id") + private Long acctRecordId; + + + /** + * 鎺ㄩ侀厤缃甶d + */ + @ElogTransform(name = "鎺ㄩ侀厤缃甶d") + private Long settingId; + + /** + * 寤烘āid + */ + private Integer modeId; + + /** + * 鏁版嵁搴撹〃鍚 + */ + private String tableName; + + + /** + * 鎺ㄩ佺姸鎬 + * @see PushRecordStatusEnum + */ + @ElogTransform(name = "鎺ㄩ佺姸鎬") + private Integer status; + + /** + * 澶辫触鍘熷洜 + */ + @ElogTransform(name = "澶辫触鍘熷洜") + private String failReason; + + /** + * 寮濮嬫椂闂 + */ + @ElogTransform(name = "寮濮嬫椂闂") + private Date startTime; + + /** + * + */ + @ElogTransform(name = "缁撴潫鏃堕棿") + private Date endTime; + + + + /** + * 鎺ㄩ佺被鍨 + */ + @ElogTransform(name = "鎺ㄩ佺被鍨") + private Integer type; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/po/PushSettingItemPO.java b/src/com/engine/salary/entity/push/po/PushSettingItemPO.java new file mode 100644 index 000000000..71b16e335 --- /dev/null +++ b/src/com/engine/salary/entity/push/po/PushSettingItemPO.java @@ -0,0 +1,103 @@ +package com.engine.salary.entity.push.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.push.PushItemFieldEnum; +import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; + +/** + * 鏁版嵁鎺ㄩ侀厤缃槑缁 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingItemPO { + + + @ElogTransform(name = "") + private Long id; + + /** + * 璁剧疆id + */ + @ElogTransform(name = "璁剧疆id") + private Long settingId; + + /** + * 椤圭洰 + */ + @ElogTransform(name = "椤圭洰") + private String item; + + /** + * 椤圭洰鍚 + */ + @ElogTransform(name = "椤圭洰鍚") + private String itemName; + + /** + * 椤圭洰绫诲瀷 + * @see SalarySQLReferenceEnum + */ + @ElogTransform(name = "椤圭洰绫诲瀷") + private String source; + + /** + * 鏁版嵁搴撳瓧娈 + */ + @ElogTransform(name = "鏁版嵁搴撳瓧娈") + private String fieldName; + + /** + * 瀛楁绫诲瀷 + * @see PushItemFieldEnum + */ + @ElogTransform(name = "瀛楁绫诲瀷") + private Integer fieldType; + + + @ElogTransform(name = "鎺掑簭") + private Integer sortedIndex; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/po/PushSettingPO.java b/src/com/engine/salary/entity/push/po/PushSettingPO.java new file mode 100644 index 000000000..a997593f9 --- /dev/null +++ b/src/com/engine/salary/entity/push/po/PushSettingPO.java @@ -0,0 +1,93 @@ +package com.engine.salary.entity.push.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * 鏁版嵁鎺ㄩ侀厤缃 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PushSettingPO { + + @ElogTransform(name = "") + private Long id; + + /** + * 鏄惁鍚敤锛0鍚 1鏄 + */ + @ElogTransform(name = "鏄惁鍚敤锛0鍚 1鏄") + private Integer able; + + + @ElogTransform(name = "浠诲姟鍚嶇О") + private String name; + + /** + * 钖祫甯愬闆嗗悎 + */ + @ElogTransform(name = "钖祫甯愬闆嗗悎") + private List salarySobIds; + + /** + * 寤烘āid + */ + @ElogTransform(name = "寤烘āid") + private Integer modeId; + + /** + * 妯″潡鍚嶇О + */ + @ElogTransform(name = "妯″潡鍚嶇О") + private String modeName; + + /** + * 鏁版嵁搴撹〃 + */ + @ElogTransform(name = "鏁版嵁搴撹〃") + private String tableName; + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + + //涓婚敭id闆嗗悎 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java index 4e219c477..aa32a8829 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java @@ -120,55 +120,36 @@ public class SalaryBillBO { /** * 鏋勫缓宸ヨ祫鍗曚腑鐨勪汉鍛樹俊鎭 * - * @param simpleEmployee */ - public static void buildEmployeeInfo(SalaryBillSendDTO salaryBillSendParam, DataCollectionEmployee simpleEmployee) { + public static void buildEmployeeInfo(SalaryBillSendDTO salaryBillSendParam, Map empInfo) { SalaryTemplateSalaryItemSetListDTO employeeInformation = salaryBillSendParam.getEmployeeInformation(); Map employeeField = salaryBillSendParam.getEmployeeField(); - if (employeeInformation == null || simpleEmployee == null) { + if (employeeInformation == null || empInfo == null) { return; } if (CollectionUtils.isNotEmpty(employeeInformation.getItems())) { //鑾峰彇鍛樺伐淇℃伅鐨勫瓧娈靛悕鍜屼腑鏂囨弿杩扮殑map鍏崇郴 SalaryFormulaEmployeeDTO salaryFormulaEmployeeDTO = SalaryFormulaEmployeeDTO.builder() - .employeeId(simpleEmployee.getEmployeeId()) - .taxAgentName(salaryBillSendParam.getTaxAgentName()) - .departmentName(simpleEmployee.getDepartmentName()) - .companystartdate(simpleEmployee.getCompanystartdate()) - .email(StringUtils.isEmpty(simpleEmployee.getEmail()) ? "" : simpleEmployee.getEmail()) - .sex(simpleEmployee.getSex() == null ? "" : simpleEmployee.getSex()) - .mobile(StringUtils.isEmpty(simpleEmployee.getMobile()) ? "" : simpleEmployee.getMobile()).jobtitleName(simpleEmployee.getJobtitleName()) - .status(StringUtils.isEmpty(simpleEmployee.getStatus()) ? "" : simpleEmployee.getStatus()) - .telephone(StringUtils.isEmpty(simpleEmployee.getTelephone()) ? "" : simpleEmployee.getTelephone()) - .username(StringUtils.isEmpty(simpleEmployee.getUsername()) ? "" : simpleEmployee.getUsername()) - .workcode(simpleEmployee.getWorkcode()) - .idNo(simpleEmployee.getIdNo()) - .statusName(simpleEmployee.getStatusName()) - .accountType(simpleEmployee.getAccountType()) - .accountTypeName(simpleEmployee.getAccountTypeName()) + .employeeId((long) empInfo.getOrDefault("employeeId", 0L)) + .taxAgentName(Util.null2String(empInfo.get("taxAgentName"))) + .departmentName(Util.null2String(empInfo.get("departmentName"))) + .companystartdate(Util.null2String(empInfo.get("companystartdate"))) + .email(Util.null2String(empInfo.get("email"))) + .sex(Util.null2String(empInfo.get("sex"))) + .mobile(Util.null2String(empInfo.get("mobile"))) + .jobtitleName(Util.null2String(empInfo.get("jobtitleName"))) + .status(Util.null2String(empInfo.get("status"))) + .telephone(Util.null2String(empInfo.get("telephone"))) + .username(Util.null2String(empInfo.get("username"))) + .workcode(Util.null2String(empInfo.get("workcode"))) + .idNo(Util.null2String(empInfo.get("idNo"))) + .statusName(Util.null2String(empInfo.get("statusName"))) +// .accountType((Integer) empInfo.getOrDefault("accountType",0)) + .accountTypeName(Util.null2String(empInfo.get("accountTypeName"))) .build(); List items = employeeInformation.getItems(); - // 1.SalaryAcctResultBO.buildEmployeeFieldName()鐨勫彇娉 -// Set> entries = employeeField.entrySet(); -// for (SalaryTemplateSalaryItemListDTO e : items) { -// Optional> entry = entries.stream().filter(f -> Objects.equals(e.getName(), f.getValue())).findFirst(); -// if (entry.isPresent()) { -// String key = entry.get().getKey(); -// if (StringUtils.isNotBlank(key)) { -// String getter = "get" + key.substring(0, 1).toUpperCase() + key.substring(1); -// try { -// Method method = salaryFormulaEmployeeDTO.getClass().getMethod(getter); -// Object invoke = method.invoke(salaryFormulaEmployeeDTO); -// e.setSalaryItemValue((String) invoke); -// } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { -// log.error("no such method", e); -// } -// } -// } -// } - // 2.SalaryBillBO.buildEmployeeFieldName() for (SalaryTemplateSalaryItemListDTO e : items) { String employeeFieldName = employeeField.get(e.getName()); if (!StringUtils.isEmpty(employeeFieldName)) { @@ -267,7 +248,7 @@ public class SalaryBillBO { } Util_Message.store(messageBean); } catch (IOException e) { - log.error("娑堟伅鍙戦佸け璐",e); + log.error("娑堟伅鍙戦佸け璐", e); } } @@ -649,7 +630,8 @@ public class SalaryBillBO { } else { for (Object keyName : e.keySet()) { if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) { - boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString())) + String itemValue = Util.null2String(e.get(keyName.toString())); + boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue)) || (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString()) && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0); @@ -660,7 +642,7 @@ public class SalaryBillBO { emailContent.append(""); emailContent.append(""); - emailContent.append(e.get(keyName.toString())); + emailContent.append(itemValue.replaceAll("null", "")); emailContent.append(""); } break; @@ -729,7 +711,8 @@ public class SalaryBillBO { SalaryTemplateSalaryItemListDTO salaryItem = itemPartition.get(i); for (Object keyName : e.keySet()) { if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) { - boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString())) + String itemValue = Util.null2String(e.get(keyName.toString())); + boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue)) || (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString()) && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0); @@ -740,7 +723,7 @@ public class SalaryBillBO { emailContent.append(""); emailContent.append(""); - emailContent.append(e.get(keyName.toString())); + emailContent.append(itemValue.replaceAll("null", "")); emailContent.append(""); } break; @@ -867,7 +850,7 @@ public class SalaryBillBO { if ("text".equals(wmClassify)) { wmTextFieldIds = (List) salaryBillWatermark.getWmSetting().getOrDefault("wmSelectedFieldIds", Collections.emptyList()); - List empFields = Arrays.asList(HRM_Name, HRM_Num, HRM_Mobile, HRM_Email, HRM_CurrentOperatorId, HRM_Department); + List empFields = Arrays.asList(HRM_Name, HRM_Num, HRM_Mobile, HRM_Email, HRM_CurrentOperatorId, HRM_Department, HRM_SecondDepartment); if (wmTextFieldIds.contains(HRM_SecondDepartment)) { // 闇瑕佹煡鍒嗛儴 salaryBillWatermark.getWmSetting().put("needQuerySubDepart", true); diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillSendDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillSendDTO.java index c77c0bd7a..dc9d31b73 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillSendDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillSendDTO.java @@ -59,7 +59,7 @@ public class SalaryBillSendDTO { private String picUrl; //鎵ｇ即涔夊姟浜哄悕绉 - private String taxAgentName; +// private String taxAgentName; //宸ヨ祫鍗曟ā鏉-钖祫椤圭洰璁剧疆 private List salaryItemSetList; diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java index 4e87a6ad8..ae647ab04 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java @@ -44,6 +44,7 @@ public class SalarySendDetailListDTO { // 涓◣鎵ｇ即涔夊姟浜") private String taxAgent; + private Long taxAgentId; // 閮ㄩ棬") @I18n diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java index 915045c89..ff2bb7d2a 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java @@ -1,8 +1,10 @@ package com.engine.salary.entity.salaryBill.dto; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.SalaryTableOperate; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,6 +12,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** * @Description: 宸ヨ祫鍗曞彂鏀 @@ -19,10 +22,11 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @SalaryTable(pageId = "a4f85287-289dff07669d7a23de0ef88d2f7129e7", operates = { - @SalaryTableOperate(index = "0", text = "鍙戞斁" ), + @SalaryTableOperate(index = "0", text = "鍙戞斁"), @SalaryTableOperate(index = "1", text = "鏌ョ湅璇︽儏"), @SalaryTableOperate(index = "2", text = "鏇存柊妯℃澘") }) +@Auth(page = "salaryBill", checkType = AuthCheckTypeEnum.SOB, sobIdField = "salarySobId") public class SalarySendListDTO { // 涓婚敭id @@ -37,7 +41,7 @@ public class SalarySendListDTO { // ) // @JsonFormat(pattern = "yyyy-MM") -// 钖祫鎵灞炴湀 + // 钖祫鎵灞炴湀 @SalaryTableColumn(text = "钖祫鎵灞炴湀", width = "10%", column = "salaryYearMonth") private Date salaryYearMonth; @@ -54,15 +58,15 @@ public class SalarySendListDTO { // tableColumn = @TableColumn(width = "35%") // ) -// 钖祫璐﹀ + // 钖祫璐﹀ @SalaryTableColumn(text = "钖祫璐﹀", width = "35%", column = "username") private String salarySob; -// 鏍哥畻娆℃暟") + // 鏍哥畻娆℃暟") // 鏍哥畻娆℃暟 private String acctTimes; -// 宸ヨ祫鍗曟ā鏉") + // 宸ヨ祫鍗曟ā鏉") // @WeaFormat( // label = "宸ヨ祫鍗曟ā鏉", // labelId = 93214, @@ -72,7 +76,7 @@ public class SalarySendListDTO { // 宸ヨ祫鍗曟ā鏉 private String template; -// 宸ヨ祫鍗曟ā鏉縄d") + // 宸ヨ祫鍗曟ā鏉縄d") // 宸ヨ祫鍗曟ā鏉縄d @SalaryTableColumn(text = "宸ヨ祫鍗曟ā鏉縤d", width = "0%", column = "templateId", display = false) private Long templateId; @@ -91,7 +95,7 @@ public class SalarySendListDTO { @SalaryTableColumn(text = "鍙戦佹绘暟", width = "0%", column = "sendTotal", display = false) private Integer sendTotal; -// 宸插彂鏀") + // 宸插彂鏀") // @WeaFormat( // label = "宸插彂鏀", // labelId = 93212, @@ -101,7 +105,7 @@ public class SalarySendListDTO { @SalaryTableColumn(text = "宸插彂鏀", width = "15%", column = "sendSituation") private String sendSituation; -// 鏈鍚庡彂閫佹椂闂") + // 鏈鍚庡彂閫佹椂闂") // @WeaFormat( // label = "鏈鍚庡彂閫佹椂闂", // labelId = 93213, @@ -146,5 +150,5 @@ public class SalarySendListDTO { */ private Integer ackFeedbackStatus; - + private Set opts; } diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java index 3538a3387..5fdaaef98 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java @@ -1,15 +1,15 @@ package com.engine.salary.entity.salaryBill.dto; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.SalaryTableOperate; -import com.engine.salary.annotation.TableTitle; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.*; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + /** * @Description: 宸ヨ祫鍗曟ā鏉 */ @@ -24,6 +24,7 @@ import lombok.NoArgsConstructor; @SalaryTableOperate(index = "3", text = "鎿嶄綔鏃ュ織" ) }) @ElogTransform(name = "宸ヨ祫鍗曟ā鏉") +@Auth(page = "salaryBill", checkType = AuthCheckTypeEnum.SOB) public class SalaryTemplateListDTO { //涓婚敭id @@ -65,4 +66,7 @@ public class SalaryTemplateListDTO { // 钖祫璐﹀id private Long salarySobId; + + + private Set opts; } diff --git a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java index b341f162d..cd66dd76c 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java @@ -101,6 +101,11 @@ public class CalculateFormulaVarBO { */ private List> variableArchiveList; + /** + * 涓婃湀鏍哥畻缁撴灉 + */ + List lastMonthResultPOS; + public CalculateFormulaVarBO(List simpleEmployees, List salaryArchiveData, List addUpSituationPOS, @@ -109,7 +114,8 @@ public class CalculateFormulaVarBO { List> welfareData, List attendQuoteDataDTOS, List salaryAcctResultPOS, - List> variableArchiveList) { + List> variableArchiveList, + List lastMonthResultPOS) { this.simpleEmployees = simpleEmployees; this.salaryArchiveData = salaryArchiveData; this.addUpSituationPOS = addUpSituationPOS; @@ -119,6 +125,7 @@ public class CalculateFormulaVarBO { this.attendQuoteDataDTOS = attendQuoteDataDTOS; this.salaryAcctResultPOS = salaryAcctResultPOS; this.variableArchiveList = variableArchiveList; + this.lastMonthResultPOS = lastMonthResultPOS; } /** @@ -147,7 +154,10 @@ public class CalculateFormulaVarBO { handleAttendQuoteData(salaryAcctCalculateBO, resultMap); //澶勭悊鏍哥畻浜哄憳淇℃伅 handleSalaryAcctEmployee(salaryAcctCalculateBO, resultMap); + //澶勭悊浜哄憳淇℃伅 handleSimpleEmployees(resultMap); + //澶勭悊涓婃湀钖祫鏍哥畻缁撴灉 + handleLastMonthResult(salaryAcctCalculateBO, resultMap); return resultMap; } @@ -221,7 +231,7 @@ public class CalculateFormulaVarBO { formulaVarValues.addAll(salaryAcctCalculateBO.getIssuedFieldIds().stream() .map(fieldId -> { String originResultValue = salaryAcctResultPOMap.getOrDefault( - salaryCodeItemMap.get(fieldId),SalaryAcctResultPO.builder().originResultValue("").build()) + salaryCodeItemMap.get(fieldId), SalaryAcctResultPO.builder().originResultValue("").build()) .getOriginResultValue(); String fieldId2 = SalaryFormulaReferenceEnum.ISSUED.getValue() + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR @@ -231,6 +241,25 @@ public class CalculateFormulaVarBO { }); } + private void handleLastMonthResult(SalaryAcctCalculateBO salaryAcctCalculateBO, Map> resultMap) { + // key:钖祫椤圭洰鐨刬d銆乿alue:钖祫椤圭洰鐨刢ode + Map salaryItemCodeMap = SalaryEntityUtil.convert2Map(salaryAcctCalculateBO.getSalaryItemPOS(), SalaryItemPO::getId, SalaryItemPO::getCode); + // key:employeeId_taxAgentId銆乿alue:钖祫鏍哥畻缁撴灉闆嗗悎 + Map> salaryAcctResultMap = SalaryEntityUtil.group2Map(lastMonthResultPOS, + salaryAcctResultPO -> salaryAcctResultPO.getEmployeeId() + "_" + salaryAcctResultPO.getTaxAgentId()); + // 濉厖鍒拌繑鍥炵粨鏋滈泦涓 + salaryAcctResultMap.forEach((key, salaryAcctResultPOS) -> { + List formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList()); + formulaVarValues.addAll(salaryAcctResultPOS.stream() + .map(salaryAcctResultPO -> { + String fieldId = SalaryFormulaReferenceEnum.LAST_MONTH_CALC.getValue() + + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR + + salaryItemCodeMap.getOrDefault(salaryAcctResultPO.getSalaryItemId(), StringUtils.EMPTY); + return new FormulaVarValue().setFieldId(fieldId).setFieldValue(salaryAcctResultPO.getResultValue()); + }) + .collect(Collectors.toList())); + }); + } /** * 澶勭悊钖祫妗ｆ锛堜細娑夊強璋冭柂璁¤柂瑙勫垯锛+澶勭悊鏍哥畻鏃ユ湡 @@ -474,9 +503,9 @@ public class CalculateFormulaVarBO { // 绀句繚绂忓埄鍙夊瓧娈 List fieldNames = Lists.newArrayList(salaryAcctCalculateBO.getWelfareColumns().values()); // 绀句繚绂忓埄鏁版嵁 - Map> tempMap = Maps.newHashMapWithExpectedSize(welfareData.size()); + Map> tempMap = new HashMap<>(); welfareData.forEach(map -> { - String key = String.valueOf(map.getOrDefault("employeeId", StringUtils.EMPTY)); + String key = map.getOrDefault("employeeId", StringUtils.EMPTY) + "_" + map.getOrDefault("taxAgentId", StringUtils.EMPTY); List formulaVarValues = tempMap.computeIfAbsent(key, k -> Lists.newArrayList()); formulaVarValues.addAll(fieldNames.stream().map(fieldName -> { String fieldId = SalaryFormulaReferenceEnum.WELFARE.getValue() @@ -489,7 +518,7 @@ public class CalculateFormulaVarBO { for (SalaryAcctEmployeePO salaryAcctEmployeePO : salaryAcctCalculateBO.getSalaryAcctEmployeePOS()) { List formulaVarValues = resultMap.computeIfAbsent(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId(), k -> Lists.newArrayList()); - formulaVarValues.addAll(tempMap.getOrDefault(String.valueOf(salaryAcctEmployeePO.getEmployeeId()), Collections.emptyList())); + formulaVarValues.addAll(tempMap.getOrDefault(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId(), Collections.emptyList())); } } @@ -586,8 +615,8 @@ public class CalculateFormulaVarBO { // 濉厖鍒拌繑鍥炵粨鏋滈泦涓 employeeMap.forEach((key, po) -> { // 鑾峰彇po鐨勭姸鎬 - if(po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) { - po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(po.getStatus(),"1")))); + if (po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) { + po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(po.getStatus(), "1")))); } List formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList()); Map map = JsonUtil.parseMap(po, String.class); diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java index d5155f0ae..d5399daab 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryacct.bo; +import cn.hutool.core.util.StrUtil; import com.engine.salary.constant.TaxDeclarationDataIndexConstant; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; @@ -73,6 +74,9 @@ public class SalaryAcctConsolidatedTaxBO { .filter(e -> Objects.equals(e.getSalaryItemId(), optional.get())) .map(e -> SalaryEntityUtil.empty2Zero(e.getResultValue())) .reduce(BigDecimal.ZERO, BigDecimal::add); + if (StrUtil.isBlank(resultValue)) { + resultValue = "0.00"; + } return new BigDecimal(resultValue).add(income).toPlainString(); } // 涓◣璋冨樊涓0 @@ -98,6 +102,9 @@ public class SalaryAcctConsolidatedTaxBO { .map(e -> SalaryEntityUtil.empty2Zero(e.getResultValue())) .reduce(BigDecimal.ZERO, BigDecimal::add); } + if (StrUtil.isBlank(resultValue)) { + resultValue = "0.00"; + } return new BigDecimal(resultValue).add(refundedOrSupplementedTax).subtract(taxAdjustment).toPlainString(); } return resultValue; diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index ad98f4ad7..408da743f 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -89,10 +89,11 @@ public class SalaryAcctRecordBO { btnList.add(new WeaTableOperate("閲嶆柊鏍哥畻", null, "4")); } } + String taxAgentName = salarySobPO.getTaxAgentIds().stream().map(id -> taxAgentMap.getOrDefault(id, "")).collect(Collectors.joining(",")); return SalaryAcctRecordListDTO.builder() .id(salaryAcctRecordPO.getId()) .salarySobName(Optional.ofNullable(salarySobPO).map(SalarySobPO::getName).orElse(StringUtils.EMPTY)) - .taxAgentName(taxAgentMap.get(Optional.ofNullable(salarySobPO).map(SalarySobPO::getTaxAgentId).orElse(0L))) + .taxAgentName(taxAgentName) .salaryMonth(SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()).toString()) .taxCycle(SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getTaxCycle()).toString()) .status(Optional.ofNullable(salaryAcctRecordStatusEnum) @@ -107,6 +108,7 @@ public class SalaryAcctRecordBO { .description(salaryAcctRecordPO.getDescription()) .approvalStatus(salaryAcctRecordPO.getApprovalStatus()) .operate(btnList) + .opts(salaryAcctRecordPO.getOpts()) .build(); }).collect(Collectors.toList()); } diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 778204ad1..2d66252fd 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -274,19 +274,24 @@ public class SalaryAcctResultBO { } SalaryI18nUtil.i18nList(salaryAcctEmployees); Map employeeMap = SalaryEntityUtil.convert2Map(simpleEmployees, DataCollectionEmployee::getEmployeeId); - Map> acctResultMap = SalaryEntityUtil.group2Map(salaryAccountingResults, SalaryAcctResultPO::getEmployeeId); Map taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName); - return salaryAcctEmployees.stream().map(e -> { - List acctResult = acctResultMap.getOrDefault(e.getEmployeeId(), Collections.emptyList()); + Map> taxAcctEmpsMap = SalaryEntityUtil.group2Map(salaryAcctEmployees, SalaryAcctEmployeePO::getTaxAgentId); + Map> taxAcctResultMap = SalaryEntityUtil.group2Map(salaryAccountingResults, SalaryAcctResultPO::getTaxAgentId); + + List> result = new ArrayList<>(); + for (Long taxAgentId : taxAcctEmpsMap.keySet()) { + Map> acctResultMap = SalaryEntityUtil.group2Map(taxAcctResultMap.get(taxAgentId), SalaryAcctResultPO::getEmployeeId); + List> collect = taxAcctEmpsMap.get(taxAgentId).stream().map(e -> { + List acctResult = acctResultMap.getOrDefault(e.getEmployeeId(), Collections.emptyList()); Map resultValueMap = SalaryEntityUtil.convert2Map(acctResult, SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getResultValue); Map resultFeedbackValueMap = SalaryEntityUtil.convert2Map(acctResult.stream().filter(result -> StringUtils.isNotBlank(result.getEkFeedback())).collect(Collectors.toList()), SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getEkFeedback); - // 钖祫椤圭洰鐨勫 - Map map = SalaryEntityUtil.convert2Map(salaryItems, o -> "" + o.getId(), o -> resultValueMap.getOrDefault(o.getId(), StringUtils.EMPTY)); - // 钖祫椤圭洰鐨勫瓧娈电被鍨嬶紙鍓嶇渚濇嵁杩欎釜鍒ゆ柇鏄惁闇瑕佸睍绀哄崈鍒嗕綅锛 - Map dataTypeMap = SalaryEntityUtil.convert2Map(salaryItems, salaryItemPO -> salaryItemPO.getId() + DATA_TYPE_SUFFIX, SalaryItemPO::getDataType); - // 钖祫椤圭洰鍙嶉淇℃伅鐨勫 + // 钖祫椤圭洰鐨勫 + Map map = SalaryEntityUtil.convert2Map(salaryItems, o -> "" + o.getId(), o -> resultValueMap.getOrDefault(o.getId(), StringUtils.EMPTY)); + // 钖祫椤圭洰鐨勫瓧娈电被鍨嬶紙鍓嶇渚濇嵁杩欎釜鍒ゆ柇鏄惁闇瑕佸睍绀哄崈鍒嗕綅锛 + Map dataTypeMap = SalaryEntityUtil.convert2Map(salaryItems, salaryItemPO -> salaryItemPO.getId() + DATA_TYPE_SUFFIX, SalaryItemPO::getDataType); + // 钖祫椤圭洰鍙嶉淇℃伅鐨勫 Map feedbackMap = new HashMap<>(); salaryItems.stream().forEach(item -> { String feedback = resultFeedbackValueMap.get(item.getId()); @@ -296,61 +301,64 @@ public class SalaryAcctResultBO { }); map.putAll(dataTypeMap); map.putAll(feedbackMap); - // 浜哄憳淇℃伅瀛楁鐨勫 - Map fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()), e, true); - for (SalarySobEmpFieldPO salarySobEmpField : salarySobEmpFields) { - // 鍛樺伐淇℃伅瀛楁鐨勫瓧娈电被鍨 - if (dynamicEmpInfo) { - map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode())); - } else { - if ("departmentName".equals(salarySobEmpField.getFieldCode())) { - map.put("departmentName", e.getDepartmentName()); - } else if ("departmentId".equals(salarySobEmpField.getFieldCode())) { - map.put("departmentId", e.getDepartmentId()); - } else if ("subcompanyName".equals(salarySobEmpField.getFieldCode())) { - map.put("subcompanyName", e.getSubcompanyName()); - }else if ("subcompanyId".equals(salarySobEmpField.getFieldCode())) { - map.put("subcompanyId", e.getSubcompanyId()); - } else if ("jobcall".equals(salarySobEmpField.getFieldCode())) { - map.put("jobcall", e.getJobcall()); - } else if ("jobcallId".equals(salarySobEmpField.getFieldCode())) { - map.put("jobcallId", e.getJobcallId()); - } else if ("jobtitleName".equals(salarySobEmpField.getFieldCode())) { - map.put("jobtitleName", e.getJobtitleName()); - } else if ("jobtitleId".equals(salarySobEmpField.getFieldCode())) { - map.put("jobtitleId", e.getJobtitleId()); - } else if ("status".equals(salarySobEmpField.getFieldCode())) { - map.put("status", e.getStatus()); - } else if ("statusName".equals(salarySobEmpField.getFieldCode())) { - map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(e.getStatus(), "1")))); - } else if ("accountType".equals(salarySobEmpField.getFieldCode())) { - map.put("accountType", e.getAccountType()); - } else if ("accountTypeName".equals(salarySobEmpField.getFieldCode())) { - map.put("accountTypeName", AccountTypeEnum.getDefaultLabelByValue(e.getAccountType())); - } else { + // 浜哄憳淇℃伅瀛楁鐨勫 + Map fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()), e, true); + for (SalarySobEmpFieldPO salarySobEmpField : salarySobEmpFields) { + // 鍛樺伐淇℃伅瀛楁鐨勫瓧娈电被鍨 + if (dynamicEmpInfo) { map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode())); + } else { + if ("departmentName".equals(salarySobEmpField.getFieldCode())) { + map.put("departmentName", e.getDepartmentName()); + } else if ("departmentId".equals(salarySobEmpField.getFieldCode())) { + map.put("departmentId", e.getDepartmentId()); + } else if ("subcompanyName".equals(salarySobEmpField.getFieldCode())) { + map.put("subcompanyName", e.getSubcompanyName()); + } else if ("subcompanyId".equals(salarySobEmpField.getFieldCode())) { + map.put("subcompanyId", e.getSubcompanyId()); + } else if ("jobcall".equals(salarySobEmpField.getFieldCode())) { + map.put("jobcall", e.getJobcall()); + } else if ("jobcallId".equals(salarySobEmpField.getFieldCode())) { + map.put("jobcallId", e.getJobcallId()); + } else if ("jobtitleName".equals(salarySobEmpField.getFieldCode())) { + map.put("jobtitleName", e.getJobtitleName()); + } else if ("jobtitleId".equals(salarySobEmpField.getFieldCode())) { + map.put("jobtitleId", e.getJobtitleId()); + } else if ("status".equals(salarySobEmpField.getFieldCode())) { + map.put("status", e.getStatus()); + } else if ("statusName".equals(salarySobEmpField.getFieldCode())) { + map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(e.getStatus(), "1")))); + } else if ("accountType".equals(salarySobEmpField.getFieldCode())) { + map.put("accountType", e.getAccountType()); + } else if ("accountTypeName".equals(salarySobEmpField.getFieldCode())) { + map.put("accountTypeName", AccountTypeEnum.getDefaultLabelByValue(e.getAccountType())); + } else { + map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode())); + } } + map.put(salarySobEmpField.getFieldCode() + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); } - map.put(salarySobEmpField.getFieldCode() + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); - } - // 涓婚敭id - map.put("id", e.getId()); - //閿佸畾鏁版嵁 - map.put("lockItems", e.getLockItems() != null ? e.getLockItems().stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toList()) : new ArrayList<>()); - //浜哄憳id - map.put("employeeId", e.getEmployeeId()); - // 涓◣鎵ｇ即涔夊姟浜 - String taxAgentName = taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY); - map.put("taxAgentName", taxAgentName); - // 鏄惁灞炰簬"鍚堝苟璁＄◣"鐨勬爣璁 - map.put("consolidatedTaxation", StringUtils.isNotEmpty(taxAgentName) && consolidatedTaxSalaryAcctEmpIds.contains(e.getId())); - // 涓◣鎵ｇ即涔夊姟浜虹殑瀛楁绫诲瀷 - map.put("taxAgentName" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); - // 鍏紡璇︽儏 - customParameters.putAll(customBackCalcParameters); - map.put("customParameters", customParameters); - return map; - }).collect(Collectors.toList()); + // 涓婚敭id + map.put("id", e.getId()); + //閿佸畾鏁版嵁 + map.put("lockItems", e.getLockItems() != null ? e.getLockItems().stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toList()) : new ArrayList<>()); + //浜哄憳id + map.put("employeeId", e.getEmployeeId()); + // 涓◣鎵ｇ即涔夊姟浜 + String taxAgentName = taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY); + map.put("taxAgentName", taxAgentName); + // 鏄惁灞炰簬"鍚堝苟璁＄◣"鐨勬爣璁 + map.put("consolidatedTaxation", StringUtils.isNotEmpty(taxAgentName) && consolidatedTaxSalaryAcctEmpIds.contains(e.getId())); + // 涓◣鎵ｇ即涔夊姟浜虹殑瀛楁绫诲瀷 + map.put("taxAgentName" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); + // 鍏紡璇︽儏 + customParameters.putAll(customBackCalcParameters); + map.put("customParameters", customParameters); + return map; + }).collect(Collectors.toList()); + result.addAll(collect); + } + return result; } /** diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java index edc4d99dd..e3d9b8fcc 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; +import java.util.Set; /** * 钖祫鏍哥畻鍒楄〃 @@ -21,29 +22,19 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -//@SalaryTable( -// value = { -// @SalaryTableOperate(index = 0, text = "鏍哥畻", labelId = 94146), -// @SalaryTableOperate(index = 1, text = "褰掓。", labelId = 92144), -// @SalaryTableOperate(index = 2, text = "鏌ョ湅", labelId = 90821, outer = false), -// @SalaryTableOperate(index = 3, text = "鍒犻櫎", labelId = 87061, outer = false), -// @SalaryTableOperate(index = 4, text = "鎿嶄綔鏃ュ織", labelId = 87775, outer = false), -// @SalaryTableOperate(index = 5, text = "閲嶆柊鏍哥畻", labelId = 98820) -// }, tableType = WeaTableTypeEnum.NONE, pageUid = "salaryAcctRecordList" -//) public class SalaryAcctRecordListDTO { //涓婚敭id private Long id; - @TableTitle(title = "涓◣鎵ｇ即涔夊姟浜", dataIndex = "taxAgentName", key = "taxAgentName") - private String taxAgentName; + @TableTitle(title = "钖祫鎵灞炴湀", dataIndex = "salaryMonth", key = "salaryMonth") + private String salaryMonth; @TableTitle(title = "钖祫璐﹀", dataIndex = "salarySobName", key = "salarySobName") private String salarySobName; - @TableTitle(title = "钖祫鎵灞炴湀", dataIndex = "salaryMonth", key = "salaryMonth") - private String salaryMonth; + @TableTitle(title = "涓◣鎵ｇ即涔夊姟浜", dataIndex = "taxAgentName", key = "taxAgentName") + private String taxAgentName; @TableTitle(title = "鏄惁鍥炵畻杩", dataIndex = "backCalcStatus", key = "backCalcStatus") private Integer backCalcStatus; @@ -78,4 +69,6 @@ public class SalaryAcctRecordListDTO { @TableTitle(title = "鎿嶄綔", dataIndex = "operate", key = "operate") private List operate; + + private Set opts; } diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java index 52c3b7f13..d07b79a6b 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java @@ -20,7 +20,7 @@ import java.util.Collection; @Builder @NoArgsConstructor @AllArgsConstructor -public class SalaryAcctCalculateParam { +public class SalaryAcctCalculateParam { //鏍哥畻浜哄憳鐨刬d,涓嶆槸employeeId鑰屾槸salaryAcctEmpId private Collection ids; diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java index b737f857e..8424aa765 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.YearMonth; +import java.util.List; /** * 钖祫鏍哥畻鍒楄〃鏌ヨ鍙傛暟 @@ -31,6 +32,11 @@ public class SalaryAcctRecordQueryParam extends BaseQueryParam { //璐﹀鍚嶇О") private String name; + /** + * 鎵ｇ即涔夊姟浜篿d闆嗗悎 + */ + private List taxAgentIds; + private String startMonthStr; private String endMonthStr; } diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java index e9d0a10bc..c456e80da 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salaryacct.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.I18n; import com.engine.salary.annotation.SalaryFormulaVar; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; @@ -29,6 +30,7 @@ import java.util.List; @AllArgsConstructor //hrsa_salary_acct_emp @ElogTransform(name = "钖祫鏍哥畻浜哄憳") +@Auth(page = "salaryAcct") public class SalaryAcctEmployeePO { /** diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java index c2b8fd33c..a17ecf398 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java @@ -1,7 +1,9 @@ package com.engine.salary.entity.salaryacct.po; -import com.engine.salary.common.LocalDateRange; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; +import com.engine.salary.common.LocalDateRange; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,6 +14,7 @@ import lombok.experimental.Accessors; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Set; /** * 钖祫鏍哥畻琛 @@ -28,6 +31,7 @@ import java.util.List; @Builder @ElogTransform( name = "钖祫鏍哥畻璁板綍" ) //hrsa_salary_acct_record +@Auth(page = "salaryAcct",checkType = AuthCheckTypeEnum.SOB) public class SalaryAcctRecordPO { /** @@ -121,6 +125,8 @@ public class SalaryAcctRecordPO { @ElogTransform( name = "鏇存柊鏃堕棿" ) private Date updateTime; + private Long taxAgentId; + /** * 瀹℃壒娴佺▼id */ @@ -137,6 +143,9 @@ public class SalaryAcctRecordPO { @Deprecated private List lockSalaryItemIds; + + private Set opts; + //鏌ヨ鏉′欢------------------------------- Collection ids; diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java index 4261d8da2..75b26f972 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java @@ -108,75 +108,6 @@ public class SalaryArchiveBO { LocalDateRange localDateRange, List allEmployeeIds, boolean isOnlyTaxAgent) { -// // 寮濮嬫棩鏈 -// Date start = localDateRange.getFromDate(); -// // 缁撴潫鏃ユ湡 -// Date end = localDateRange.getEndDate(); -// -// List list = new ArrayList<>(); -// allEmployeeIds.forEach(e -> { -// // 鍚屼竴涓汉鐨勬。妗堟暟鎹 -// List salaryArchives = salaryArchiveList.stream().filter(f -> f.getEmployeeId().equals(e)).collect(Collectors.toList()); -// List salaryArchiveIds = salaryArchives.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()); -// // 鍚屼竴涓汉鐨勮柂璧勯」鐩皟鏁村巻鍙叉暟鎹 -// List salaryArchiveItems = salaryArchiveItemDataList.stream().filter(d -> salaryArchiveIds.contains(d.getSalaryArchiveId())).collect(Collectors.toList()); -// List salaryArchiveItemIds = salaryArchiveItems.stream().map(SalaryArchiveItemPO::getSalaryItemId).distinct().collect(Collectors.toList()); -// -// SalaryArchiveDataDTO salaryArchiveData = new SalaryArchiveDataDTO(); -// salaryArchiveData.setEmployeeId(e); -// List taxAgents = new ArrayList<>(); -// // 鎸変釜绋庢墸缂翠箟鍔′汉鐢熸晥鏃ユ湡鏃堕棿娈靛垏鍓 -// for (SalaryArchivePO salaryArchive : salaryArchives) { -// Date fromDate = salaryArchive.getPayStartDate(); -// Date endDate = salaryArchive.getPayEndDate(); -// // 璧峰鍙戣柂鏃ヤ笉涓虹┖锛屼笖涓嶈兘姣旂粨鏉熸棩鏈熸櫄锛屾渶鍚庡彂钖棩鍙┖鍙笉绌猴紝浣嗘槸濡傛灉涓嶄负绌猴紝灏变笉鑳芥瘮寮濮嬫棩鏈熸棭锛屼笖璧峰鍙戣柂鏃ヤ笉鑳芥櫄浜庢渶鍚庡彂钖棩 -// boolean isEnable = fromDate != null && !fromDate.after(end) && (endDate == null || (!fromDate.after(endDate) && !endDate.before(start))); -// if (isEnable) { -// SalaryArchiveTaxAgentDataDTO taxAgent = new SalaryArchiveTaxAgentDataDTO(); -// taxAgent.setTaxAgentId(salaryArchive.getTaxAgentId()); -//// taxAgent.setIncomeCategory(salaryArchive.getIncomeCategory()); -// taxAgent.setEffectiveDateRange(LocalDateRange.builder().fromDate((fromDate.before(start) ? start : fromDate)).endDate(endDate == null || endDate.after(end) ? end : endDate).build()); -// // 钖祫椤圭洰鏁版嵁鎸変釜绋庢墸缂翠箟鍔′汉鍒囧壊 -// if (!isOnlyTaxAgent) { -// // 寮濮嬫棩鏈 -// Date startItem = taxAgent.getEffectiveDateRange().getFromDate(); -// // 缁撴潫鏃ユ湡 -// Date endItem = taxAgent.getEffectiveDateRange().getEndDate(); -// Date endTempItem = endItem; -// List salaryItemValues = new ArrayList<>(); -// for (Long salaryArchiveItemId : salaryArchiveItemIds) { -// for (SalaryArchiveItemPO salaryArchiveItem : salaryArchiveItems) { -// if (!salaryArchiveItemId.equals(salaryArchiveItem.getSalaryItemId()) || !salaryArchiveItem.getSalaryArchiveId().equals(salaryArchive.getId())) { -// continue; -// } -// Date fromDateItem = salaryArchiveItem.getEffectiveTime(); -// if (fromDateItem.after(endTempItem) || (!endTempItem.after(startItem) && !endTempItem.equals(startItem))) { -// continue; -// } -// SalaryArchiveItemDataDTO salaryArchiveItemData = new SalaryArchiveItemDataDTO(); -// salaryArchiveItemData.setEffectiveDateRange(LocalDateRange.builder().fromDate((fromDateItem.before(startItem) ? startItem : fromDateItem)).endDate(endTempItem).build()); -// //fixme 鎺掗櫎1鍙疯皟钖紝涔嬪墠鐨勫巻鍙插懆鏈熶负2022-01-01-2022-01-01杩欑鎯呭喌 -// if (!salaryArchiveItemData.getEffectiveDateRange().getFromDate().before(salaryArchiveItemData.getEffectiveDateRange().getEndDate())) { -// continue; -// } -// salaryArchiveItemData.setSalaryItemId(salaryArchiveItem.getSalaryItemId()); -// salaryArchiveItemData.setValue(salaryArchiveItem.getItemValue()); -// salaryItemValues.add(salaryArchiveItemData); -// endTempItem = fromDateItem; -// } -// endTempItem = endItem; -// } -// taxAgent.setSalaryItemValues(salaryItemValues); -// } -// taxAgents.add(taxAgent); -// } -// } -// salaryArchiveData.setTaxAgents(taxAgents); -// list.add(salaryArchiveData); -// }); -// -// return list; - // 寮濮嬫棩鏈 Date start = localDateRange.getFromDate(); diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java index 41b6050bb..fb69bb2df 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java @@ -1,7 +1,7 @@ package com.engine.salary.entity.salaryarchive.bo; +import cn.hutool.core.util.NumberUtil; import com.engine.core.impl.Service; -import com.engine.salary.constant.SalaryArchiveConstant; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveInitImportDTO; @@ -35,7 +35,6 @@ import weaver.hrm.User; import java.time.LocalDate; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -826,7 +825,7 @@ public class SalaryArchiveExcelBO extends Service { if (isEnable) { SalaryItemPO salaryItemPO = optionalSalaryItem.get(); // 鏁板肩被鍨嬪垽鏂 - boolean isNotNumber = salaryItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal); + boolean isNotNumber = salaryItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal); if (isNotNumber) { Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + key + numberErr); diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java index 7719f7c15..f25a6f588 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java @@ -1,10 +1,7 @@ package com.engine.salary.entity.salaryarchive.dto; import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.I18n; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableOperate; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** * 钖祫妗ｆ鍒楄〃 @@ -29,12 +27,14 @@ import java.util.Date; @SalaryTableOperate(index = "0", text = "缂栬緫"), @SalaryTableOperate(index = "1", text = "鍒犻櫎") }) +@Auth(page = "salaryArchive") public class SalaryArchiveListDTO { @TableTitle(title = "id", dataIndex = "id", key = "id") private Long id; @TableTitle(title = "浜哄憳淇℃伅琛ㄧ殑涓婚敭id", dataIndex = "employeeId", key = "employeeId") + @AuthField(fieldType = "employeeId") private Long employeeId; private Integer employeeType; @@ -51,6 +51,7 @@ public class SalaryArchiveListDTO { */ @TableTitle(title = "涓◣鎵ｇ即涔夊姟浜", dataIndex = "taxAgentName", key = "taxAgentName") private String taxAgentName; + @AuthField(fieldType = "taxAgentId") private Long taxAgentId; /** @@ -124,4 +125,6 @@ public class SalaryArchiveListDTO { //涓绘璐﹀彿 0/null锛氫富璐﹀彿 1锛氭璐﹀彿 private Integer accountType; + private Set opts; + } diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java index ede032ccb..db2b4cb2b 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salaryarchive.dto; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.annotation.I18n; import com.engine.salary.annotation.TableTitle; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -42,6 +43,7 @@ public class SalaryItemAdjustRecordListDTO { private String username; @TableTitle(title = "閮ㄩ棬", dataIndex = "departmentName", key = "departmentName") + @I18n private String departmentName; @TableTitle(title = "鍛樺伐鐘舵", dataIndex = "employeeStatus", key = "employeeStatus") @@ -66,6 +68,7 @@ public class SalaryItemAdjustRecordListDTO { private Date effectiveTime; @TableTitle(title = "鎿嶄綔浜", dataIndex = "operator", key = "operator") + @I18n private String operator; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java index a1762c54b..25ad7601a 100644 --- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java +++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salaryarchive.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveAddTypeEnum; @@ -14,6 +15,7 @@ import lombok.NoArgsConstructor; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Set; /** * 钖祫妗ｆ @@ -29,6 +31,7 @@ import java.util.List; @AllArgsConstructor //hrsa_salary_archive @ElogTransform(name = "钖祫妗ｆ") +@Auth(page = "salaryArchive") public class SalaryArchivePO { /** @@ -136,4 +139,6 @@ public class SalaryArchivePO { */ @JsonIgnore private List runStatusList; + + private Set opts; } diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java index e84a890ee..cf06eec07 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java @@ -2,18 +2,16 @@ package com.engine.salary.entity.salarysob.bo; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.salarysob.dto.SalarySobBasicFormDTO; -import com.engine.salary.entity.salarysob.dto.SalarySobListDTO; import com.engine.salary.entity.salarysob.param.SalarySobBasicSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.enums.SalaryCycleTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.util.SalaryI18nUtil; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Date; +import java.util.Objects; /** * 钖祫璐﹀ @@ -53,40 +51,17 @@ public class SalarySobBO { .updateTime(now) .deleteType(NumberUtils.INTEGER_ZERO) .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .taxAgentId(saveParam.getTaxAgentId()) + .taxAgentId(saveParam.getTaxAgentIds().get(0)) .build(); } - /** - * 钖祫璐﹀po杞崲鎴愬垪琛╠to - * - * @param salarySobs 钖祫璐﹀po - * @return - */ - public static List convert2ListDTO(Collection salarySobs,Map taxAgentIdTONameMap) { - if (CollectionUtils.isEmpty(salarySobs)) { - return Collections.emptyList(); - } - return salarySobs.stream() - .map(salarySobPO -> SalarySobListDTO.builder() - .id(salarySobPO.getId()) - .name(salarySobPO.getName()) - .taxAgentName(taxAgentIdTONameMap.get(salarySobPO.getTaxAgentId())) - .taxAgentId(salarySobPO.getTaxAgentId()) - .salaryCycle(buildSalaryCycle(salarySobPO)) - .disable(salarySobPO.getDisable()) - .description(salarySobPO.getDescription()) - .build()) - .collect(Collectors.toList()); - } - /** * 瑙ｆ瀽钖祫璐﹀鍒楄〃鐨勮柂璧勫懆鏈 * * @param salarySobPO * @return */ - private static String buildSalaryCycle(SalarySobPO salarySobPO) { + public static String buildSalaryCycle(SalarySobPO salarySobPO) { String salaryCycleStr; SalaryCycleTypeEnum salaryCycleTypeEnum = SalaryCycleTypeEnum.parseByValue(salarySobPO.getSalaryCycleType()); if (salaryCycleTypeEnum == null) { @@ -130,7 +105,7 @@ public class SalarySobBO { * @param salarySobPO 钖祫璐﹀po * @return */ - public static SalarySobBasicFormDTO convert2FormDTO(SalarySobBasicFormDTO basicForm,SalarySobPO salarySobPO) { + public static SalarySobBasicFormDTO convert2FormDTO(SalarySobBasicFormDTO basicForm, SalarySobPO salarySobPO) { return basicForm .setId(salarySobPO.getId()) .setName(salarySobPO.getName()) @@ -142,7 +117,7 @@ public class SalarySobBO { .setAttendCycleType(salarySobPO.getAttendCycleType()) .setAttendCycleFromDay(salarySobPO.getAttendCycleFromDay()) .setSocialSecurityCycleType(salarySobPO.getSocialSecurityCycleType()) - .setTaxAgentId(salarySobPO.getTaxAgentId()) + .setTaxAgentIds(salarySobPO.getTaxAgentIds()) .setDescription(salarySobPO.getDescription()); } diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java index b1a76a4a4..2daccbec2 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java @@ -144,7 +144,7 @@ public class SalarySobItemAggregateBO { .canEdit(openFormulaForcedEditing || Objects.equals(salaryItemPO.getCanEdit(), 1)) .canDelete(openFormulaForcedEditing || salaryItemPO.getCanDelete() == null || Objects.equals(salaryItemPO.getCanDelete(), 1)) .width(salaryItemPO.getWidth()) - .defaultValue(salaryItemPO.getDefaultValue()) + .defaultValue(salarySobItemPO.getDefaultValue()) .build()); } } diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java index 131668372..77b7221d7 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java @@ -30,16 +30,20 @@ import java.util.List; @AllArgsConstructor public class SalarySobBasicFormDTO { - //涓婚敭id") + //涓婚敭 @JsonSerialize(using = ToStringSerializer.class) private Long id; -// //钖祫璐﹀鐨勫悕绉") + /** + * 鍚嶇О + */ private String name; - private Long taxAgentId; -// private String taxAgentName; + /** + * 鎵ｇ即涔夊姟浜 + */ + private List taxAgentIds; /** * 钖祫绫诲瀷 diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java index cb100ef55..4d892d643 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java @@ -12,6 +12,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; +import java.util.Set; + /** * 钖祫璐﹀鍒楄〃 *

Copyright: Copyright (c) 2022

@@ -47,7 +50,7 @@ public class SalarySobListDTO { private String taxAgentName; // 涓◣鎵ｇ即涔夊姟浜篒D - private Long taxAgentId; + private List taxAgentIds; @SalaryTableColumn(text = "钖祫鍛ㄦ湡", width = "10%", column = "salaryCycle", transmethod = "com.engine.salary.transmethod.TransMethod.buildSalaryCycle", otherPara = "column:salaryCycleFromDay") @TableTitle(title = "钖祫鍛ㄦ湡", key = "salaryCycle", dataIndex = "salaryCycle") @@ -66,5 +69,5 @@ public class SalarySobListDTO { @SalaryTableColumn(text = "鎿嶄綔", width = "20%", column = "operate") @TableTitle(title = "鎿嶄綔", key = "operate", dataIndex = "operate") - private String operate; + private Set opts; } diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java index bd86de4d6..f8fcfd5fe 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java @@ -9,6 +9,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * 钖祫璐﹀淇濆瓨鍙傛暟 @@ -36,8 +38,7 @@ public class SalarySobBasicSaveParam { /** * 涓◣鎵ｇ即涔夊姟浜虹殑涓婚敭id */ - @DataCheck(require = true, message = "涓◣鎵ｇ即涔夊姟浜虹殑涓婚敭id涓嶅厑璁镐负绌") - private Long taxAgentId; + private List taxAgentIds; /** * 钖祫绫诲瀷涓嶅厑璁镐负绌 diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobDuplicateParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobDuplicateParam.java index 19e213fdc..3e5cb8da9 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobDuplicateParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobDuplicateParam.java @@ -3,6 +3,8 @@ package com.engine.salary.entity.salarysob.param; import com.engine.salary.util.valid.DataCheck; import lombok.Data; +import java.util.List; + /** * 钖祫璐﹀澶嶅埗鍙傛暟 *

Copyright: Copyright (c) 2022

@@ -27,9 +29,5 @@ public class SalarySobDuplicateParam { @DataCheck(require = true, max = 40, message = "鍚嶇О涓嶅厑璁镐负绌轰笖鍚嶇О涓嶈兘瓒呰繃40涓瓧绗﹂暱搴") private String name; - /** - * 涓◣鎵ｇ即涔夊姟浜篿d - */ - @DataCheck(require = true, message = "涓◣鎵ｇ即涔夊姟浜轰笉鍏佽涓虹┖") - private Long taxAgentId; + private List taxAgentIds; } diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java index e8811bf3f..e71a6e449 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java @@ -5,12 +5,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * @description: 钖祫璐﹀鍒楄〃鏌ヨ鍙傛暟 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 1/18/22 3:04 PM - * @version:v1.0 - */ + * 璐﹀鏌ヨ + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ @Data @EqualsAndHashCode(callSuper = true) public class SalarySobListQueryParam extends BaseQueryParam { diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java new file mode 100644 index 000000000..d0555321d --- /dev/null +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java @@ -0,0 +1,31 @@ +package com.engine.salary.entity.salarysob.param; + +import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.enums.auth.AuthFilterTypeEnum; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + + +@Data +@EqualsAndHashCode(callSuper = true) +public class SalarySobQueryParam extends BaseQueryParam { + + /** + * 鍚嶇О + */ + private String name; + + /** + * 鎵ｇ即涔夊姟浜篿d + */ + private Long taxAgentId; + + private List taxAgentIds; + + /** + * 鏁版嵁杩囨护绾у埆 + */ + private AuthFilterTypeEnum filterType; +} diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java index 231d6f866..a24fd7b06 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java @@ -1,6 +1,8 @@ package com.engine.salary.entity.salarysob.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.engine.salary.util.valid.Compare; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; @@ -13,6 +15,8 @@ import lombok.experimental.Accessors; import java.util.Collection; import java.util.Date; +import java.util.List; +import java.util.Set; /** * 钖祫甯愬琛 @@ -25,6 +29,7 @@ import java.util.Date; @ElogTransform( name="钖祫璐﹀" ) //hrsa_salary_sob @XStreamAlias("SalarySob") +@Auth(page = "salarySob",checkType = AuthCheckTypeEnum.SOB,sobIdField="id") public class SalarySobPO { /** @@ -50,8 +55,12 @@ public class SalarySobPO { @ElogTransform( name="涓◣鎵ｇ即涔夊姟浜篿d" ) @XStreamAlias("taxAgentId") @XStreamAsAttribute + @Deprecated private Long taxAgentId; + @XStreamOmitField + List taxAgentIds; + /** * 搴旂◣椤圭洰銆1:姝ｅ父宸ヨ祫钖噾鎵寰 */ @@ -172,6 +181,8 @@ public class SalarySobPO { private String tenantKey; Collection ids; - Collection taxAgentIds; + + + private Set opts; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/salarysob/po/SobTaxLinkPO.java b/src/com/engine/salary/entity/salarysob/po/SobTaxLinkPO.java new file mode 100644 index 000000000..de4a47135 --- /dev/null +++ b/src/com/engine/salary/entity/salarysob/po/SobTaxLinkPO.java @@ -0,0 +1,74 @@ +package com.engine.salary.entity.salarysob.po; + +import com.engine.hrmelog.annotation.ElogTransform; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * 鏁版嵁 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SobTaxLinkPO { + + @ElogTransform(name = "id") + private Long id; + + /** + * 璐﹀id + */ + @ElogTransform(name = "璐﹀id") + private Long sobId; + + /** + * 鎵ｇ即涔夊姟浜篿d + */ + @ElogTransform(name = "鎵ｇ即涔夊姟浜篿d") + private Long taxAgentId; + + + /** + * 鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎 + */ + @ElogTransform(name = "鏄惁宸插垹闄ゃ0锛氭湭鍒犻櫎銆1锛氬凡鍒犻櫎") + private Integer deleteType; + + + /** + * 鏇存柊鏃堕棿 + */ + @ElogTransform(name = "鏇存柊鏃堕棿") + private Date updateTime; + + /** + * 鍒涘缓鏃堕棿 + */ + @ElogTransform(name = "鍒涘缓鏃堕棿") + private Date createTime; + + /** + * 鍒涘缓浜 + */ + @ElogTransform(name = "鍒涘缓浜") + private Long creator; + + + /** + * 绉熸埛ID + */ + @ElogTransform(name = "绉熸埛ID") + private String tenantKey; + + //涓婚敭id闆嗗悎 + private Collection ids; + private List taxAgentIds; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java b/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java index 24570f54a..de493e128 100644 --- a/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java +++ b/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java @@ -59,6 +59,11 @@ public class PageListTemplateDTO { @TableTitle(title = "鑼冨洿",dataIndex = "limits",key = "limits") private String limits; + @TableTitle(title = "瀵煎嚭妯℃澘",dataIndex = "fileName",key = "fileName") + private String fileName; + private Integer fileId; + + /** * 闄愬埗 */ diff --git a/src/com/engine/salary/entity/setting/param/DownloadTemplateParam.java b/src/com/engine/salary/entity/setting/param/DownloadTemplateParam.java new file mode 100644 index 000000000..ee882d721 --- /dev/null +++ b/src/com/engine/salary/entity/setting/param/DownloadTemplateParam.java @@ -0,0 +1,24 @@ +package com.engine.salary.entity.setting.param; + +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DownloadTemplateParam { + + @DataCheck(require = true,message = "璇烽夋嫨琛ㄥご") + private List heads; + + @DataCheck(require = true,message = "璇烽夋嫨璁剧疆") + private List setting; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java b/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java index 1ef45247a..cde28fdf9 100644 --- a/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java +++ b/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java @@ -40,4 +40,9 @@ public class PageListTemplateSaveParam { */ @DataCheck(require = true,message = "璇烽夋嫨璁剧疆") private List setting; + + /** + * 瀵煎嚭妯℃澘id + */ + private Integer fileId; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java b/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java index 1b2f727b4..adebbf0e2 100644 --- a/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java +++ b/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; /** - * 钖祫甯愬琛 + * 椤甸潰妯℃澘琛 */ @Data @Builder @@ -64,6 +64,12 @@ public class PageListTemplatePO { @ElogTransform(name = "闄愬埗") private List limitIds; + /** + * excel妯℃澘鏂囦欢id + */ + @ElogTransform(name = "妯℃澘鏂囦欢id") + private Integer fileId; + /** * 绉熸埛ID */ diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java index 8aa28ab09..f2af2ac95 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java @@ -67,6 +67,7 @@ public class InsuranceAccountBO { .paymentOrganization(e.getPaymentOrganization() != null ? MapperProxyFactory.getProxy(TaxAgentMapper.class).getById(e.getPaymentOrganization()).getName() : "") .paymentOrganizationId(e.getPaymentOrganization()) .creator(e.getCreator()) + .opts(e.getOpts()) .build() ).collect(Collectors.toList()); } diff --git a/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountBatchListDTO.java b/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountBatchListDTO.java index 23afba707..28939613b 100644 --- a/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountBatchListDTO.java +++ b/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountBatchListDTO.java @@ -2,7 +2,6 @@ package com.engine.salary.entity.siaccount.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.SalaryTableOperate; import com.engine.salary.annotation.TableTitle; import lombok.AllArgsConstructor; @@ -10,6 +9,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + /** * @Author weaver_cl * @Description: 绂忓埄鍙拌处鍒楄〃 @@ -111,6 +112,8 @@ public class InsuranceAccountBatchListDTO { @TableTitle(title = "澶囨敞", dataIndex = "remarks", key = "remarks") private String remarks; + private Set opts; + diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java index 310bd8e17..5b610e6da 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java @@ -1,13 +1,16 @@ package com.engine.salary.entity.siaccount.po; -import com.engine.salary.annotation.Encrypt; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; +import com.engine.salary.annotation.Encrypt; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** @@ -22,6 +25,7 @@ import java.util.Date; @AllArgsConstructor //hrsa_bill_batch @ElogTransform(name = "绂忓埄鍙拌处涓昏〃") +@Auth(page = "siAccount", checkType = AuthCheckTypeEnum.TAX, taxAgentIdField = "paymentOrganization") public class InsuranceAccountBatchPO { /** @@ -138,4 +142,8 @@ public class InsuranceAccountBatchPO { private String jobcall; private Long jobcallId; private String status; + + + private Set opts; + } diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java index a0c2d57e8..97f88e52c 100644 --- a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java @@ -1,12 +1,15 @@ package com.engine.salary.entity.siarchives.dto; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** * @Author: sy @@ -17,6 +20,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor +@Auth(page = "siArchive", checkType = AuthCheckTypeEnum.TAX_EMP, taxAgentIdField = "paymentOrganization", employeeIdField = "employeeId") public class InsuranceArchivesBaseHistoryDTO { private Long id; @@ -94,4 +98,7 @@ public class InsuranceArchivesBaseHistoryDTO { private String operatorName; @TableTitle(title = "鎿嶄綔鏃堕棿", dataIndex = "operateTime", key = "operateTime") private Date operateTime; + + + private Set opts; } diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java index 7de87c044..fcd72acd7 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java @@ -1,6 +1,8 @@ package com.engine.salary.entity.siarchives.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import lombok.AllArgsConstructor; @@ -10,6 +12,7 @@ import lombok.NoArgsConstructor; import java.util.Collection; import java.util.Date; +import java.util.Set; /** * @Author: sy @@ -22,6 +25,7 @@ import java.util.Date; @AllArgsConstructor //hrsa_insurance_base_info @ElogTransform(name = "绂忓埄妗ｆ涓昏〃") +@Auth(page = "siArchive", checkType = AuthCheckTypeEnum.TAX_EMP, employeeIdField = "employeeId", taxAgentIdField = "paymentOrganization") public class InsuranceArchivesBaseInfoPO { /** * 涓婚敭id @@ -107,4 +111,7 @@ public class InsuranceArchivesBaseInfoPO { //---------鏉′欢------- private Collection ids; private Collection employeeIds; + + + private Set opts; } diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java index 2fb5297ce..9df1f4c3a 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java @@ -1,13 +1,16 @@ package com.engine.salary.entity.siarchives.po; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.I18n; import com.engine.salary.enums.UserStatusEnum; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.util.Set; /** * @Author weaver_cl @@ -19,6 +22,7 @@ import java.math.BigDecimal; @Builder @NoArgsConstructor @AllArgsConstructor +@Auth(page = "siArchive", checkType = AuthCheckTypeEnum.TAX_EMP, taxAgentIdField = "paymentOrganization", employeeIdField = "employeeId") public class InsuranceArchivesEmployeePO { private Long employeeId;//鍛樺伐id @@ -81,4 +85,6 @@ public class InsuranceArchivesEmployeePO { private Long fundId; private Long otherId; + + private Set opts; } diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java index caf20dca6..fa550a4dd 100644 --- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java +++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.taxagent.bo; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.agency.po.PaymentAgencyPO; +import com.engine.salary.entity.auth.po.AuthRolePO; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.hrm.DeptInfo; import com.engine.salary.entity.hrm.HrmStatus; @@ -83,44 +84,17 @@ public class TaxAgentBO { // String paymentAgency = SalaryI18nUtil.getI18nLabel(112448, "绀句繚绂忓埄浠ｇ即鏈烘瀯"); String description = SalaryI18nUtil.getI18nLabel(84961, "澶囨敞"); String sortedIndex = SalaryI18nUtil.getI18nLabel(84962, "鏄剧ず椤哄簭"); + + columns.add(new Column(name, "name", "name")); + columns.add(new Column(employeeRange, "employeeRange", "employeeRange")); if (isOpenDevolution) { - columns.add(new Column(name, "name", "name%")); - columns.add(new Column(employeeRange, "employeeRange", "employeeRange")); - columns.add(new Column(admins, "admins", "admins%")); -// columns.add(new Column(subAdmins, "subAdmins", "20%")); -// columns.add(new Column(paymentAgency, "paymentAgency", "30%")); - columns.add(new Column(description, "description", "name")); - columns.add(new Column(sortedIndex, "sortedIndex", "sortedIndex")); - } else { - columns.add(new Column(name, "name", "name")); - columns.add(new Column(employeeRange, "employeeRange", "employeeRange")); -// columns.add(new WeaTableColumn(paymentAgency, "paymentAgency", "30%")); - columns.add(new Column(description, "description", "description")); - columns.add(new Column(sortedIndex, "sortedIndex", "sortedIndex")); + columns.add(new Column(admins, "admins", "admins")); } + columns.add(new Column(description, "description", "description")); + columns.add(new Column(sortedIndex, "sortedIndex", "sortedIndex")); listPage.setColumns(columns); } -// private static List> getDefaultOperatesPermission(int operateSize, int recordSize) { -// List> permissionList = Lists.newArrayList(); -// for (int i = 0; i < recordSize; i++) { -// List permissions = Lists.newArrayList(); -// for (int j = 0; j < operateSize; j++) { -// permissions.add(new Permission(true, false)); -// } -// permissionList.add(permissions); -// } -// return permissionList; -// } -// -// private static List getDefaultCheckBoxPermission(int recordSize) { -// List permissionList = Lists.newArrayList(); -// for (int i = 0; i < recordSize; i++) { -// permissionList.add(new Permission(true, false)); -// } -// return permissionList; -// } - /** * 琛ㄦ暟鎹浆鍒楄〃鏁版嵁 * @@ -146,8 +120,8 @@ public class TaxAgentBO { * @param taxAgents * @return */ - public static List> convertToTableListDTO(List taxAgents, List paymentAgencyPOS, String setLabel) { - return convertToTableListDTO(Boolean.FALSE, taxAgents, paymentAgencyPOS, null, null, setLabel); + public static List> convertToTableListDTO(List taxAgents, List paymentAgencyPOS) { + return convertToTableListDTO(Boolean.FALSE, taxAgents, paymentAgencyPOS, null, null); } /** @@ -157,9 +131,8 @@ public class TaxAgentBO { * @return */ public static List> convertToTableListDTO(List taxAgents, List paymentAgencyPOS, List taxAgentAdmins, - List adminList, - String setLabel) { - return convertToTableListDTO(Boolean.TRUE, taxAgents, paymentAgencyPOS, taxAgentAdmins, adminList, setLabel); + List adminList) { + return convertToTableListDTO(Boolean.TRUE, taxAgents, paymentAgencyPOS, taxAgentAdmins, adminList); } /** @@ -171,7 +144,7 @@ public class TaxAgentBO { */ public static List> convertToTableListDTO(Boolean isDevolution, List taxAgents, List paymentAgencyPOS, List taxAgentAdmins, - List adminList, String setLabel) { + List adminList) { if (CollectionUtils.isEmpty(taxAgents)) { return Collections.emptyList(); } @@ -180,12 +153,13 @@ public class TaxAgentBO { Map map = new LinkedHashMap<>(); map.put("id", e.getId()); map.put("name", e.getName()); - map.put("employeeRange", setLabel); + map.put("employeeRange", "璁剧疆"); +// map.put("role", rolelistMap.getOrDefault(e.getId(), Collections.emptyList()).stream().map(AuthRolePO::getName).collect(Collectors.joining(","))); if (isDevolution) { List empIds = taxAgentAdmins.stream().filter(t -> t.getTaxAgentId().equals(e.getId())).map(TaxAgentAdminPO::getEmployeeId).collect(Collectors.toList()); List admins = adminList.stream().filter(a -> empIds.contains(a.getEmployeeId())).map(DataCollectionEmployee::getUsername).collect(Collectors.toList()); map.put("admins", CollectionUtils.isEmpty(admins) ? "" : Joiner.on(",").join((Iterable) admins)); - map.put("subAdmins", setLabel); + map.put("subAdmins", "璁剧疆"); } map.put("paymentAgency", buildPaymentAgency(e.getPaymentAgency(), paymentAgencyPOS)); map.put("description", e.getDescription()); @@ -441,7 +415,6 @@ public class TaxAgentBO { handleResult.getNeedInsertTaxAgentManageRanges().add(taxAgentManageRange); } } - return handleResult; } diff --git a/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java b/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java index 65b688baa..f84602b40 100644 --- a/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java +++ b/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java @@ -1,6 +1,8 @@ package com.engine.salary.entity.taxagent.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamOmitField; @@ -11,9 +13,10 @@ import lombok.NoArgsConstructor; import java.util.Collection; import java.util.Date; +import java.util.Set; /** - * 涓◣鎵ｇ即涔夊姟浜 + * 涓◣鎵ｇ即涔夊姟浜 hrsa_tax_agent *

Copyright: Copyright (c) 2022

*

Company: 娉涘井杞欢

* @@ -24,10 +27,9 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -//hrsa_tax_agent") -//涓◣鎵ｇ即涔夊姟浜鸿〃") @ElogTransform(name = "涓◣鎵ｇ即涔夊姟浜") @XStreamAlias("TaxAgent") +@Auth(page = "", checkType = AuthCheckTypeEnum.TAX,taxAgentIdField = "id") public class TaxAgentPO { /** @@ -109,4 +111,6 @@ public class TaxAgentPO { private Collection ids; + + Set opts; } diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index e9500c680..66aec4865 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -71,6 +71,7 @@ public class TaxDeclarationBO { .operateEmployeeName(employeeNameMap.getOrDefault(taxDeclarationPO.getCreator(), "")) .operateTime(SalaryDateUtil.getFormatLocalDateTime(taxDeclarationPO.getCreateTime())) .description(taxDeclarationPO.getDescription()) + .opts(taxDeclarationPO.getOpts()) .build(); }) .collect(Collectors.toList()); diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java index f52ce6a86..94e015dd6 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java @@ -13,6 +13,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.Set; /** * 涓◣鐢虫姤璁板綍鍒楄〃 @@ -37,6 +38,10 @@ public class TaxDeclarationListDTO { @TableTitle(title = "钖祫绫诲瀷", dataIndex = "incomeCategory", key = "incomeCategory") private String incomeCategory; + @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") + @TableTitle(title = "绋庢鎵灞炴湡", dataIndex = "taxCycle", key = "taxCycle") + private Date taxCycle; + @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") @TableTitle(title = "钖祫鎵灞炴湀", dataIndex = "salaryMonth", key = "salaryMonth") private Date salaryMonth; @@ -47,10 +52,6 @@ public class TaxDeclarationListDTO { @TableTitle(title = "涓◣鎵ｇ即涔夊姟浜", dataIndex = "taxAgentName", key = "taxAgentName") private String taxAgentName; - @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") - @TableTitle(title = "绋庢鎵灞炴湡", dataIndex = "taxCycle", key = "taxCycle") - private Date taxCycle; - //@TableTitle(title = "鎿嶄綔浜篿d", dataIndex = "operateEmployeeId", key = "operateEmployeeId") private Long operateEmployeeId; @@ -63,4 +64,7 @@ public class TaxDeclarationListDTO { @TableTitle(title = "澶囨敞", dataIndex = "description", key = "description") private String description; + + private Set opts; + } diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java index 521fadd56..a7de714a9 100644 --- a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java +++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java @@ -1,9 +1,14 @@ package com.engine.salary.entity.taxdeclaration.param; import com.engine.salary.common.BaseQueryParam; -import lombok.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; -import java.time.YearMonth; + +import java.util.Date; /** * 涓◣鐢虫姤璁板綍鏌ヨ鏉′欢 @@ -20,12 +25,13 @@ import java.time.YearMonth; public class TaxDeclarationListQueryParam extends BaseQueryParam { //钖祫鎵灞炴湀鑼冨洿璧风偣 - private YearMonth fromSalaryMonth; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date fromSalaryMonth; - //钖祫鎵灞炴湀鑼冨洿缁堢偣 - private YearMonth endSalaryMonth; + //钖祫鎵灞炴湀鑼冨洿缁堢偣 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endSalaryMonth; - private String fromSalaryMonthStr; - - private String endSalaryMonthStr; + //涓◣鎵ｇ即涔夊姟浜鸿彍鍗") + private String taxAgentName; } diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java index 18b8c28c8..8fffb93cc 100644 --- a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java +++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java @@ -1,11 +1,13 @@ package com.engine.salary.entity.taxdeclaration.param; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.time.YearMonth; +import java.util.Date; /** * 鐢熸垚涓◣鐢虫姤琛ㄥ弬鏁 @@ -42,4 +44,10 @@ public class TaxDeclarationSaveParam { private String description; private String salaryMonthStr; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date taxCycle; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date salaryDate; } diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java index 8319f9e4d..b667fb071 100644 --- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java +++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java @@ -1,6 +1,8 @@ package com.engine.salary.entity.taxdeclaration.po; +import com.engine.salary.annotation.Auth; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,6 +11,7 @@ import lombok.NoArgsConstructor; import java.util.Collection; import java.util.Date; +import java.util.Set; /** * 涓◣鐢虫姤璁板綍 @@ -23,6 +26,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_tax_declaration +@Auth(page = "taxDeclaration",checkType = AuthCheckTypeEnum.TAX) public class TaxDeclarationPO { /** @@ -86,6 +90,14 @@ public class TaxDeclarationPO { LocalDateRange salaryMonths; + //"寮濮嬫棩鏈 + private Date taxCycleFromDate; + + //缁撴潫鏃ユ湡 + private Date taxCycleEndDate; + + private Collection taxAgentIds; + private Set opts; } diff --git a/src/com/engine/salary/enums/auth/AuthCheckTypeEnum.java b/src/com/engine/salary/enums/auth/AuthCheckTypeEnum.java new file mode 100644 index 000000000..97538076c --- /dev/null +++ b/src/com/engine/salary/enums/auth/AuthCheckTypeEnum.java @@ -0,0 +1,59 @@ +package com.engine.salary.enums.auth; + +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.exception.SalaryRunTimeException; + +import java.util.Objects; + +/** + * 鏉冮檺楠岃瘉鏂瑰紡 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum AuthCheckTypeEnum implements BaseEnum { + + + TAX_EMP("TAX_EMP", "鎵ｇ即涔夊姟浜哄拰浜哄憳娣峰悎楠岃瘉", 87627), + EMP("EMP", "浜哄憳楠岃瘉", 87626), + TAX("TAX", "鎵ｇ即涔夊姟浜洪獙璇", 87626), + SOB("SOB", "璐﹀楠岃瘉", 87626); + + + private String value; + private String defaultLabel; + private int labelId; + + AuthCheckTypeEnum(String value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + + @Override + public String getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static AuthCheckTypeEnum parseByValue(String value) { + for (AuthCheckTypeEnum typeEnum : AuthCheckTypeEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java b/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java new file mode 100644 index 000000000..c9af4e243 --- /dev/null +++ b/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java @@ -0,0 +1,59 @@ +package com.engine.salary.enums.auth; + +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.exception.SalaryRunTimeException; + +import java.util.Objects; + +/** + * 鏉冮檺杩囨护 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum AuthFilterTypeEnum implements BaseEnum { + + DATA_OPT("DATA_OPT", "鏁版嵁&鍔熻兘鏉冮檺", 87626), + QUERY_DATA("QUERY_DATA", "鑾峰彇鍙煡璇㈡暟鎹", 87627), + ADMIN_DATA("ADMIN_DATA", "鑾峰彇鍙鐞嗘暟鎹", 87627), + NO_AUTH("ADMIN_DATA", "鑾峰彇鍙鐞嗘暟鎹", 87627); + + + + private String value; + private String defaultLabel; + private int labelId; + + AuthFilterTypeEnum(String value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + + @Override + public String getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static AuthFilterTypeEnum parseByValue(String value) { + for (AuthFilterTypeEnum typeEnum : AuthFilterTypeEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/auth/DataLinkEnum.java b/src/com/engine/salary/enums/auth/DataLinkEnum.java new file mode 100644 index 000000000..e99cbf9a6 --- /dev/null +++ b/src/com/engine/salary/enums/auth/DataLinkEnum.java @@ -0,0 +1,79 @@ +package com.engine.salary.enums.auth; + +import cn.hutool.core.collection.CollectionUtil; +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.exception.SalaryRunTimeException; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +/** + * 鎴栬呫佸苟涓斻佹帓闄 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum DataLinkEnum implements BaseEnum { + + + OR(1, "骞堕泦杩愮畻", 87627) { + @Override + public Set calculation(Collection coll1, Collection coll2) { + return new HashSet<>(CollectionUtil.union(coll1, coll2)); + } + }, + AND(2, "浜ら泦杩愮畻", 87626) { + @Override + public Set calculation(Collection coll1, Collection coll2) { + return new HashSet<>(CollectionUtil.intersection(coll1, coll2)); + } + }, + NOT_IN(3, "琛ラ泦杩愮畻", 87626) { + @Override + public Set calculation(Collection coll1, Collection coll2) { + return new HashSet<>(CollectionUtil.disjunction(coll1, coll2)); + } + }; + + + private Integer value; + private String defaultLabel; + private int labelId; + + DataLinkEnum(Integer value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + public abstract Set calculation(Collection coll1, Collection coll2); + + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static DataLinkEnum parseByValue(int value) { + for (DataLinkEnum typeEnum : DataLinkEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java b/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java new file mode 100644 index 000000000..056b42fd4 --- /dev/null +++ b/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java @@ -0,0 +1,176 @@ +package com.engine.salary.enums.auth; + +import com.engine.common.service.HrmCommonService; +import com.engine.common.service.impl.HrmCommonServiceImpl; +import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.taxagent.po.TaxAgentEmpPO; +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; +import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import com.engine.salary.service.impl.TaxAgentEmpServiceImpl; +import com.engine.salary.util.SalaryEntityUtil; +import com.google.common.collect.Lists; +import weaver.conn.RecordSet; + +import java.util.*; + +/** + * 瀵硅薄绫诲瀷锛1锛氫汉鍛樸2锛氶儴闂ㄣ3锛氬矖浣嶃4锛氬垎閮ㄣ5锛氳鑹层6锛氬畨鍏ㄧ骇鍒 銆7锛氭墍鏈変汉 銆8锛氱櫥褰曚汉銆9锛氳处濂椼10锛歴ql + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum DataTargetTypeEnum implements BaseEnum { + + + EMP(1, "浜哄憳", 87627) { + @Override + public Set getEmpIds(String target, Object... param) { + Set list = new HashSet<>(); + list.add(Long.valueOf(target)); + return list; + } + }, + DEPARTMENT(2, "閮ㄩ棬", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return new HashSet<>(salaryEmployeeService.listByDepartment(Collections.singletonList(Long.valueOf(target)))); + } + }, + JOB(3, "宀椾綅", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return new HashSet<>(salaryEmployeeService.listByJob(Collections.singletonList(Long.valueOf(target)))); + } + }, + SUB_COMPANY(4, "鍒嗛儴", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return new HashSet<>(salaryEmployeeService.listBySubCompany(Collections.singletonList(Long.valueOf(target)))); + } + }, + ROLE(5, "瑙掕壊", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + HrmCommonService hrmCommonService = new HrmCommonServiceImpl(); + Set memberList = new HashSet<>(); + List ids = hrmCommonService.getRoleMembers(target, "2"); + ids.forEach(id -> memberList.add(Long.parseLong(id.toString()))); + return memberList; + } + }, + LEVEL(6, "瀹夊叏绾у埆", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + String[] split = target.split("-"); + int minLevel = split[0] == null ? 0 : Integer.parseInt(split[0]); + int maxLevel = split[1] == null ? 100 : Integer.parseInt(split[1]); + Set memberList = new HashSet<>(); + RecordSet rs = new RecordSet(); + if (rs.execute("select id from hrmresource where level between " + minLevel + " and " + maxLevel + " and status not in (7) and (accounttype is null or accounttype = 0) ")) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + return memberList; + } + }, +// ALL(7, "鎵鏈変汉", 87626) { +// @Override +// public Set getEmpIds(String target, Object... param) { +// Set memberList = new HashSet<>(); +// RecordSet rs = new RecordSet(); +// if (rs.execute("select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) ")) { +// while (rs.next()) { +// memberList.add(Long.parseLong(rs.getString("id"))); +// } +// } +// return memberList; +// } +// }, +// LOGIN_PERSON(8, "鐧诲綍浜", 87626) { +// //鍙傛暟1锛岀櫥褰曚汉淇℃伅 +// @Override +// public Set getEmpIds(String target, Object... param) { +// LoginPersonTargetTypeEnum loginPersonTargetTypeEnum = LoginPersonTargetTypeEnum.parseByValue(Integer.parseInt(target)); +// return loginPersonTargetTypeEnum.getEmpIds((DataCollectionEmployee) param[0]); +// } +// }, + SOB(9, "璐﹀", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + List employeeList = salaryEmployeeService.listBySalarySobId(Long.valueOf(target),true); + return SalaryEntityUtil.properties(employeeList, DataCollectionEmployee::getEmployeeId); + } + }, + TAX(10, "鎵ｇ即涔夊姟浜", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + TaxAgentEmpServiceImpl taxAgentEmpServiceImpl = new TaxAgentEmpServiceImpl(); + List taxIds = Lists.newArrayList(Long.valueOf(target)); + List taxAgentEmpPOS = taxAgentEmpServiceImpl.listByTaxAgentIds(taxIds, UseEmployeeTypeEnum.ORG); + return SalaryEntityUtil.properties(taxAgentEmpPOS, TaxAgentEmpPO::getEmployeeId); + } + }, + SQL(11, "SQL", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + //鍙傛暟1锛岀櫥褰曚汉淇℃伅 +// DataCollectionEmployee employee = (DataCollectionEmployee) param[0]; +// target = target.replaceAll("$uid$", Util.null2String(employee.getEmployeeId())); + Set memberList = new HashSet<>(); + RecordSet rs = new RecordSet(); + if (rs.execute(target)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + return memberList; + } + }; + + + private Integer value; + private String defaultLabel; + private int labelId; + + DataTargetTypeEnum(Integer value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + public abstract Set getEmpIds(String target, Object... param); + + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static DataTargetTypeEnum parseByValue(int value) { + for (DataTargetTypeEnum typeEnum : DataTargetTypeEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/auth/LoginPersonTargetTypeEnum.java b/src/com/engine/salary/enums/auth/LoginPersonTargetTypeEnum.java new file mode 100644 index 000000000..75c97749e --- /dev/null +++ b/src/com/engine/salary/enums/auth/LoginPersonTargetTypeEnum.java @@ -0,0 +1,123 @@ +package com.engine.salary.enums.auth; + +import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.exception.SalaryRunTimeException; +import weaver.conn.RecordSet; + +import java.util.*; + +/** + * 鐧诲綍浜轰俊鎭被鍨 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum LoginPersonTargetTypeEnum implements BaseEnum { + + + self(1, "鏈汉", 87627) { + @Override + public Set getEmpIds(DataCollectionEmployee employee) { + Set memberList = new HashSet<>(); + memberList.add(employee.getEmployeeId()); + return memberList; + } + }, + SUBORDINATE(2, "涓嬪睘", 87626) { + @Override + public Set getEmpIds(DataCollectionEmployee employee) { + String sql = "select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) and managerstr like '%," + employee.getEmployeeId() + ",%' and "; + Set memberList = new HashSet<>(); + RecordSet rs = new RecordSet(); + if (rs.execute(sql)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + return memberList; + } + }, + DEPARTMENT(3, "鏈儴闂", 87626) { + @Override + public Set getEmpIds(DataCollectionEmployee employee) { + String sql = "select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) and departmentid =" + employee.getDepartmentId(); + Set memberList = new HashSet<>(); + RecordSet rs = new RecordSet(); + if (rs.execute(sql)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + return memberList; + } + }, + SUB_COMPANY(4, "鏈垎閮", 87626) { + @Override + public Set getEmpIds(DataCollectionEmployee employee) { + String sql = "select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) and subcompanyid1 =" + employee.getSubcompanyid(); + Set memberList = new HashSet<>(); + RecordSet rs = new RecordSet(); + if (rs.execute(sql)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + return memberList; + } + }, + JOB(5, "鏈矖浣", 87626) { + @Override + public Set getEmpIds(DataCollectionEmployee employee) { + String sql = "select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) and jobtitle =" + employee.getJobtitleId(); + Set memberList = new HashSet<>(); + RecordSet rs = new RecordSet(); + if (rs.execute(sql)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + return memberList; + } + }; + + + private Integer value; + private String defaultLabel; + private int labelId; + + LoginPersonTargetTypeEnum(Integer value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + public abstract Set getEmpIds(DataCollectionEmployee employee); + + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static LoginPersonTargetTypeEnum parseByValue(int value) { + for (LoginPersonTargetTypeEnum typeEnum : LoginPersonTargetTypeEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/auth/MemberTargetTypeEnum.java b/src/com/engine/salary/enums/auth/MemberTargetTypeEnum.java new file mode 100644 index 000000000..9c02cfef6 --- /dev/null +++ b/src/com/engine/salary/enums/auth/MemberTargetTypeEnum.java @@ -0,0 +1,121 @@ +package com.engine.salary.enums.auth; + +import com.engine.common.service.HrmCommonService; +import com.engine.common.service.impl.HrmCommonServiceImpl; +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import weaver.conn.RecordSet; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 鎴愬憳绫诲瀷锛1锛氫汉鍛樸2锛氶儴闂ㄣ3锛氬矖浣嶃4锛氬垎閮ㄣ5锛氳鑹层6锛歴ql + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum MemberTargetTypeEnum implements BaseEnum { + + + EMP(1, "浜哄憳", 87627) { + @Override + public List getEmpIds(Set targets) { + return targets.stream().map(Long::valueOf).collect(Collectors.toList()); + } + }, + DEPARTMENT(2, "閮ㄩ棬", 87626) { + @Override + public List getEmpIds(Set targets) { + List deptIds = targets.stream().map(Long::valueOf).collect(Collectors.toList()); + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return salaryEmployeeService.listByDepartment(deptIds); + } + }, + JOB(3, "宀椾綅", 87626) { + @Override + public List getEmpIds(Set targets) { + List ids = targets.stream().map(Long::valueOf).collect(Collectors.toList()); + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return salaryEmployeeService.listByJob(ids); + } + }, + SUB_COMPANY(4, "鍒嗛儴", 87626) { + @Override + public List getEmpIds(Set targets) { + List ids = targets.stream().map(Long::valueOf).collect(Collectors.toList()); + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return salaryEmployeeService.listBySubCompany(ids); + } + }, + ROLE(5, "瑙掕壊", 87626) { + @Override + public List getEmpIds(Set targets) { + HrmCommonService hrmCommonService = new HrmCommonServiceImpl(); + List memberList = new ArrayList<>(); + targets.forEach(roleId -> { + memberList.addAll(hrmCommonService.getRoleMembers(roleId, "2")); + }); + return memberList.stream().map(id -> Long.parseLong(id.toString())).collect(Collectors.toList()); + } + }, + SQL(6, "sql", 87626) { + @Override + public List getEmpIds(Set targets) { + List memberList = new ArrayList<>(); + targets.forEach(sql -> { + RecordSet rs = new RecordSet(); + if (rs.execute(sql)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + }); + return memberList; + } + }; + + + private Integer value; + private String defaultLabel; + private int labelId; + + MemberTargetTypeEnum(Integer value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + public abstract List getEmpIds(Set targets); + + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static MemberTargetTypeEnum parseByValue(int value) { + for (MemberTargetTypeEnum typeEnum : MemberTargetTypeEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/auth/ResourceTargetTypeEnum.java b/src/com/engine/salary/enums/auth/ResourceTargetTypeEnum.java new file mode 100644 index 000000000..d4bfc372d --- /dev/null +++ b/src/com/engine/salary/enums/auth/ResourceTargetTypeEnum.java @@ -0,0 +1,75 @@ +package com.engine.salary.enums.auth; + +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; + +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 璧勬簮绫诲瀷锛1锛氭墸缂翠箟鍔′汉 2锛氳处濂 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum ResourceTargetTypeEnum implements BaseEnum { + + + TAX_AGENT(1, "鎵ｇ即涔夊姟浜", 87627) { + @Override + public List getEmpIds(Set targets) { + return targets.stream().map(Long::valueOf).collect(Collectors.toList()); + } + }, + SOB(2, "璐﹀", 87626) { + @Override + public List getEmpIds(Set targets) { + List deptIds = targets.stream().map(Long::valueOf).collect(Collectors.toList()); + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return salaryEmployeeService.listByDepartment(deptIds); + } + }; + + + private Integer value; + private String defaultLabel; + private int labelId; + + ResourceTargetTypeEnum(Integer value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + public abstract List getEmpIds(Set targets); + + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static ResourceTargetTypeEnum parseByValue(int value) { + for (ResourceTargetTypeEnum typeEnum : ResourceTargetTypeEnum.values()) { + if (Objects.equals(typeEnum.getValue(), value)) { + return typeEnum; + } + } + throw new SalaryRunTimeException("鏈壘鍒板搴旂殑鏋氫妇"); + } +} diff --git a/src/com/engine/salary/enums/push/PushItemFieldEnum.java b/src/com/engine/salary/enums/push/PushItemFieldEnum.java new file mode 100644 index 000000000..375e21823 --- /dev/null +++ b/src/com/engine/salary/enums/push/PushItemFieldEnum.java @@ -0,0 +1,125 @@ +package com.engine.salary.enums.push; + +import cn.hutool.core.util.NumberUtil; +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryDateUtil; +import org.apache.commons.lang3.StringUtils; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Objects; + +import static com.engine.salary.util.SalaryDateUtil.DATE_FORMATTER_PATTERN; + +/** + * 鎺ㄩ佹暟鎹潵婧 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum PushItemFieldEnum implements BaseEnum { + + NUMBER(1, "鏁板", 87625) { + @Override + public Object convertValue(String value) { + if (NumberUtil.isNumber(value)) { + return new BigDecimal(value).toPlainString(); + } + return "null"; + } + }, + TEXT(2, "鏂囨湰", 85393) { + @Override + public Object convertValue(String value) { + return String.format("'%s'",value); + } + }, + // DATE(3, "鏃ユ湡", 85393) { +// @Override +// public Object convertValue(String value) { +// +// //to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss') +// return value; +// } +// }, + YEAR(4, "鏃ユ湡鏂囨湰-骞", 85393) { + @Override + public Object convertValue(String value) { + if (StringUtils.isNotBlank(value) && SalaryDateUtil.parse(value, DATE_FORMATTER_PATTERN) != null) { + value = value.substring(0, 4); + } + return String.format("'%s'",value); + } + }, + YEAR_MONTH(5, "鏃ユ湡鏂囨湰-骞存湀", 85393) { + @Override + public Object convertValue(String value) { + if (StringUtils.isNotBlank(value) && SalaryDateUtil.parse(value, DATE_FORMATTER_PATTERN) != null) { + value = value.substring(0, 7); + } + return String.format("'%s'",value); + } + }, + YEAR_MONTH_DAY(6, "鏃ユ湡鏂囨湰-骞存湀鏃", 85393) { + @Override + public Object convertValue(String value) { + if (StringUtils.isNotBlank(value) && SalaryDateUtil.parse(value, DATE_FORMATTER_PATTERN) != null) { + value = value.substring(0, 10); + } + return String.format("'%s'",value); + } + }; + + private int value; + + private String defaultLabel; + + private int labelId; + + PushItemFieldEnum(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public abstract Object convertValue(String value); + + public static PushItemFieldEnum parseByValue(int value) { + for (PushItemFieldEnum salaryDataSourceEnum : PushItemFieldEnum.values()) { + if (Objects.equals(salaryDataSourceEnum.getValue(), value)) { + return salaryDataSourceEnum; + } + } + return TEXT; + } + + public static String getDefaultLabelByValue(Integer value) { + if (value == null) { + return ""; + } + PushItemFieldEnum[] enumAry = PushItemFieldEnum.values(); + for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { + if (enumAry[i].getValue().equals(value)) { + return enumAry[i].getDefaultLabel(); + } + } + return ""; + } +} diff --git a/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java new file mode 100644 index 000000000..c2d677d42 --- /dev/null +++ b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java @@ -0,0 +1,71 @@ +package com.engine.salary.enums.push; + +import com.engine.salary.enums.BaseEnum; + +import java.util.Arrays; +import java.util.Objects; + +/** + * 鎺ㄩ佽褰曠姸鎬 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum PushRecordDetailStatusEnum implements BaseEnum { + PREPARE(0, "寰呮帹閫", 87625), + SUCCESS(1, "鎺ㄩ佹垚鍔", 85393), + FAIL(2, "鎺ㄩ佸け璐", 85393), + WITHDRAW_SUCCESS(3, "宸叉挙鍥", 85393), + WITHDRAW_FAIL(4, "鎾ゅ洖澶辫触", 85393); + + private int value; + + private String defaultLabel; + + private int labelId; + + PushRecordDetailStatusEnum(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static PushRecordDetailStatusEnum parseByValue(int value) { + for (PushRecordDetailStatusEnum salaryDataSourceEnum : PushRecordDetailStatusEnum.values()) { + if (Objects.equals(salaryDataSourceEnum.getValue(), value)) { + return salaryDataSourceEnum; + } + } + return PREPARE; + } + + public static String getDefaultLabelByValue(Integer value) { + if (value == null) { + return ""; + } + PushRecordDetailStatusEnum[] enumAry = PushRecordDetailStatusEnum.values(); + for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { + if (enumAry[i].getValue().equals(value)) { + return enumAry[i].getDefaultLabel(); + } + } + return ""; + } +} diff --git a/src/com/engine/salary/enums/push/PushRecordStatusEnum.java b/src/com/engine/salary/enums/push/PushRecordStatusEnum.java new file mode 100644 index 000000000..3e3ea14c4 --- /dev/null +++ b/src/com/engine/salary/enums/push/PushRecordStatusEnum.java @@ -0,0 +1,74 @@ +package com.engine.salary.enums.push; + +import com.engine.salary.enums.BaseEnum; + +import java.util.Arrays; +import java.util.Objects; + +/** + * 鎺ㄩ佽褰曠姸鎬 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum PushRecordStatusEnum implements BaseEnum { + DATA_PREPARE(0, "鍑嗗涓", 87625), + DATA_FINISH(1, "鍑嗗瀹屾瘯", 87625), + RUN_PROGRESS(2, "鎺ㄩ佷腑", 85393), + RUN_SUCCESS(3, "鎺ㄩ佹垚鍔", 85393), + RUN_FAIL(4, "鎺ㄩ佸け璐", 85393), + WITHDRAW(5, "鎾ゅ洖涓", 85393), + WITHDRAW_SUCCESS(6, "宸叉挙鍥", 85393), + WITHDRAW_FAIL(7, "鎾ゅ洖澶辫触", 85393); + + private int value; + + private String defaultLabel; + + private int labelId; + + PushRecordStatusEnum(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static PushRecordStatusEnum parseByValue(int value) { + for (PushRecordStatusEnum salaryDataSourceEnum : PushRecordStatusEnum.values()) { + if (Objects.equals(salaryDataSourceEnum.getValue(), value)) { + return salaryDataSourceEnum; + } + } + return DATA_PREPARE; + } + + public static String getDefaultLabelByValue(Integer value) { + if (value == null) { + return ""; + } + PushRecordStatusEnum[] enumAry = PushRecordStatusEnum.values(); + for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { + if (enumAry[i].getValue().equals(value)) { + return enumAry[i].getDefaultLabel(); + } + } + return ""; + } +} diff --git a/src/com/engine/salary/enums/push/PushRecordTypeEnum.java b/src/com/engine/salary/enums/push/PushRecordTypeEnum.java new file mode 100644 index 000000000..9fc79f308 --- /dev/null +++ b/src/com/engine/salary/enums/push/PushRecordTypeEnum.java @@ -0,0 +1,68 @@ +package com.engine.salary.enums.push; + +import com.engine.salary.enums.BaseEnum; + +import java.util.Arrays; +import java.util.Objects; + +/** + * 鎺ㄩ佽褰曠姸鎬 + *

Copyright: Copyright (c) 2024

+ *

Company: 娉涘井杞欢

+ * + * @author qiantao + * @version 1.0 + **/ +public enum PushRecordTypeEnum implements BaseEnum { + PUSH(0, "鎺ㄩ", 85393), + WITHDRAW(1, "鎾ゅ洖", 85393); + + private int value; + + private String defaultLabel; + + private int labelId; + + PushRecordTypeEnum(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + @Override + public Integer getValue() { + return value; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + public static PushRecordTypeEnum parseByValue(int value) { + for (PushRecordTypeEnum salaryDataSourceEnum : PushRecordTypeEnum.values()) { + if (Objects.equals(salaryDataSourceEnum.getValue(), value)) { + return salaryDataSourceEnum; + } + } + return null; + } + + public static String getDefaultLabelByValue(Integer value) { + if (value == null) { + return ""; + } + PushRecordTypeEnum[] enumAry = PushRecordTypeEnum.values(); + for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { + if (enumAry[i].getValue().equals(value)) { + return enumAry[i].getDefaultLabel(); + } + } + return ""; + } +} diff --git a/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java b/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java index da3b76213..eafb0e32e 100644 --- a/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java +++ b/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java @@ -17,6 +17,7 @@ public enum SalaryFormulaReferenceEnum implements BaseEnum { SALARY_ITEM("salaryItem", "钖祫椤圭洰", 84960), // SALARY_ITEM_OF_HISTORY("salaryItemOfHistory", "鍘嗗彶鍙拌处钖祫椤圭洰", 85364), + LAST_MONTH_CALC("lastMonthCalc", "涓婃湀鏍哥畻", 257728), EMPLOYEE_INFO("employeeInfo", "鍛樺伐鍩烘湰淇℃伅", 85366), SALARY_ARCHIVES("salaryArchives", "钖祫妗ｆ", 85368), ATTEND("attend", "鑰冨嫟寮曠敤", 85367), diff --git a/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java b/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java index 79a99b1f9..72d3e6dfe 100644 --- a/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java +++ b/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java @@ -52,6 +52,6 @@ public enum SalarySQLReferenceEnum implements BaseEnum { return referenceEnum; } } - return null; + return EMPLOYEE_INFO; } } diff --git a/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java b/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java index c65d02559..8a9ca719a 100644 --- a/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java +++ b/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java @@ -54,7 +54,7 @@ public class AddUpSituationManager extends Service { // 璋冪敤鐢熸垚鐢虫姤鍗曟帴鍙 YearMonth yearMonth = YearMonth.of(localDate.getYear(), localDate.getMonth()); try { - getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).taxAgentId(po.getTaxAgentId()).build()); + getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).salaryDate(po.getSalaryMonth()).taxCycle(po.getTaxCycle()).taxAgentId(po.getTaxAgentId()).build()); } catch (Exception e) { bb.writeLog("閿欒:" + e); result = false; diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 833128372..17229b2e9 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -117,7 +117,7 @@ LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t.delete_type = 0 - and t.employee_type is null + and (t.employee_type is null or t.employee_type = 0) and e.status not in (7) @@ -221,7 +221,7 @@ LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t.delete_type = 0 - and t.employee_type is null + and (t.employee_type is null or t.employee_type = 0) and e.status not in (7) @@ -322,7 +322,7 @@ LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t.delete_type = 0 - and t.employee_type is null + and (t.employee_type is null or t.employee_type = 0) and e.status not in (7) diff --git a/src/com/engine/salary/mapper/auth/AuthDataMapper.java b/src/com/engine/salary/mapper/auth/AuthDataMapper.java new file mode 100644 index 000000000..fde50bd66 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthDataMapper.java @@ -0,0 +1,79 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.po.AuthDataPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthDataMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthDataPO authData); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthDataPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authData 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthDataPO authData); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authData 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthDataPO authData); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authData 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthDataPO authData); + + /** + * 鍒犻櫎璁板綍 + * + * @param authData 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthDataPO authData); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + + /** + * 鏍规嵁瑙掕壊id鍒犻櫎 + * @param roleId roleId + */ + void deleteByRoleId(Long roleId); +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthDataMapper.xml b/src/com/engine/salary/mapper/auth/AuthDataMapper.xml new file mode 100644 index 000000000..b63821cba --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthDataMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + t + . + id + , t.role_id + , t.link + , t.target_type + , t.target + , t.target_name + , t.sorted_index + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_data + + + + id, + + + role_id, + + + link, + + + target_type, + + + target, + + + target_name, + + + sorted_index, + + + creator, + + + create_time, + + + update_time, + + + delete_type, + + + tenant_key, + + + + + #{id}, + + + #{roleId}, + + + #{link}, + + + #{targetType}, + + + #{target}, + + + #{targetName}, + + + #{sortedIndex}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + #{deleteType}, + + + #{tenantKey}, + + + + + + + UPDATE hrsa_auth_data + + role_id=#{roleId}, + link=#{link}, + target_type=#{targetType}, + target=#{target}, + target_name=#{targetName}, + sorted_index=#{sortedIndex}, + creator=#{creator}, + create_time=#{createTime}, + update_time=#{updateTime}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_data + + + role_id=#{roleId}, + + + link=#{link}, + + + target_type=#{targetType}, + + + target=#{target}, + + + target_name=#{targetName}, + + + sorted_index=#{sortedIndex}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_data + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_auth_data + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + UPDATE hrsa_auth_data + SET delete_type = 1 + WHERE delete_type = 0 + AND role_id=#{roleId} + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthMapper.java b/src/com/engine/salary/mapper/auth/AuthMapper.java new file mode 100644 index 000000000..70533cafa --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthMapper.java @@ -0,0 +1,27 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.dto.AuthTreeDTO; +import com.engine.salary.entity.auth.dto.SobOptAuth; +import com.engine.salary.entity.auth.dto.TaxEmpOptAuth; +import com.engine.salary.entity.auth.dto.TaxOptAuth; +import com.engine.salary.entity.auth.param.AuthTreeQueryParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface AuthMapper { + + List getTaxEmpOptAuth(@Param("uid") Long uid, @Param("page") String page); + + List getTaxOptAuth(@Param("uid") Long uid, @Param("page") String page); + + List getSobOptAuth(@Param("uid") Long uid, @Param("page") String page); + + List getLimitSobs(@Param("uid") Long uid); + + List getLimitTaxAgents(@Param("uid") Long uid); + + List getOptsByPage(@Param("uid") Long uid, @Param("page") String page); + + AuthTreeDTO authTree(AuthTreeQueryParam param); +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthMapper.xml b/src/com/engine/salary/mapper/auth/AuthMapper.xml new file mode 100644 index 000000000..f1ce490b1 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthMapper.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthMemberMapper.java b/src/com/engine/salary/mapper/auth/AuthMemberMapper.java new file mode 100644 index 000000000..a5cabd93f --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthMemberMapper.java @@ -0,0 +1,78 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.po.AuthMemberPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthMemberMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthMemberPO authMember); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthMemberPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authMember 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthMemberPO authMember); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authMember 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthMemberPO authMember); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authMember 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthMemberPO authMember); + + /** + * 鍒犻櫎璁板綍 + * + * @param authMember 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthMemberPO authMember); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + /** + * 鏍规嵁瑙掕壊id鍒犻櫎 + * @param roleId roleId + */ + void deleteByRoleId(Long roleId); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml b/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml new file mode 100644 index 000000000..8bde81000 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + t.id + , t.role_id + , t.target_type + , t.target + , t.target_name + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_member + + + + id, + + + role_id, + + + target_type, + + + target, + + + target_name, + + + creator, + + + create_time, + + + update_time, + + + delete_type, + + + tenant_key, + + + + + #{id}, + + + #{roleId}, + + + #{targetType}, + + + #{target}, + + + #{targetName}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + #{deleteType}, + + + #{tenantKey}, + + + + + + + UPDATE hrsa_auth_member + + role_id=#{roleId}, + target_type=#{targetType}, + target=#{target}, + target_name=#{targetName}, + creator=#{creator}, + create_time=#{createTime}, + update_time=#{updateTime}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_member + + + role_id=#{roleId}, + + + target_type=#{targetType}, + + + target=#{target}, + + + target_name=#{targetName}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_member + SET delete_type=1 + WHERE id = #{id} AND delete_type = 0 + + + + UPDATE hrsa_auth_member + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + + UPDATE hrsa_auth_member + SET delete_type=1 + WHERE role_id = #{roleId} AND delete_type = 0 + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthOptMapper.java b/src/com/engine/salary/mapper/auth/AuthOptMapper.java new file mode 100644 index 000000000..7dcc172ea --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthOptMapper.java @@ -0,0 +1,79 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.po.AuthOptPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthOptMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthOptPO authOpt); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthOptPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authOpt 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthOptPO authOpt); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authOpt 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthOptPO authOpt); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authOpt 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthOptPO authOpt); + + /** + * 鍒犻櫎璁板綍 + * + * @param authOpt 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthOptPO authOpt); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + + /** + * 鏍规嵁瑙掕壊id鍒犻櫎 + * @param roleId roleId + */ + void deleteByRoleId(Long roleId); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthOptMapper.xml b/src/com/engine/salary/mapper/auth/AuthOptMapper.xml new file mode 100644 index 000000000..8ee16cf89 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthOptMapper.xml @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + t + . + id + , t.role_id + , t.page + , t.opt + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_opt + + + + id, + + + role_id, + + + page, + + + opt, + + + creator, + + + create_time, + + + update_time, + + + delete_type, + + + tenant_key, + + + + + #{id}, + + + #{roleId}, + + + #{page}, + + + #{opt}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + #{deleteType}, + + + #{tenantKey}, + + + + + + + UPDATE hrsa_auth_opt + + role_id=#{roleId}, + page=#{page}, + opt=#{opt}, + creator=#{creator}, + create_time=#{createTime}, + update_time=#{updateTime}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_opt + + + role_id=#{roleId}, + + + page=#{page}, + + + opt=#{opt}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_opt + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_auth_opt + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + UPDATE hrsa_auth_opt + SET delete_type=1 + WHERE role_id = #{roleId} AND delete_type = 0 + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthResourceMapper.java b/src/com/engine/salary/mapper/auth/AuthResourceMapper.java new file mode 100644 index 000000000..36d44af71 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthResourceMapper.java @@ -0,0 +1,78 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.po.AuthResourcePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthResourceMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthResourcePO authLimit); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthResourcePO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authLimit 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthResourcePO authLimit); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authLimit 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthResourcePO authLimit); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authLimit 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthResourcePO authLimit); + + /** + * 鍒犻櫎璁板綍 + * + * @param authLimit 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthResourcePO authLimit); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + + /** + * 鏍规嵁瑙掕壊id鍒犻櫎 + * @param roleId roleId + */ + void deleteByRoleId(Long roleId); +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthResourceMapper.xml b/src/com/engine/salary/mapper/auth/AuthResourceMapper.xml new file mode 100644 index 000000000..ed6c47fa9 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthResourceMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + t.create_time + , t.creator + , t.delete_type + , t.id + , t.role_id + , t.target + , t.target_name + , t.target_type + , t.tenant_key + , t.update_time + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_resource + + + + create_time, + + + creator, + + + delete_type, + + + id, + + + role_id, + + + target, + + + target_name, + + + target_type, + + + tenant_key, + + + update_time, + + + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{id}, + + + #{roleId}, + + + #{target}, + + + #{targetName}, + + + #{targetType}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + UPDATE hrsa_auth_resource + + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + role_id=#{roleId}, + target=#{target}, + target_name=#{targetName}, + target_type=#{targetType}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_resource + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + role_id=#{roleId}, + + + target=#{target}, + + + target_name=#{targetName}, + + + target_type=#{targetType}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_resource + SET delete_type=1 + WHERE id = #{id} AND delete_type = 0 + + + + UPDATE hrsa_auth_resource + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + + UPDATE hrsa_auth_resource + SET delete_type = 1 + WHERE delete_type = 0 + AND role_id=#{roleId} + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthRoleDataMapper.java b/src/com/engine/salary/mapper/auth/AuthRoleDataMapper.java new file mode 100644 index 000000000..8d3f04621 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthRoleDataMapper.java @@ -0,0 +1,87 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.dto.AuthRoleDataDTO; +import com.engine.salary.entity.auth.po.AuthRoleDataPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthRoleDataMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthRoleDataPO authRoleData); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthRoleDataPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authRoleData 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthRoleDataPO authRoleData); + + /** + * 鎵归噺鎻掑叆 + * + * @param authRoleData + */ + void batchInsert(@Param("collection") List authRoleData); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authRoleData 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthRoleDataPO authRoleData); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authRoleData 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthRoleDataPO authRoleData); + + /** + * 鍒犻櫎璁板綍 + * + * @param authRoleData 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthRoleDataPO authRoleData); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + /** + * 鏍规嵁瑙掕壊id鍒犻櫎 + * @param roleId roleId + */ + void deleteByRoleId(Long roleId); + + List listRoleData(Long roleId); +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthRoleDataMapper.xml b/src/com/engine/salary/mapper/auth/AuthRoleDataMapper.xml new file mode 100644 index 000000000..027331605 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthRoleDataMapper.xml @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + t + . + id + , t.role_id + , t.employee_id + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_role_data + + + + id, + + + role_id, + + + employee_id, + + + creator, + + + create_time, + + + update_time, + + + delete_type, + + + tenant_key, + + + + + #{id}, + + + #{roleId}, + + + #{employeeId}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + #{deleteType}, + + + #{tenantKey}, + + + + + + + + INSERT INTO hrsa_auth_role_data + ( + id, + role_id, + employee_id, + creator, + create_time, + update_time, + delete_type, + tenant_key + ) + VALUES + + + ( + #{item.id}, + #{item.roleId}, + #{item.employeeId}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, + #{item.tenantKey} + ) + + + + + + + INSERT INTO hrsa_auth_role_data ( + id, + role_id, + employee_id, + creator, + create_time, + update_time, + delete_type, + tenant_key + ) + + + select + #{item.id,jdbcType=DOUBLE}, + #{item.roleId,jdbcType=DOUBLE}, + #{item.employeeId,jdbcType=DOUBLE}, + #{item.creator,jdbcType=DOUBLE}, + #{item.createTime,jdbcType=DATE}, + #{item.updateTime,jdbcType=DATE}, + #{item.deleteType,jdbcType=INTEGER}, + #{item.tenantKey,jdbcType=VARCHAR} + from dual + + + + + + + INSERT INTO hrsa_auth_role_data ( + id, + role_id, + employee_id, + creator, + create_time, + update_time, + delete_type, + tenant_key + ) + VALUES + ( + #{item.id}, + #{item.roleId}, + #{item.employeeId}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, + #{item.tenantKey} + ) + + + + + + UPDATE hrsa_auth_role_data + + role_id=#{roleId}, + employee_id=#{employeeId}, + creator=#{creator}, + create_time=#{createTime}, + update_time=#{updateTime}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_role_data + + + role_id=#{roleId}, + + + employee_id=#{employeeId}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_role_data + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_auth_role_data + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + delete from hrsa_auth_role_data + WHERE role_id = #{roleId} AND delete_type = 0 + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthRoleEmpMapper.java b/src/com/engine/salary/mapper/auth/AuthRoleEmpMapper.java new file mode 100644 index 000000000..eea6e0ab0 --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthRoleEmpMapper.java @@ -0,0 +1,87 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.dto.AuthRoleEmpDTO; +import com.engine.salary.entity.auth.po.AuthRoleEmpPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthRoleEmpMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthRoleEmpPO authRoleEmp); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthRoleEmpPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authRoleEmp 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthRoleEmpPO authRoleEmp); + + /** + * 鎵归噺鎻掑叆 + * + * @param authRoleEmp + */ + void batchInsert(@Param("collection") List authRoleEmp); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authRoleEmp 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthRoleEmpPO authRoleEmp); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authRoleEmp 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthRoleEmpPO authRoleEmp); + + /** + * 鍒犻櫎璁板綍 + * + * @param authRoleEmp 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthRoleEmpPO authRoleEmp); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + /** + * 鏍规嵁瑙掕壊id鍒犻櫎 + * @param roleId roleId + */ + void deleteByRoleId(Long roleId); + + List getByRoleId(Long roleId); +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthRoleEmpMapper.xml b/src/com/engine/salary/mapper/auth/AuthRoleEmpMapper.xml new file mode 100644 index 000000000..db7b3fb2f --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthRoleEmpMapper.xml @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + t + . + id + , t.role_id + , t.employee_id + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_role_emp + + + + id, + + + role_id, + + + employee_id, + + + creator, + + + create_time, + + + update_time, + + + delete_type, + + + tenant_key, + + + + + #{id}, + + + #{roleId}, + + + #{employeeId}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + #{deleteType}, + + + #{tenantKey}, + + + + + + + + INSERT INTO hrsa_auth_role_emp + ( + id, + role_id, + employee_id, + creator, + create_time, + update_time, + delete_type, + tenant_key + ) + VALUES + + + ( + #{item.id}, + #{item.roleId}, + #{item.employeeId}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, + #{item.tenantKey} + ) + + + + + + + INSERT INTO hrsa_auth_role_emp ( + id, + role_id, + employee_id, + creator, + create_time, + update_time, + delete_type, + tenant_key + ) + + + select + #{item.id,jdbcType=DOUBLE}, + #{item.roleId,jdbcType=DOUBLE}, + #{item.employeeId,jdbcType=DOUBLE}, + #{item.creator,jdbcType=DOUBLE}, + #{item.createTime,jdbcType=DATE}, + #{item.updateTime,jdbcType=DATE}, + #{item.deleteType,jdbcType=INTEGER}, + #{item.tenantKey,jdbcType=VARCHAR} + from dual + + + + + + + INSERT INTO hrsa_auth_role_emp ( + id, + role_id, + employee_id, + creator, + create_time, + update_time, + delete_type, + tenant_key + ) + VALUES + ( + #{item.id}, + #{item.roleId}, + #{item.employeeId}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, + #{item.tenantKey} + ) + + + + + + UPDATE hrsa_auth_role_emp + + role_id=#{roleId}, + employee_id=#{employeeId}, + creator=#{creator}, + create_time=#{createTime}, + update_time=#{updateTime}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_role_emp + + + role_id=#{roleId}, + + + employee_id=#{employeeId}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_role_emp + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + + UPDATE hrsa_auth_role_emp + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + + UPDATE hrsa_auth_role_emp + SET delete_type=1 + WHERE role_id = #{roleId} + AND delete_type = 0 + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthRoleMapper.java b/src/com/engine/salary/mapper/auth/AuthRoleMapper.java new file mode 100644 index 000000000..1e958fb8f --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthRoleMapper.java @@ -0,0 +1,76 @@ +package com.engine.salary.mapper.auth; + +import com.engine.salary.entity.auth.param.AuthRoleListQueryParam; +import com.engine.salary.entity.auth.po.AuthRolePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface AuthRoleMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(AuthRolePO authRole); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + AuthRolePO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param authRole 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(AuthRolePO authRole); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param authRole 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(AuthRolePO authRole); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param authRole 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(AuthRolePO authRole); + + /** + * 鍒犻櫎璁板綍 + * + * @param authRole 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(AuthRolePO authRole); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + + List list(AuthRoleListQueryParam param); +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/auth/AuthRoleMapper.xml b/src/com/engine/salary/mapper/auth/AuthRoleMapper.xml new file mode 100644 index 000000000..8a25166da --- /dev/null +++ b/src/com/engine/salary/mapper/auth/AuthRoleMapper.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + t + . + id + , t.name + , t.description + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + + + + + + + + + + + + INSERT INTO hrsa_auth_role + + + + id, + + + name, + + + description, + + + creator, + + + create_time, + + + update_time, + + + delete_type, + + + tenant_key, + + + + + #{id}, + + + #{name}, + + + #{description}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + #{deleteType}, + + + #{tenantKey}, + + + + + + + UPDATE hrsa_auth_role + + name=#{name}, + description=#{description}, + creator=#{creator}, + create_time=#{createTime}, + update_time=#{updateTime}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_role + + + name=#{name}, + + + description=#{description}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_auth_role + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_auth_role + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java index d95d6c45e..120c7a352 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java @@ -175,4 +175,10 @@ public interface EmployMapper { List listBySubCompanyOrDepartment(@Param("subCompanyIds") List subCompanyIds, @Param("departmentIds") List departmentIds); JobCallInfo getJobCallInfoById(@Param("jobCallId") Long jobCallId); + + List listBySubCompany(@Param("subCompanyIds") List subCompanyIds); + + List listByDepartment(@Param("departmentIds") List departmentIds); + + List listByJob(@Param("jobIds") List jobIds); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 3a2ed14af..39adedca3 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -11,6 +11,7 @@ e.workcode, e.certificatenum as idNo, e.accounttype as accountType, + e.sex as sex, 'false' as extEmp from hrmresource e left join hrmdepartment d on e.departmentid = d.id @@ -21,6 +22,7 @@ - select e.id as employeeId, e.lastname as username, + e.sex as sex, e.certificatenum as idNo, e.status as status, e.workcode as workcode, @@ -122,6 +126,7 @@ select e.id as employeeId, e.lastname as username, e.status as status, + e.sex as sex, e.certificatenum as idNo, e.workcode as workcode, d.departmentname as departmentName, @@ -228,6 +233,7 @@ select e.id as employeeId, e.lastname as username, e.status as status, + e.sex as sex, e.certificatenum as idNo, e.workcode as workcode, d.departmentname as departmentName, @@ -282,6 +288,7 @@ e.lastname as username, e.status as status, e.workcode as workcode, + e.sex as sex, e.certificatenum as idNo, e.companystartdate as companystartdate, e.mobile as mobile, @@ -303,6 +310,7 @@ e.status as status, e.workcode as workcode, e.certificatenum as idNo, + e.sex as sex, e.companystartdate as companystartdate, e.mobile as mobile, e.accounttype as accountType, @@ -323,6 +331,7 @@ e.status as status, e.workcode as workcode, e.certificatenum as idNo, + e.sex as sex, e.companystartdate as companystartdate, e.mobile as mobile, e.departmentid as departmentId, @@ -486,6 +495,7 @@ e.lastname as username, e.status as status, e.certificatenum as idNo, + e.sex as sex, e.workcode as workcode, e.companystartdate as companystartdate, e.mobile as mobile, @@ -561,6 +571,7 @@ e.lastname as username, e.status as status, e.certificatenum as idNo, + e.sex as sex, e.workcode as workcode, d.departmentname as departmentName, d.id as departmentId, @@ -622,6 +633,39 @@ + + + + + + + SELECT + + FROM hrsa_push_record_detail t + WHERE delete_type = 0 + + + + + + + + + + + + + + INSERT INTO hrsa_push_record_detail + + + + acct_emp_id, + + + create_time, + + + creator, + + + delete_type, + + + formula, + + + id, + + + record_id, + + + status, + + + tenant_key, + + + update_time, + + + fail_reason, + + + data_id, + + + + + #{acctEmpId}, + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{formula}, + + + #{id}, + + + #{recordId}, + + + #{status}, + + + #{tenantKey}, + + + #{updateTime}, + + + #{failReason}, + + + #{dataId}, + + + + + + + UPDATE hrsa_push_record_detail + + acct_emp_id=#{acctEmpId}, + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + formula=#{formula}, + record_id=#{recordId}, + status=#{status}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + fail_reason=#{failReason}, + data_id=#{dataId}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_record_detail + + + acct_emp_id=#{acctEmpId}, + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + formula=#{formula}, + + + record_id=#{recordId}, + + + status=#{status}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + fail_reason=#{failReason}, + + + data_id=#{dataId}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_record_detail + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_push_record_detail + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + UPDATE hrsa_push_record_detail + SET delete_type=1 + WHERE record_id=#{recordId} + AND delete_type = 0 + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/push/PushRecordMapper.java b/src/com/engine/salary/mapper/push/PushRecordMapper.java new file mode 100644 index 000000000..dfcf7fd05 --- /dev/null +++ b/src/com/engine/salary/mapper/push/PushRecordMapper.java @@ -0,0 +1,75 @@ +package com.engine.salary.mapper.push; + +import com.engine.salary.entity.push.po.PushRecordPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface PushRecordMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(PushRecordPO pushRecord); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + PushRecordPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param pushRecord 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(PushRecordPO pushRecord); + + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param pushRecord 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(PushRecordPO pushRecord); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param pushRecord 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(PushRecordPO pushRecord); + + /** + * 鍒犻櫎璁板綍 + * + * @param pushRecord 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(PushRecordPO pushRecord); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + int countBeforeBatch(Long batchId); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/push/PushRecordMapper.xml b/src/com/engine/salary/mapper/push/PushRecordMapper.xml new file mode 100644 index 000000000..48e1a2765 --- /dev/null +++ b/src/com/engine/salary/mapper/push/PushRecordMapper.xml @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + t + . + acct_record_id + , t.mode_id + , t.table_name + , t.create_time + , t.creator + , t.delete_type + , t.id + , t.name + , t.setting_id + , t.status + , t.tenant_key + , t.type + , t.update_time + , t.fail_reason + , t.start_time + , t.end_time + + + + + + + + + + + + + + + INSERT INTO hrsa_push_record + + + + mode_id, + + + table_name, + + + acct_record_id, + + + create_time, + + + creator, + + + delete_type, + + + id, + + + name, + + + setting_id, + + + status, + + + tenant_key, + + + type, + + + update_time, + + + fail_reason, + + + start_time, + + + end_time, + + + + + #{modeId}, + + + #{tableName}, + + + #{acctRecordId}, + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{id}, + + + #{name}, + + + #{settingId}, + + + #{status}, + + + #{tenantKey}, + + + #{type}, + + + #{updateTime}, + + + #{failReason}, + + + #{startTime}, + + + #{endTime}, + + + + + + + UPDATE hrsa_push_record + + mode_id=#{modeId}, + table_name=#{tableName}, + acct_record_id=#{acctRecordId}, + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + name=#{name}, + setting_id=#{settingId}, + status=#{status}, + tenant_key=#{tenantKey}, + type=#{type}, + update_time=#{updateTime}, + fail_reason=#{failReason}, + start_time=#{startTime}, + end_time=#{endTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_record + + + mode_id=#{modeId}, + + + table_name=#{tableName}, + + + acct_record_id=#{acctRecordId}, + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + name=#{name}, + + + setting_id=#{settingId}, + + + status=#{status}, + + + tenant_key=#{tenantKey}, + + + type=#{type}, + + + update_time=#{updateTime}, + + + fail_reason=#{failReason}, + + + start_time=#{startTime}, + + + end_time=#{endTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_record + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_push_record + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/push/PushSettingItemMapper.java b/src/com/engine/salary/mapper/push/PushSettingItemMapper.java new file mode 100644 index 000000000..3f550b532 --- /dev/null +++ b/src/com/engine/salary/mapper/push/PushSettingItemMapper.java @@ -0,0 +1,72 @@ +package com.engine.salary.mapper.push; + +import com.engine.salary.entity.push.po.PushSettingItemPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface PushSettingItemMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(PushSettingItemPO pushSettingItem); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + PushSettingItemPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param pushSettingItem 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(PushSettingItemPO pushSettingItem); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param pushSettingItem 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(PushSettingItemPO pushSettingItem); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param pushSettingItem 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(PushSettingItemPO pushSettingItem); + + /** + * 鍒犻櫎璁板綍 + * + * @param pushSettingItem 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(PushSettingItemPO pushSettingItem); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/push/PushSettingItemMapper.xml b/src/com/engine/salary/mapper/push/PushSettingItemMapper.xml new file mode 100644 index 000000000..2c5322940 --- /dev/null +++ b/src/com/engine/salary/mapper/push/PushSettingItemMapper.xml @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + t + . + create_time + , t.creator + , t.delete_type + , t.field_name + , t.field_type + , t.id + , t.item + , t.item_name + , t.source + , t.setting_id + , t.tenant_key + , t.update_time + , t.sorted_index + + + + + + + + + + + + + + + INSERT INTO hrsa_push_setting_item + + + + create_time, + + + creator, + + + delete_type, + + + field_name, + + + field_type, + + + id, + + + item, + + + item_name, + + + source, + + + setting_id, + + + sorted_index, + + + tenant_key, + + + update_time, + + + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{fieldName}, + + + #{fieldType}, + + + #{id}, + + + #{item}, + + + #{itemName}, + + + #{source}, + + + #{settingId}, + + + #{sortedIndex}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + UPDATE hrsa_push_setting_item + + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + field_name=#{fieldName}, + field_type=#{fieldType}, + item=#{item}, + item_name=#{itemName}, + source=#{source}, + setting_id=#{settingId}, + sorted_index=#{sortedIndex}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_setting_item + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + field_name=#{fieldName}, + + + field_type=#{fieldType}, + + + item=#{item}, + + + item_name=#{itemName}, + + + source=#{source}, + + + setting_id=#{settingId}, + + + sorted_index=#{sortedIndex}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_setting_item + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_push_setting_item + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/push/PushSettingMapper.java b/src/com/engine/salary/mapper/push/PushSettingMapper.java new file mode 100644 index 000000000..dcfe71ccc --- /dev/null +++ b/src/com/engine/salary/mapper/push/PushSettingMapper.java @@ -0,0 +1,73 @@ +package com.engine.salary.mapper.push; + +import com.engine.salary.entity.push.po.PushSettingPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface PushSettingMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(PushSettingPO pushSetting); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + PushSettingPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param pushSetting 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(PushSettingPO pushSetting); + + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param pushSetting 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(PushSettingPO pushSetting); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param pushSetting 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(PushSettingPO pushSetting); + + /** + * 鍒犻櫎璁板綍 + * + * @param pushSetting 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(PushSettingPO pushSetting); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/push/PushSettingMapper.xml b/src/com/engine/salary/mapper/push/PushSettingMapper.xml new file mode 100644 index 000000000..c421fa71f --- /dev/null +++ b/src/com/engine/salary/mapper/push/PushSettingMapper.xml @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + t + . + able + , t.create_time + , t.creator + , t.delete_type + , t.name + , t.id + , t.mode_id + , t.mode_name + , t.salary_sob_ids + , t.table_name + , t.tenant_key + , t.update_time + + + + + + + + + + + + + + + INSERT INTO hrsa_push_setting + + + + able, + + + create_time, + + + creator, + + + delete_type, + + + name, + + + id, + + + mode_id, + + + mode_name, + + + salary_sob_ids, + + + table_name, + + + tenant_key, + + + update_time, + + + + + #{able}, + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{name}, + + + #{id}, + + + #{modeId}, + + + #{modeName}, + + + #{salarySobIds, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.LongListTypeHandler}, + + + #{tableName}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + UPDATE hrsa_push_setting + + able=#{able}, + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + name=#{name}, + mode_id=#{modeId}, + mode_name=#{modeName}, + salary_sob_ids=#{salarySobIds, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.LongListTypeHandler}, + table_name=#{tableName}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_setting + + + able=#{able}, + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + name=#{name}, + + + mode_id=#{modeId}, + + + mode_name=#{modeName}, + + + salary_sob_ids=#{salarySobIds, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.LongListTypeHandler}, + + + table_name=#{tableName}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_push_setting + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_push_setting + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml index 9da99248d..12d7e6c4a 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml @@ -18,6 +18,24 @@ + + + + + + + + + + + + + + + + + + t @@ -57,73 +75,78 @@ - @@ -57,7 +64,8 @@ SELECT FROM hrsa_salary_sob t - WHERE id = #{id} AND delete_type = 0 + left join hrsa_sob_tax_link l on l.sob_id = t.id and l.delete_type = 0 + WHERE t.id = #{id} AND t.delete_type = 0 @@ -65,69 +73,70 @@ SELECT FROM hrsa_salary_sob t - WHERE delete_type = 0 + left join hrsa_sob_tax_link l on l.sob_id = t.id and l.delete_type = 0 + WHERE t.delete_type = 0 - AND id = #{id} + AND t.id = #{id} - AND income_category = #{incomeCategory} + AND t.income_category = #{incomeCategory} - AND salary_cycle_type = #{salaryCycleType} + AND t.salary_cycle_type = #{salaryCycleType} - AND salary_cycle_from_day = #{salaryCycleFromDay} + AND t.salary_cycle_from_day = #{salaryCycleFromDay} - AND tax_cycle_type = #{taxCycleType} + AND t.tax_cycle_type = #{taxCycleType} - AND attend_cycle_type = #{attendCycleType} + AND t.attend_cycle_type = #{attendCycleType} - AND attend_cycle_from_day = #{attendCycleFromDay} + AND t.attend_cycle_from_day = #{attendCycleFromDay} - AND social_security_cycle_type = #{socialSecurityCycleType} + AND t.social_security_cycle_type = #{socialSecurityCycleType} - AND disable = #{disable} + AND t.disable = #{disable} - AND description = #{description} + AND t.description = #{description} - AND creator = #{creator} + AND t.creator = #{creator} - AND create_time = #{createTime} + AND t.create_time = #{createTime} - AND update_time = #{updateTime} + AND t.update_time = #{updateTime} - AND delete_type = #{deleteType} + AND t.delete_type = #{deleteType} - AND tenant_key = #{tenantKey} + AND t.tenant_key = #{tenantKey} - AND id IN + AND t.id IN #{id} - AND tax_agent_id = #{taxAgentId} + AND t.tax_agent_id = #{taxAgentId} - AND tax_agent_id IN + AND t.tax_agent_id IN #{taxAgentId} - ORDER BY create_time DESC + ORDER BY t.create_time DESC @@ -454,60 +463,79 @@ - SELECT FROM hrsa_salary_sob t - WHERE - delete_type = 0 + left join hrsa_sob_tax_link l on l.sob_id = t.id and l.delete_type = 0 + WHERE t.delete_type = 0 - AND name like CONCAT('%',#{param.name},'%') + AND t.name like CONCAT('%',#{param.name},'%') - AND name like '%'||#{param.name}||'%' + AND t.name like '%'||#{param.name}||'%' - AND name like '%'+#{param.name}+'%' + AND t.name like '%'+#{param.name}+'%' - AND name like CONCAT('%',#{name},'%') + AND t.name like CONCAT('%',#{name},'%') - AND name like '%'||#{name}||'%' + AND t.name like '%'||#{name}||'%' - AND name like '%'+#{name}+'%' + AND t.name like '%'+#{name}+'%' - SELECT FROM hrsa_salary_sob t - WHERE - delete_type = 0 - and name = #{name} + left join hrsa_sob_tax_link l on l.sob_id = t.id and l.delete_type = 0 + WHERE t.delete_type = 0 + and t.name = #{name} + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SobTaxLinkMapper.java b/src/com/engine/salary/mapper/salarysob/SobTaxLinkMapper.java new file mode 100644 index 000000000..da9b6b444 --- /dev/null +++ b/src/com/engine/salary/mapper/salarysob/SobTaxLinkMapper.java @@ -0,0 +1,76 @@ +package com.engine.salary.mapper.salarysob; + +import com.engine.salary.entity.salarysob.po.SobTaxLinkPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface SobTaxLinkMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(SobTaxLinkPO sobTaxLink); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + SobTaxLinkPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param sobTaxLink 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(SobTaxLinkPO sobTaxLink); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param sobTaxLink 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(SobTaxLinkPO sobTaxLink); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param sobTaxLink 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(SobTaxLinkPO sobTaxLink); + + /** + * 鍒犻櫎璁板綍 + * + * @param sobTaxLink 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(SobTaxLinkPO sobTaxLink); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + + void deleteBySobId(Long id); + + int count(); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SobTaxLinkMapper.xml b/src/com/engine/salary/mapper/salarysob/SobTaxLinkMapper.xml new file mode 100644 index 000000000..8fe16ab03 --- /dev/null +++ b/src/com/engine/salary/mapper/salarysob/SobTaxLinkMapper.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + t + . + create_time + , t.creator + , t.delete_type + , t.id + , t.sob_id + , t.tax_agent_id + , t.tenant_key + , t.update_time + + + + + + + + + + + + + + + INSERT INTO hrsa_sob_tax_link + + + + create_time, + + + creator, + + + delete_type, + + + id, + + + sob_id, + + + tax_agent_id, + + + tenant_key, + + + update_time, + + + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{id}, + + + #{sobId}, + + + #{taxAgentId}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + + + + UPDATE hrsa_sob_tax_link + + create_time=#{createTime}, + creator=#{creator}, + delete_type=#{deleteType}, + sob_id=#{sobId}, + tax_agent_id=#{taxAgentId}, + tenant_key=#{tenantKey}, + update_time=#{updateTime}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_sob_tax_link + + + create_time=#{createTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + sob_id=#{sobId}, + + + tax_agent_id=#{taxAgentId}, + + + tenant_key=#{tenantKey}, + + + update_time=#{updateTime}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_sob_tax_link + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_sob_tax_link + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + UPDATE hrsa_sob_tax_link + SET delete_type = 1 + WHERE delete_type = 0 + AND sob_id=#{sobId} + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml b/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml index 02d015d13..e24131e5f 100644 --- a/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml +++ b/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml @@ -9,11 +9,12 @@ - + + @@ -32,6 +33,7 @@ , t.system_type , t.tenant_key , t.update_time + , t.file_id @@ -75,13 +77,16 @@ AND page = #{page} + + AND file_id = #{fileId} + AND setting = #{setting} AND shared_type = #{sharedType} - + AND system_type = #{systemType} @@ -141,6 +146,9 @@ update_time, + + file_id, + @@ -179,6 +187,9 @@ #{updateTime}, + + #{fileId}, + @@ -197,6 +208,7 @@ system_type=#{systemType}, tenant_key=#{tenantKey}, update_time=#{updateTime}, + file_id=#{fileId}, WHERE id = #{id} AND delete_type = 0 @@ -239,6 +251,7 @@ update_time=#{updateTime}, + file_id=#{fileId}, WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java index 2a05a0c72..faf48f4bc 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java @@ -192,4 +192,12 @@ public interface InsuranceAccountDetailMapper { * 鑾峰彇琛ュ樊鏁版嵁(璐﹀崟鏈堜唤+浜哄憳id+涓◣鎵ｇ即涔夊姟浜) */ List queryBalanceList(InsuranceAccountDetailPO po); + + /** + * 鏍规嵁id鍒犻櫎 + * @param ids + */ + void deleteByIds(@Param("ids")List ids); + + void deleteByEmpIds(@Param("employeeIds")List deleteEmployeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); } diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index f5b88a501..1f077543d 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -553,6 +553,7 @@ SELECT t.id,t.employee_id,t.social_per_json,t.social_com_json, diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java index 75fbefcaa..7a470a222 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java @@ -28,6 +28,8 @@ public interface SIAccountDetailTempMapper { */ void batchDelByEmpIdsAndMonthAndPayOrg(@Param("employeeIds") Collection employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + void batchDelByMonthAndPayOrg(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + /** * 鎵归噺淇濆瓨 * @param accounts diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml index ca12fe478..a5fa46fca 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml @@ -139,6 +139,14 @@ + + UPDATE hrsa_bill_detail_temp + SET delete_type = 1 + WHERE delete_type = 0 + AND bill_month = #{billMonth} + AND payment_organization = #{paymentOrganization} + + INSERT INTO hrsa_bill_detail_temp diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java index c7dfa1233..07396a02b 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java @@ -67,7 +67,7 @@ public interface FundSchemeMapper { * @param paymentOrganization * @return */ - List listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth); + List listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth, @Param("nonPayment") Integer nonPayment); List listAll(); diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index 644a21d18..8cb8fc4e0 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -266,6 +266,7 @@ AND fund_scheme_id is not null AND fund_start_time is not null AND fund_start_time #{billMonth} AND (fund_end_time is null OR fund_end_time = ]]> #{billMonth} OR fund_end_time ='') + AND non_payment = #{nonPayment} + +