Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts: # src/com/engine/salary/constant/SalaryDefaultTenantConstant.java # src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java # src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java # src/com/engine/salary/mapper/datacollection/EmployMapper.java # src/com/engine/salary/mapper/datacollection/EmployMapper.xml # src/com/engine/salary/service/AddUpDeductionService.java # src/com/engine/salary/service/OtherDeductionService.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalarySobServiceImpl.java # src/com/engine/salary/web/SalarySobController.java # src/com/engine/salary/wrapper/SalarySobWrapper.java
This commit is contained in:
commit
f3577d3ddd
|
|
@ -0,0 +1,113 @@
|
|||
<?xml version="1.0" encoding="GB2312"?>
|
||||
|
||||
<config name="薪酬管理权限" key="salary">
|
||||
|
||||
<module name="算薪" key="calculate">
|
||||
|
||||
<page name="社保福利档案" key="siArchive">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="社保福利台账" key="siAccount">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="薪资账套" key="salarySob">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="薪资档案" key="salaryArchive">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="调薪管理" key="adjustRecord">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="薪资核算" key="salaryAcct">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="工资单" key="salaryBill">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="个税申报" key="taxDeclaration">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
</module>
|
||||
|
||||
<module name="数据采集" key="collection">
|
||||
|
||||
<page name="累计专项附加扣除" key="addUpDeduction">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="专项附加扣除" key="specialAddDeduction">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="其他免税扣除" key="otherDeduction">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="往期累计情况" key="addUpSituation">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="考勤引用" key="attendQuote">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="浮动数据" key="variableArchive">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
</module>
|
||||
|
||||
<module name="报表" key="report">
|
||||
<page name="报表" key="report">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
</module>
|
||||
|
||||
<module name="设置" key="config">
|
||||
|
||||
<page name="个税扣缴义务人" key="taxAgent">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="社保福利方案" key="siScheme">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="薪资项目管理" key="salaryItem">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
<page name="字段管理" key="salaryField">
|
||||
<opt name="查询" key="query"/>
|
||||
<opt name="管理" key="admin"/>
|
||||
</page>
|
||||
|
||||
</module>
|
||||
|
||||
|
||||
</config>
|
||||
|
|
@ -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 ;
|
||||
/
|
||||
|
||||
|
|
@ -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;
|
||||
/
|
||||
|
||||
|
|
@ -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)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -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 ;
|
||||
/
|
||||
|
||||
|
|
@ -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;
|
||||
/
|
||||
|
||||
|
|
@ -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)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -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 ;
|
||||
/
|
||||
|
||||
|
|
@ -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;
|
||||
/
|
||||
|
||||
|
|
@ -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)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -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
|
||||
;
|
||||
|
|
@ -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
|
||||
;
|
||||
|
|
@ -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
|
||||
) ;
|
||||
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
@ -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
|
||||
/
|
||||
|
|
@ -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
|
||||
/
|
||||
|
|
@ -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)
|
||||
)
|
||||
/
|
||||
|
|
@ -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 ;
|
||||
/
|
||||
|
|
@ -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
|
||||
;
|
||||
|
|
@ -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)
|
||||
) ;
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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 ;
|
||||
/
|
||||
|
||||
|
|
@ -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;
|
||||
/
|
||||
|
||||
|
|
@ -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)
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -20,10 +20,27 @@ where item.name = '工资薪金合计'
|
|||
|
||||
# 获取档案信息
|
||||
|
||||
select i.item_value from hrsa_salary_archive_item i
|
||||
left join hrsa_salary_archive a on a.id = i.salary_archive_id
|
||||
left join hrsa_salary_item c on c.id=i.salary_item_id
|
||||
left join hrsa_tax_agent t on a.tax_agent_id=t.id
|
||||
where a.delete_type=0 and i.delete_type=0 and t.delete_type=0 and c.delete_type=0
|
||||
and a.employee_id=人员id and t.name=扣缴义务人名称
|
||||
and c.name='基本工资' order by effective_time desc
|
||||
select i.item_value from hrsa_salary_archive_item i
|
||||
left join hrsa_salary_archive a on a.id = i.salary_archive_id
|
||||
left join hrsa_salary_item c on c.id=i.salary_item_id
|
||||
left join hrsa_tax_agent t on a.tax_agent_id=t.id
|
||||
where a.delete_type=0 and i.delete_type=0 and t.delete_type=0 and c.delete_type=0
|
||||
and a.employee_id=人员id and t.name=扣缴义务人名称
|
||||
and c.name='基本工资' order by effective_time desc
|
||||
|
||||
|
||||
# 删除系统项目
|
||||
UPDATE set hrsa_sys_salary_item where delete_type =3 where delete_type =0;
|
||||
|
||||
update hrsa_salary_sob_default_item set delete_type =3 where delete_type =0;
|
||||
|
||||
|
||||
update hrsa_salary_sob_item set delete_type= 3 where delete_type =0 and salary_item_id in (select id from hrsa_salary_item where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal')
|
||||
);
|
||||
|
||||
UPDATE hrsa_salary_item set delete_type = 3 where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal');
|
||||
|
||||
|
||||
# 开启系统算税
|
||||
update hrsa_salary_sys_conf set conf_value = '1' where conf_key = 'taxDeclarationFunction'
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
}
|
||||
|
|
@ -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{
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package com.engine.salary.annotation;
|
||||
|
||||
import com.engine.salary.enums.auth.AuthCheckTypeEnum;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 权限验证字段
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface Auth {
|
||||
String page();
|
||||
|
||||
AuthCheckTypeEnum checkType() default AuthCheckTypeEnum.TAX_EMP;
|
||||
|
||||
String taxAgentIdField() default "taxAgentId";
|
||||
String employeeIdField() default "employeeId";
|
||||
String sobIdField() default "salarySobId";
|
||||
String optsField() default "opts";
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.engine.salary.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 权限验证字段
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Target(ElementType.FIELD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface AuthField {
|
||||
|
||||
String fieldType();
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
package com.engine.salary.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 权限验证字段
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Target(ElementType.FIELD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface AuthOpt {
|
||||
|
||||
}
|
||||
|
|
@ -96,7 +96,9 @@ public class AddUpDeductionBiz extends BaseBean {
|
|||
try {
|
||||
AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class);
|
||||
List<AddUpDeductionRecordDTO> addUpDeductionRecordStrDTOS = mapper.recordList(param);
|
||||
return encryptUtil.decryptList(addUpDeductionRecordStrDTOS, AddUpDeductionRecordDTO.class);
|
||||
encryptUtil.decryptList(addUpDeductionRecordStrDTOS, AddUpDeductionRecordDTO.class);
|
||||
SalaryI18nUtil.i18nList(addUpDeductionRecordStrDTOS);
|
||||
return addUpDeductionRecordStrDTOS;
|
||||
} finally {
|
||||
sqlSession.close();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@ package com.engine.salary.biz;
|
|||
|
||||
import com.engine.salary.encrypt.EncryptUtil;
|
||||
import com.engine.salary.entity.datacollection.AddUpSituation;
|
||||
import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO;
|
||||
import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO;
|
||||
import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam;
|
||||
import com.engine.salary.mapper.datacollection.AddUpSituationMapper;
|
||||
import com.engine.salary.util.SalaryI18nUtil;
|
||||
import com.google.common.collect.Lists;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.ibatis.session.SqlSession;
|
||||
|
|
@ -20,23 +18,6 @@ public class AddUpSituationBiz extends BaseBean {
|
|||
|
||||
private EncryptUtil encryptUtil = new EncryptUtil();
|
||||
|
||||
/**
|
||||
* 关联查询查询列表
|
||||
*
|
||||
* @param param
|
||||
* @return
|
||||
*/
|
||||
public List<AddUpSituationDTO> list(AddUpSituationQueryParam param) {
|
||||
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
|
||||
try {
|
||||
AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class);
|
||||
List<AddUpSituationDTO> list = mapper.list(param);
|
||||
encryptUtil.decryptList(list, AddUpSituationDTO.class);
|
||||
return SalaryI18nUtil.i18nList(list);
|
||||
} finally {
|
||||
sqlSession.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 条件查询
|
||||
|
|
|
|||
|
|
@ -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 ;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -317,4 +317,9 @@ public class SalaryElogConfig {
|
|||
* @return
|
||||
*/
|
||||
public static LoggerTemplate salaryStatReportLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "statreport");
|
||||
|
||||
/**
|
||||
* 业务线
|
||||
*/
|
||||
public static LoggerTemplate authLinkLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "authlink");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AuthLimitDTO {
|
||||
private Long taxAgentId;
|
||||
|
||||
private List<RoleLimit> roleLimits;
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
|
||||
import com.thoughtworks.xstream.annotations.XStreamImplicit;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@XStreamAlias("config")
|
||||
public class AuthOptDTO {
|
||||
@XStreamAlias("name")
|
||||
@XStreamAsAttribute
|
||||
private String name;
|
||||
|
||||
@XStreamAlias("key")
|
||||
@XStreamAsAttribute
|
||||
private String key;
|
||||
|
||||
@XStreamImplicit(itemFieldName = "module")
|
||||
private List<Module> modules;
|
||||
|
||||
@Data
|
||||
public static class Module {
|
||||
@XStreamAlias("name")
|
||||
@XStreamAsAttribute
|
||||
private String name;
|
||||
|
||||
@XStreamAlias("key")
|
||||
@XStreamAsAttribute
|
||||
private String key;
|
||||
|
||||
@XStreamImplicit(itemFieldName = "page")
|
||||
private List<Page> pages;
|
||||
|
||||
@Data
|
||||
public static class Page {
|
||||
@XStreamAlias("name")
|
||||
@XStreamAsAttribute
|
||||
private String name;
|
||||
|
||||
@XStreamAlias("key")
|
||||
@XStreamAsAttribute
|
||||
private String key;
|
||||
|
||||
@XStreamAlias("limit")
|
||||
@XStreamAsAttribute
|
||||
private String limit;
|
||||
|
||||
@XStreamImplicit(itemFieldName = "opt")
|
||||
private List<Opt> opts;
|
||||
|
||||
@Data
|
||||
public static class Opt {
|
||||
@XStreamAlias("name")
|
||||
@XStreamAsAttribute
|
||||
private String name;
|
||||
|
||||
@XStreamAlias("key")
|
||||
@XStreamAsAttribute
|
||||
private String key;
|
||||
|
||||
@XStreamAlias("able")
|
||||
@XStreamAsAttribute
|
||||
private boolean able;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.entity.salarysob.po.SalarySobPO;
|
||||
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AuthRoleDTO {
|
||||
|
||||
private Long id;
|
||||
|
||||
@TableTitle(title = "业务线", dataIndex = "name", key = "name")
|
||||
private String name;
|
||||
|
||||
@TableTitle(title = "描述", dataIndex = "description", key = "description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 扣缴义务人资源
|
||||
*/
|
||||
private List<TaxAgentPO> taxAgentIds;
|
||||
|
||||
/**
|
||||
* 账套资源
|
||||
*/
|
||||
private List<SalarySobPO> sobIds;
|
||||
|
||||
@TableTitle(title = "资源", dataIndex = "resources", key = "resources")
|
||||
private Integer resources;
|
||||
|
||||
@TableTitle(title = "成员", dataIndex = "members", key = "members")
|
||||
private Integer members;
|
||||
|
||||
@TableTitle(title = "权限", dataIndex = "opts", key = "opts")
|
||||
private Integer opts;
|
||||
|
||||
@TableTitle(title = "数据", dataIndex = "datas", key = "datas")
|
||||
private Integer datas;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AuthTreeDTO {
|
||||
private Long roleEmpId;
|
||||
|
||||
private List<Role> roles;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class Role {
|
||||
private Long roleId;
|
||||
|
||||
private String roleName;
|
||||
|
||||
private List<Resource> resources;
|
||||
private List<Opt> opts;
|
||||
private List<Data> datas;
|
||||
|
||||
@lombok.Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class Resource {
|
||||
private Long resourceId;
|
||||
private String resourceName;
|
||||
private String resourceType;
|
||||
}
|
||||
|
||||
@lombok.Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class Opt {
|
||||
private Long optId;
|
||||
private String page;
|
||||
private String opt;
|
||||
}
|
||||
|
||||
@lombok.Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class Data {
|
||||
private Long dataId;
|
||||
private Long employeeId;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class EmpOpt {
|
||||
private Long employeeId;
|
||||
|
||||
private Set<String> opts;
|
||||
}
|
||||
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
public class PermissionDTO {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class RoleLimit {
|
||||
private Long roleId;
|
||||
|
||||
private List<Long> sobIds;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SobOptAuth {
|
||||
private Long sobId;
|
||||
|
||||
private Set<String> opts;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TaxEmpOptAuth {
|
||||
private Long taxAgentId;
|
||||
|
||||
private List<EmpOpt> emps;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.auth.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TaxOptAuth {
|
||||
private Long taxAgentId;
|
||||
|
||||
private Set<String> opts;
|
||||
}
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package com.engine.salary.entity.auth.param;
|
||||
|
||||
|
||||
import com.engine.salary.enums.auth.DataLinkEnum;
|
||||
import com.engine.salary.enums.auth.DataTargetTypeEnum;
|
||||
import com.engine.salary.util.valid.Modify;
|
||||
import com.engine.salary.util.valid.ModifyTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 数据
|
||||
* <p>Copyright: Copyright (c) 2024</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AuthDataSaveParam {
|
||||
private Long id;
|
||||
|
||||
private Long roleId;
|
||||
|
||||
private DataLinkEnum link;
|
||||
|
||||
private DataTargetTypeEnum targetType;
|
||||
|
||||
@Modify(modifyType = ModifyTypeEnum.RESTORE_SQL)
|
||||
private String target;
|
||||
|
||||
@Modify(modifyType = ModifyTypeEnum.RESTORE_SQL)
|
||||
private String targetName;
|
||||
|
||||
private Integer sortedIndex;
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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<Opt> opts;
|
||||
|
||||
@Data
|
||||
public static class Opt {
|
||||
|
||||
private String page;
|
||||
|
||||
private String opt;
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* 业务线id
|
||||
*/
|
||||
private List<Long> roleIds;
|
||||
|
||||
/**
|
||||
* 扣缴义务人资源
|
||||
*/
|
||||
private List<Long> taxAgentIds;
|
||||
|
||||
/**
|
||||
* 账套资源
|
||||
*/
|
||||
private List<Long> sobIds;
|
||||
|
||||
/**
|
||||
* 成员id
|
||||
*/
|
||||
private List<Long> roleEmpIds;
|
||||
|
||||
|
||||
/**
|
||||
* 权限页面
|
||||
*/
|
||||
private List<String> pages;
|
||||
|
||||
/**
|
||||
* 权限项
|
||||
*/
|
||||
private List<String> opts;
|
||||
|
||||
|
||||
/**
|
||||
* 数据id
|
||||
*/
|
||||
private List<Long> employeeIds;
|
||||
|
||||
}
|
||||
|
|
@ -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<TaxAgentPO> taxAgentIds;
|
||||
|
||||
|
||||
/**
|
||||
* 账套资源
|
||||
*/
|
||||
private List<SalarySobPO> sobIds;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> roleIds;
|
||||
|
||||
private List<Long> employeeIds;
|
||||
|
||||
private List<String> pages;
|
||||
|
||||
private List<String> opts;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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：sql
|
||||
*/
|
||||
@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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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：sql
|
||||
*/
|
||||
@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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<String> opts;
|
||||
|
||||
}
|
||||
|
|
@ -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 com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
|
@ -14,6 +11,7 @@ import lombok.NoArgsConstructor;
|
|||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 数据采集-累计情况表
|
||||
|
|
@ -25,6 +23,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
|
||||
|
|
@ -266,4 +265,7 @@ public class AddUpSituation {
|
|||
Collection<Long> employeeIds;
|
||||
Collection<Long> taxAgentIds;
|
||||
|
||||
|
||||
private Set<String> opts;
|
||||
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ import com.engine.salary.entity.datacollection.param.VariableArchiveImportHandle
|
|||
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;
|
||||
|
|
@ -178,7 +178,7 @@ public class VariableArchiveExcelBO extends Service {
|
|||
// 个税扣缴义务人
|
||||
String taxAgentCellVal = Optional.ofNullable(map.get(taxAgentI18n)).orElse("").toString();
|
||||
map.put("taxAgent", taxAgentCellVal);
|
||||
Optional<TaxAgentManageRangeEmployeeDTO> optionalTaxAgent = importHandleParam.getTaxAgentList().stream().filter(m -> m.getTaxAgentName().equals(taxAgentCellVal)).findFirst();
|
||||
Optional<TaxAgentPO> optionalTaxAgent = importHandleParam.getTaxAgentList().stream().filter(m -> m.getName().equals(taxAgentCellVal)).findFirst();
|
||||
if (!optionalTaxAgent.isPresent()) {
|
||||
Map<String, String> errorMessageMap = Maps.newHashMap();
|
||||
errorMessageMap.put("message", rowindex + "个税扣缴义务人不存在，或不在权限范围内");
|
||||
|
|
@ -186,12 +186,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<String, String> errorMessageMap = Maps.newHashMap();
|
||||
errorMessageMap.put("message", rowindex + "存在重复数据");
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import lombok.Builder;
|
|||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 数据采集-累计专项附加扣除
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
|
|
@ -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<String> opts;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -204,5 +207,5 @@ public class AddUpSituationDTO {
|
|||
private String addUpTaxableIncome;
|
||||
|
||||
@TableTitle(title = "操作", dataIndex = "operate", key = "operate")
|
||||
private String operate;
|
||||
private Set<String> opts;
|
||||
}
|
||||
|
|
@ -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<String> opts;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* 数据采集-其他免税扣除列表
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
|
|
@ -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 {
|
||||
|
||||
|
||||
|
|
@ -139,4 +143,6 @@ public class OtherDeductionListDTO {
|
|||
@SalaryTableColumn(text = "操作", width = "20%", column = "operate")
|
||||
@TableTitle(title = "操作", dataIndex = "operate", key = "operate")
|
||||
private String operate;
|
||||
|
||||
private Set<String> opts;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ import lombok.Builder;
|
|||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 数据采集-专项附加扣除列表
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
|
|
@ -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<String> opts;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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<String> opts;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<TaxAgentManageRangeEmployeeDTO> taxAgentList;
|
||||
Collection<TaxAgentPO> taxAgentList;
|
||||
|
||||
/**
|
||||
* 当前时间
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.engine.salary.entity.datacollection.po;
|
||||
|
||||
import com.engine.hrmelog.annotation.ElogTransform;
|
||||
import com.engine.salary.annotation.Auth;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import com.engine.hrmelog.annotation.ElogTransform;
|
||||
import com.engine.salary.annotation.Encrypt;
|
||||
|
|
@ -20,7 +22,8 @@ import java.util.List;
|
|||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@ElogTransform(name = "其他免税扣除")
|
||||
@ElogTransform( name = "其他免税扣除")
|
||||
@Auth(page = "otherDeduction")
|
||||
public class OtherDeductionPO {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,118 @@
|
|||
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 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;
|
||||
|
||||
|
||||
/**
|
||||
* 推送配置id
|
||||
*/
|
||||
private Long settingId;
|
||||
|
||||
/**
|
||||
* 建模id
|
||||
*/
|
||||
private Integer modeId;
|
||||
|
||||
/**
|
||||
* 数据库表名
|
||||
*/
|
||||
@TableTitle(title = "记录名", dataIndex = "name", key = "name")
|
||||
private String tableName;
|
||||
|
||||
|
||||
/**
|
||||
* 推送状态
|
||||
*
|
||||
* @see PushRecordStatusEnum
|
||||
*/
|
||||
@TableTitle(title = "推送状态", dataIndex = "status", key = "status")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 执行时间
|
||||
*/
|
||||
@TableTitle(title = "执行时间", dataIndex = "startTime", key = "startTime")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@ElogTransform(name = "结束时间")
|
||||
private Date endTime;
|
||||
|
||||
|
||||
/**
|
||||
* 推送类型，0推送，1撤回
|
||||
*/
|
||||
@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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 推送记录id
|
||||
*/
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 核算人员id
|
||||
*/
|
||||
private Long acctEmpId;
|
||||
|
||||
/**
|
||||
* 执行状态
|
||||
* @see com.engine.salary.enums.push.PushRecordDetailStatusEnum
|
||||
*/
|
||||
@TableTitle(title = "执行状态", dataIndex = "status",key = "status")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 失败原因
|
||||
*/
|
||||
@TableTitle(title = "失败原因", dataIndex = "fail_reason",key = "status")
|
||||
private String fail_reason;
|
||||
|
||||
/**
|
||||
* 执行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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<SalarySobPO> 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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.push.param;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PushParam {
|
||||
|
||||
|
||||
private Long salaryAcctRecordId;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
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;
|
||||
|
||||
|
||||
//主键id集合
|
||||
private Collection<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> salarySobIds;
|
||||
|
||||
/**
|
||||
* 建模id
|
||||
*/
|
||||
private Integer modeId;
|
||||
|
||||
/**
|
||||
* 模块名称
|
||||
*/
|
||||
private String modeName;
|
||||
|
||||
|
||||
/**
|
||||
* 数据库表
|
||||
*/
|
||||
@DataCheck(require = true, message = "数据库表为空")
|
||||
private String tableName;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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 = "推送记录id不能为空")
|
||||
private Long recordId;
|
||||
|
||||
private String name;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 推送记录id
|
||||
*/
|
||||
@ElogTransform(name = "推送记录id")
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 核算人员id
|
||||
*/
|
||||
@ElogTransform(name = "核算人员id")
|
||||
private Long acctEmpId;
|
||||
|
||||
/**
|
||||
* 执行状态
|
||||
* @see com.engine.salary.enums.push.PushRecordDetailStatusEnum
|
||||
*/
|
||||
@ElogTransform(name = "执行状态")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 失败原因
|
||||
*/
|
||||
@ElogTransform(name = "失败原因")
|
||||
private String fail_reason;
|
||||
|
||||
/**
|
||||
* 执行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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
/**
|
||||
* 推送配置id
|
||||
*/
|
||||
@ElogTransform(name = "推送配置id")
|
||||
private Long settingId;
|
||||
|
||||
/**
|
||||
* 建模id
|
||||
*/
|
||||
private Integer modeId;
|
||||
|
||||
/**
|
||||
* 数据库表名
|
||||
*/
|
||||
private String tableName;
|
||||
|
||||
|
||||
/**
|
||||
* 推送状态
|
||||
* @see PushRecordStatusEnum
|
||||
*/
|
||||
@ElogTransform(name = "推送状态")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 失败原因
|
||||
*/
|
||||
@ElogTransform(name = "失败原因")
|
||||
private String fail_reason;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
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;
|
||||
|
||||
/**
|
||||
* 租户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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -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<Long> 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<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -120,55 +120,36 @@ public class SalaryBillBO {
|
|||
/**
|
||||
* 构建工资单中的人员信息
|
||||
*
|
||||
* @param simpleEmployee
|
||||
*/
|
||||
public static void buildEmployeeInfo(SalaryBillSendDTO salaryBillSendParam, DataCollectionEmployee simpleEmployee) {
|
||||
public static void buildEmployeeInfo(SalaryBillSendDTO salaryBillSendParam, Map<String, Object> empInfo) {
|
||||
|
||||
SalaryTemplateSalaryItemSetListDTO employeeInformation = salaryBillSendParam.getEmployeeInformation();
|
||||
Map<String, String> 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<SalaryTemplateSalaryItemListDTO> items = employeeInformation.getItems();
|
||||
// 1.SalaryAcctResultBO.buildEmployeeFieldName()的取法
|
||||
// Set<Map.Entry<String, String>> entries = employeeField.entrySet();
|
||||
// for (SalaryTemplateSalaryItemListDTO e : items) {
|
||||
// Optional<Map.Entry<String, String>> 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class SalaryBillSendDTO {
|
|||
private String picUrl;
|
||||
|
||||
//扣缴义务人名称
|
||||
private String taxAgentName;
|
||||
// private String taxAgentName;
|
||||
|
||||
//工资单模板-薪资项目设置
|
||||
private List<SalaryTemplateSalaryItemSetListDTO> salaryItemSetList;
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ public class SalarySendDetailListDTO {
|
|||
|
||||
// 个税扣缴义务人")
|
||||
private String taxAgent;
|
||||
private Long taxAgentId;
|
||||
|
||||
// 部门")
|
||||
@I18n
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
// 工资单模板Id")
|
||||
// 工资单模板Id")
|
||||
// 工资单模板Id
|
||||
@SalaryTableColumn(text = "工资单模板id", 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<String> opts;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<String> opts;
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue