test

推送接口；
撤回接口；

resource/WEB-INF/prop/hrmSalary.properties

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

resource/WEB-INF/salaryoptconfig.xml

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

resource/sqlupgrade/DM/sql202409240201.sql

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

resource/sqlupgrade/DM/sql202409240302.sql

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

resource/sqlupgrade/DM/sql202409240403.sql

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

resource/sqlupgrade/DM/sql202411190103.sql

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

resource/sqlupgrade/DM/sql202504020203.sql

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

resource/sqlupgrade/DM/sql202504030103.sql

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

resource/sqlupgrade/GS/sql202409240201.sql

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

resource/sqlupgrade/GS/sql202409240302.sql

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

resource/sqlupgrade/GS/sql202409240403.sql

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

resource/sqlupgrade/GS/sql202411190103.sql

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

resource/sqlupgrade/GS/sql202504020203.sql

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

resource/sqlupgrade/GS/sql202504030103.sql

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

resource/sqlupgrade/JC/sql202409240201.sql

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

resource/sqlupgrade/JC/sql202409240302.sql

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

resource/sqlupgrade/JC/sql202409240403.sql

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

resource/sqlupgrade/JC/sql202411190103.sql

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

resource/sqlupgrade/JC/sql202504020203.sql

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

resource/sqlupgrade/JC/sql202504030103.sql

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

resource/sqlupgrade/Mysql/sql202409240201.sql

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

resource/sqlupgrade/Mysql/sql202409240302.sql

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

resource/sqlupgrade/Mysql/sql202409240403.sql

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

resource/sqlupgrade/Mysql/sql202411190103.sql

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

resource/sqlupgrade/Mysql/sql202504020203.sql

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

resource/sqlupgrade/Mysql/sql202504030103.sql

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

resource/sqlupgrade/Oracle/sql202409240201.sql

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

resource/sqlupgrade/Oracle/sql202409240302.sql

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

resource/sqlupgrade/Oracle/sql202409240403.sql

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

resource/sqlupgrade/Oracle/sql202411190103.sql

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

resource/sqlupgrade/Oracle/sql202504020203.sql

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

resource/sqlupgrade/Oracle/sql202504030103.sql

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

resource/sqlupgrade/PG/sql202409240201.sql

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

resource/sqlupgrade/PG/sql202409240302.sql

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

resource/sqlupgrade/PG/sql202409240403.sql

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

resource/sqlupgrade/PG/sql202411190103.sql

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

resource/sqlupgrade/PG/sql202504020203.sql

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

resource/sqlupgrade/PG/sql202504030103.sql

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

resource/sqlupgrade/SQLServer/sql202409240201.sql

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

resource/sqlupgrade/SQLServer/sql202409240302.sql

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

resource/sqlupgrade/SQLServer/sql202409240403.sql

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

resource/sqlupgrade/SQLServer/sql202411190103.sql

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

resource/sqlupgrade/SQLServer/sql202504020203.sql

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

resource/sqlupgrade/SQLServer/sql202504030103.sql

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

resource/sqlupgrade/ST/sql202409240201.sql

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

resource/sqlupgrade/ST/sql202409240302.sql

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

resource/sqlupgrade/ST/sql202409240403.sql

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

resource/sqlupgrade/ST/sql202411190103.sql

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

resource/sqlupgrade/ST/sql202504020203.sql

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

resource/sqlupgrade/ST/sql202504030103.sql

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

resource/wiki/常用查询.md

@@ -20,10 +20,27 @@ where item.name = '工资薪金合计'
 
 # 获取档案信息
 
- select i.item_value from hrsa_salary_archive_item i 
- left join hrsa_salary_archive a on a.id = i.salary_archive_id 
- left join hrsa_salary_item c on c.id=i.salary_item_id 
- left join hrsa_tax_agent t on a.tax_agent_id=t.id  
- where a.delete_type=0 and i.delete_type=0 and t.delete_type=0   and c.delete_type=0 
- and a.employee_id=人员id and t.name=扣缴义务人名称 
- and c.name='基本工资' order by effective_time desc
+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'
+

resource/wiki/薪酬还原脚本.sql

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

src/com/api/salary/web/AuthController.java

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

src/com/api/salary/web/PushController.java

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

src/com/engine/salary/annotation/Auth.java

@@ -0,0 +1,29 @@
+package com.engine.salary.annotation;
+
+import com.engine.salary.enums.auth.AuthCheckTypeEnum;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 权限验证字段
+ * <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";
+}

src/com/engine/salary/annotation/AuthField.java

@@ -0,0 +1,22 @@
+package com.engine.salary.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 权限验证字段
+ * <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();
+
+}

src/com/engine/salary/annotation/AuthOpt.java

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

src/com/engine/salary/biz/AddUpDeductionBiz.java

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

src/com/engine/salary/biz/AddUpSituationBiz.java

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

src/com/engine/salary/biz/SIAccountBiz.java

@@ -79,6 +79,7 @@ public class SIAccountBiz extends Service {
 
     private SIArchivesBiz siArchivesBiz = new SIArchivesBiz();
 
+
     private EncryptUtil encryptUtil = new EncryptUtil();
 
     private TaxAgentService getTaxAgentService() {

src/com/engine/salary/common/BaseQueryParam.java

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

src/com/engine/salary/config/SalaryElogConfig.java

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

src/com/engine/salary/constant/SalaryDefaultTenantConstant.java

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

src/com/engine/salary/entity/auth/dto/AuthDataDTO.java

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

src/com/engine/salary/entity/auth/dto/AuthLimitDTO.java

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

src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java

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

src/com/engine/salary/entity/auth/dto/AuthOptDTO.java

@@ -0,0 +1,77 @@
+package com.engine.salary.entity.auth.dto;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@XStreamAlias("config")
+public class AuthOptDTO {
+    @XStreamAlias("name")
+    @XStreamAsAttribute
+    private String name;
+
+    @XStreamAlias("key")
+    @XStreamAsAttribute
+    private String key;
+
+    @XStreamImplicit(itemFieldName = "module")
+    private List<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;
+            }
+        }
+    }
+}
+

src/com/engine/salary/entity/auth/dto/AuthRoleDTO.java

@@ -0,0 +1,53 @@
+package com.engine.salary.entity.auth.dto;
+
+import com.engine.salary.annotation.TableTitle;
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 角色
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthRoleDTO {
+
+    private Long id;
+
+    @TableTitle(title = "业务线", dataIndex = "name", key = "name")
+    private String name;
+
+    @TableTitle(title = "描述", dataIndex = "description", key = "description")
+    private String description;
+
+    /**
+     * 扣缴义务人资源
+     */
+    private List<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;
+
+
+}

src/com/engine/salary/entity/auth/dto/AuthRoleDataDTO.java

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

src/com/engine/salary/entity/auth/dto/AuthRoleEmpDTO.java

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

src/com/engine/salary/entity/auth/dto/AuthTreeDTO.java

@@ -0,0 +1,62 @@
+package com.engine.salary.entity.auth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthTreeDTO {
+    private Long roleEmpId;
+
+    private List<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;
+        }
+    }
+}
+

src/com/engine/salary/entity/auth/dto/EmpOpt.java

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

src/com/engine/salary/entity/auth/dto/Opt.java

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

src/com/engine/salary/entity/auth/dto/PermissionDTO.java

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

src/com/engine/salary/entity/auth/dto/RoleLimit.java

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

src/com/engine/salary/entity/auth/dto/SobOptAuth.java

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

src/com/engine/salary/entity/auth/dto/TaxEmpOptAuth.java

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

src/com/engine/salary/entity/auth/dto/TaxOptAuth.java

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

src/com/engine/salary/entity/auth/param/AuthDataQueryParam.java

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

src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java

@@ -0,0 +1,41 @@
+package com.engine.salary.entity.auth.param;
+
+
+import com.engine.salary.enums.auth.DataLinkEnum;
+import com.engine.salary.enums.auth.DataTargetTypeEnum;
+import com.engine.salary.util.valid.Modify;
+import com.engine.salary.util.valid.ModifyTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 数据
+ * <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;
+}

src/com/engine/salary/entity/auth/param/AuthMemberQueryParam.java

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

src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java

@@ -0,0 +1,29 @@
+package com.engine.salary.entity.auth.param;
+
+
+import com.engine.salary.enums.auth.MemberTargetTypeEnum;
+import com.engine.salary.util.valid.Modify;
+import com.engine.salary.util.valid.ModifyTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthMemberSaveParam {
+
+    private Long id;
+
+    private Long roleId;
+
+    private MemberTargetTypeEnum targetType;
+
+    @Modify(modifyType = ModifyTypeEnum.RESTORE_SQL)
+    private String target;
+
+    @Modify(modifyType = ModifyTypeEnum.RESTORE_SQL)
+    private String targetName;
+}

src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java

@@ -0,0 +1,26 @@
+package com.engine.salary.entity.auth.param;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthOptSaveParam {
+    private Long roleId;
+    private List<Opt> opts;
+
+    @Data
+    public static class Opt {
+
+        private String page;
+
+        private String opt;
+    }
+}

src/com/engine/salary/entity/auth/param/AuthRoleListQueryParam.java

@@ -0,0 +1,59 @@
+package com.engine.salary.entity.auth.param;
+
+import com.engine.salary.common.BaseQueryParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthRoleListQueryParam extends BaseQueryParam {
+
+    /**
+     * 业务线名称
+     */
+    private String name;
+
+    /**
+     * 业务线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;
+
+}

src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java

@@ -0,0 +1,44 @@
+package com.engine.salary.entity.auth.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import com.engine.salary.util.valid.RuntimeTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthRoleSaveParam {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @DataCheck(require = true, runtime = {RuntimeTypeEnum.UPDATE}, message = "id不允许为空")
+    private Long id;
+
+
+    @DataCheck(require = true, max = 40, message = "名称不允许为空,名称不能超过40个字符")
+    private String name;
+
+    @DataCheck(require = false, max = 400, message = "描述不能超过400个字符")
+    private String description;
+
+    /**
+     * 扣缴义务人资源
+     */
+    private List<TaxAgentPO> taxAgentIds;
+
+
+    /**
+     * 账套资源
+     */
+    private List<SalarySobPO> sobIds;
+
+}

src/com/engine/salary/entity/auth/param/AuthSyncParam.java

@@ -0,0 +1,17 @@
+package com.engine.salary.entity.auth.param;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthSyncParam {
+
+    private Long roleId;
+
+}

src/com/engine/salary/entity/auth/param/AuthTreeQueryParam.java

@@ -0,0 +1,28 @@
+package com.engine.salary.entity.auth.param;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthTreeQueryParam {
+
+    private Long roleEmpId;
+
+    private List<Long> roleIds;
+
+    private List<Long> employeeIds;
+
+    private List<String> pages;
+
+    private List<String> opts;
+
+
+}

src/com/engine/salary/entity/auth/po/AuthDataPO.java

@@ -0,0 +1,92 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import com.engine.salary.enums.auth.DataLinkEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 数据
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthDataPO {
+    @ElogTransform(name = "id")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    @ElogTransform(name = "角色id")
+    private Long roleId;
+
+    /**
+     * 连接符，交、并、补
+     * @see DataLinkEnum
+     */
+    @ElogTransform(name = "连接符，交、并、补")
+    private Integer link;
+
+    /**
+     * 数据类型，1：人员、2：部门、3：岗位、4：分部、5：角色、6：安全级别  、7：所有人 、8：登录人、9：账套、10：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;
+
+}

src/com/engine/salary/entity/auth/po/AuthMemberPO.java

@@ -0,0 +1,71 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 成员
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ElogTransform( name="成员" )
+public class AuthMemberPO {
+    private Long id;
+    /**
+     * 角色id
+     */
+    @ElogTransform( name="角色id" )
+    private Long roleId;
+    /**
+     * 对象类型，1：人员、2：部门、3：岗位、4：分部、5：角色、6：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;
+
+}

src/com/engine/salary/entity/auth/po/AuthOptPO.java

@@ -0,0 +1,75 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 权限项
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthOptPO {
+    @ElogTransform(name = "id")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    @ElogTransform(name = "角色id")
+    private Long roleId;
+
+    /**
+     * 页面
+     */
+    @ElogTransform(name = "页面")
+    private String page;
+
+    /**
+     * 权限项
+     */
+    @ElogTransform(name = "权限项")
+    private String opt;
+
+    /**
+     * 创建人
+     */
+    @ElogTransform(name = "创建人")
+    private Long creator;
+
+    /**
+     * 创建时间
+     */
+    @ElogTransform(name = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ElogTransform(name = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 是否已删除。0：未删除、1：已删除
+     */
+    @ElogTransform(name = "是否已删除。0：未删除、1：已删除")
+    private Integer deleteType;
+
+    /**
+     * 租户ID
+     */
+    @ElogTransform(name = "租户ID")
+    private String tenantKey;
+
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}

src/com/engine/salary/entity/auth/po/AuthResourcePO.java

@@ -0,0 +1,83 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 角色
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthResourcePO {
+
+
+    @ElogTransform(name = "")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    @ElogTransform(name = "角色id")
+    private Long roleId;
+
+    /**
+     * 对象类型，1：扣缴义务人 2：账套
+     */
+    @ElogTransform( name="对象类型" )
+    private Integer targetType;
+
+    /**
+     * 对象
+     */
+    @ElogTransform( name="对象" )
+    private Long target;
+
+    /**
+     * 对象
+     */
+    @ElogTransform( name="对象显示名" )
+    private String targetName;
+
+    /**
+     * 创建时间
+     */
+    @ElogTransform(name = "创建时间")
+    private Date createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @ElogTransform(name = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    @ElogTransform(name = "创建人")
+    private Long creator;
+
+    /**
+     * 是否已删除。0：未删除、1：已删除
+     */
+    @ElogTransform(name = "是否已删除。0：未删除、1：已删除")
+    private Integer deleteType;
+
+    /**
+     * 租户ID
+     */
+    @ElogTransform(name = "租户ID")
+    private String tenantKey;
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}

src/com/engine/salary/entity/auth/po/AuthRoleDataPO.java

@@ -0,0 +1,69 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 角色数据明细
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthRoleDataPO {
+    @ElogTransform(name = "id")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    @ElogTransform(name = "角色id")
+    private Long roleId;
+
+    /**
+     * 人员id
+     */
+    @ElogTransform(name = "人员id")
+    private Long employeeId;
+
+    /**
+     * 创建人
+     */
+    @ElogTransform(name = "创建人")
+    private Long creator;
+
+    /**
+     * 创建时间
+     */
+    @ElogTransform(name = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ElogTransform(name = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 是否已删除。0：未删除、1：已删除
+     */
+    @ElogTransform(name = "是否已删除。0：未删除、1：已删除")
+    private Integer deleteType;
+
+    /**
+     * 租户ID
+     */
+    @ElogTransform(name = "租户ID")
+    private String tenantKey;
+
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}

src/com/engine/salary/entity/auth/po/AuthRoleEmpPO.java

@@ -0,0 +1,61 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 角色
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthRoleEmpPO {
+    @ElogTransform(name = "")
+    private Long id;
+    /**
+     * 角色id
+     */
+    @ElogTransform(name = "角色id")
+    private Long roleId;
+    /**
+     * 人员id
+     */
+    @ElogTransform(name = "人员id")
+    private Long employeeId;
+    /**
+     * 创建人
+     */
+    @ElogTransform(name = "创建人")
+    private Long creator;
+    /**
+     * 创建时间
+     */
+    @ElogTransform(name = "创建时间")
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    @ElogTransform(name = "更新时间")
+    private Date updateTime;
+    /**
+     * 是否已删除。0：未删除、1：已删除
+     */
+    @ElogTransform(name = "是否已删除。0：未删除、1：已删除")
+    private Integer deleteType;
+    /**
+     * 租户ID
+     */
+    @ElogTransform(name = "租户ID")
+    private String tenantKey;
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}

src/com/engine/salary/entity/auth/po/AuthRolePO.java

@@ -0,0 +1,69 @@
+package com.engine.salary.entity.auth.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 角色
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ElogTransform(name = "业务线")
+public class AuthRolePO {
+
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ElogTransform(name = "名称")
+    private String name;
+
+    /**
+     * 描述
+     */
+    @ElogTransform(name = "描述")
+    private String description;
+
+    /**
+     * 创建人
+     */
+    @ElogTransform(name = "创建人")
+    private Long creator;
+
+    /**
+     * 创建时间
+     */
+    @ElogTransform(name = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ElogTransform(name = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 是否已删除。0：未删除、1：已删除
+     */
+    @ElogTransform(name = "是否已删除。0：未删除、1：已删除")
+    private Integer deleteType;
+
+    /**
+     * 租户ID
+     */
+    @ElogTransform(name = "租户ID")
+    private String tenantKey;
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}

src/com/engine/salary/entity/auth/vo/Permission.java

@@ -0,0 +1,40 @@
+package com.engine.salary.entity.auth.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Permission {
+    /**
+     * 是否开启了分权
+     */
+    private Boolean isOpenDevolution;
+
+    /**
+     * 是否总管理员
+     */
+    private Boolean isChief;
+
+    /**
+     * 是否扣缴义务人管理员
+     */
+    private Boolean isAdminEnable;
+
+    /**
+     * 当前页面是否有权限
+     */
+    private boolean able;
+
+    /**
+     * 权限项
+     */
+    private List<String> opts;
+
+}

src/com/engine/salary/entity/datacollection/AddUpSituation.java

@@ -1,9 +1,6 @@
 package com.engine.salary.entity.datacollection;
 
-import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.annotation.SalaryFormulaVar;
-import com.engine.salary.annotation.SalaryTable;
-import com.engine.salary.annotation.SalaryTableOperate;
+import com.engine.salary.annotation.*;
 import com.engine.hrmelog.annotation.ElogTransform;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,6 +10,7 @@ import lombok.NoArgsConstructor;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 数据采集-累计情况表
@@ -24,6 +22,7 @@ import java.util.List;
 @SalaryTable(pageId = "a4f83287-e3f9-4275-9527-7d06e54y6238", fields = "id,addUpSubtraction", operates = {@SalaryTableOperate(text = "删除",index = "0")})
 //hrsa_add_up_situation
 @ElogTransform(name = "往期累计情况")
+@Auth(page = "addUpSituation")
 public class AddUpSituation {
     /**
      * 主键id
@@ -234,4 +233,7 @@ public class AddUpSituation {
     Collection<Long> employeeIds;
     Collection<Long> taxAgentIds;
 
+
+    private Set<String> opts;
+
 }

src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java

@@ -1,14 +1,14 @@
 package com.engine.salary.entity.datacollection.bo;
 
+import cn.hutool.core.util.NumberUtil;
 import com.engine.core.impl.Service;
-import com.engine.salary.constant.SalaryArchiveConstant;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.datacollection.param.VariableArchiveImportHandleParam;
 import com.engine.salary.entity.datacollection.po.VariableArchiveItemPO;
 import com.engine.salary.entity.datacollection.po.VariableArchivePO;
 import com.engine.salary.entity.datacollection.po.VariableItemPO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO;
+import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryarchive.SalaryArchiveFieldTypeEnum;
 import com.engine.salary.util.SalaryI18nUtil;
@@ -23,7 +23,6 @@ import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.util.*;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -178,7 +177,7 @@ public class VariableArchiveExcelBO extends Service {
         // 个税扣缴义务人
         String taxAgentCellVal = Optional.ofNullable(map.get(taxAgentI18n)).orElse("").toString();
         map.put("taxAgent", taxAgentCellVal);
-        Optional<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 +185,12 @@ public class VariableArchiveExcelBO extends Service {
             isError = true;
             return isError;
         }
-        Long taxAgentId = optionalTaxAgent.get().getTaxAgentId();
+        Long taxAgentId = optionalTaxAgent.get().getId();
         map.put("taxAgentId", taxAgentId);
 
         // 用于初始化导入数据校验
         map.put("employeeId", employeeId);
-        String repeatKey = optionalTaxAgent.get().getTaxAgentId() + "-" + employeeId.toString();
+        String repeatKey = optionalTaxAgent.get().getId() + "-" + employeeId.toString();
         if (allTodoVariableArchives.contains(repeatKey)) {
             Map<String, String> errorMessageMap = Maps.newHashMap();
             errorMessageMap.put("message", rowindex + "存在重复数据");
@@ -232,7 +231,7 @@ public class VariableArchiveExcelBO extends Service {
                     if (optionalVariableItem.isPresent()) {
                         VariableItemPO variableItemPO = optionalVariableItem.get();
                         // 数值类型判断
-                        boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal);
+                        boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal);
                         if (isNotNumber) {
                             Map<String, String> errorMessageMap = Maps.newHashMap();
                             errorMessageMap.put("message", rowindex + key + numberErr);

src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java

@@ -9,6 +9,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Set;
+
 /**
  * 数据采集-累计专项附加扣除
  * <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;
 }

src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.Set;
 
 
 @Data
@@ -18,6 +19,7 @@ import java.util.Date;
 @AllArgsConstructor
 //数据采集-累计专项附加扣除记录
 @SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX)
+@Auth(page = "addUpDeduction")
 public class AddUpDeductionRecordDTO {
 
     //主键id
@@ -124,4 +126,6 @@ public class AddUpDeductionRecordDTO {
     @Encrypt
     private String addUpInfantCare;
 
+    private Set<String> opts;
+
 }

src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java

@@ -10,6 +10,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Set;
+
 /**
  * 数据采集-累计情况表
  */
@@ -20,6 +22,7 @@ import lombok.NoArgsConstructor;
 @SalaryTable(pageId = "a4f85287-e3f9-7841-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = {
         @SalaryTableOperate(text = "查看明细")
 })
+@Auth(page = "addUpSituation")
 public class AddUpSituationDTO {
     //主键id
     @JsonSerialize(using = ToStringSerializer.class)
@@ -215,5 +218,5 @@ public class AddUpSituationDTO {
 
     @SalaryTableColumn(text = "操作", width = "20%", column = "operate")
     @TableTitle(title = "操作", dataIndex = "operate", key = "operate")
-    private String operate;
+    private Set<String> opts;
 }