diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar
index 7589cfeae..ba4091f61 100644
Binary files a/resource/WEB-INF/lib/hrmelog.jar and b/resource/WEB-INF/lib/hrmelog.jar differ
diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties
index 55360c99a..f3380b545 100644
--- a/resource/WEB-INF/prop/hrmSalary.properties
+++ b/resource/WEB-INF/prop/hrmSalary.properties
@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.1.2503.01
+version=3.0.2.2510.01
 openFormulaForcedEditing=false
\ No newline at end of file
diff --git a/resource/sqlupgrade/DM/sql202411190103.sql b/resource/sqlupgrade/DM/sql202411190103.sql
index 1d13e52dd..a02da0e03 100644
--- a/resource/sqlupgrade/DM/sql202411190103.sql
+++ b/resource/sqlupgrade/DM/sql202411190103.sql
@@ -32,39 +32,3 @@ CREATE TABLE hrsa_push_setting_item
 );
 /
 
-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)
-);
-/
-
diff --git a/resource/sqlupgrade/DM/sql202504020203.sql b/resource/sqlupgrade/DM/sql202504020203.sql
index d54eff0ca..fb88e05b0 100644
--- a/resource/sqlupgrade/DM/sql202504020203.sql
+++ b/resource/sqlupgrade/DM/sql202504020203.sql
@@ -1,3 +1,39 @@
+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);
 /
 
diff --git a/resource/sqlupgrade/GS/sql202411190103.sql b/resource/sqlupgrade/GS/sql202411190103.sql
index 1d13e52dd..a02da0e03 100644
--- a/resource/sqlupgrade/GS/sql202411190103.sql
+++ b/resource/sqlupgrade/GS/sql202411190103.sql
@@ -32,39 +32,3 @@ CREATE TABLE hrsa_push_setting_item
 );
 /
 
-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)
-);
-/
-
diff --git a/resource/sqlupgrade/GS/sql202504020203.sql b/resource/sqlupgrade/GS/sql202504020203.sql
index d54eff0ca..fb88e05b0 100644
--- a/resource/sqlupgrade/GS/sql202504020203.sql
+++ b/resource/sqlupgrade/GS/sql202504020203.sql
@@ -1,3 +1,39 @@
+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);
 /
 
diff --git a/resource/sqlupgrade/JC/sql202411190103.sql b/resource/sqlupgrade/JC/sql202411190103.sql
index 1d13e52dd..a02da0e03 100644
--- a/resource/sqlupgrade/JC/sql202411190103.sql
+++ b/resource/sqlupgrade/JC/sql202411190103.sql
@@ -32,39 +32,3 @@ CREATE TABLE hrsa_push_setting_item
 );
 /
 
-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)
-);
-/
-
diff --git a/resource/sqlupgrade/JC/sql202504020203.sql b/resource/sqlupgrade/JC/sql202504020203.sql
index d54eff0ca..fb88e05b0 100644
--- a/resource/sqlupgrade/JC/sql202504020203.sql
+++ b/resource/sqlupgrade/JC/sql202504020203.sql
@@ -1,3 +1,39 @@
+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);
 /
 
diff --git a/resource/sqlupgrade/Mysql/sql202411190103.sql b/resource/sqlupgrade/Mysql/sql202411190103.sql
index fdfc32280..9ceb2c5b9 100644
--- a/resource/sqlupgrade/Mysql/sql202411190103.sql
+++ b/resource/sqlupgrade/Mysql/sql202411190103.sql
@@ -33,39 +33,3 @@ CREATE TABLE hrsa_push_setting_item
     PRIMARY KEY (id) USING BTREE
 );
 
-
-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
-);
\ No newline at end of file
diff --git a/resource/sqlupgrade/Mysql/sql202504020203.sql b/resource/sqlupgrade/Mysql/sql202504020203.sql
index f7f94d4b6..43798afc8 100644
--- a/resource/sqlupgrade/Mysql/sql202504020203.sql
+++ b/resource/sqlupgrade/Mysql/sql202504020203.sql
@@ -1,3 +1,39 @@
+CREATE TABLE hrsa_push_record
+(
+    id             bigint(0) NOT NULL,
+    name           varchar(200),
+    setting_id     bigint(0),
+    mode_id        int(0),
+    table_name     varchar(100),
+    acct_record_id bigint(0),
+    type           int(0),
+    status         int(0),
+    start_time     datetime(0),
+    end_time       datetime(0),
+    creator        bigint(0),
+    create_time    datetime(0),
+    update_time    datetime(0),
+    delete_type    int(0),
+    tenant_key     varchar(10),
+    PRIMARY KEY (id) USING BTREE
+);
+
+CREATE TABLE hrsa_push_record_detail
+(
+    id           bigint(0) NOT NULL,
+    record_id    bigint(0),
+    acct_emp_id  bigint(0),
+    formula text,
+    execute_time datetime(0),
+    status       int(0),
+    creator      bigint(0),
+    create_time  datetime(0),
+    update_time  datetime(0),
+    delete_type  int(0),
+    tenant_key   varchar(10),
+    PRIMARY KEY (id) USING BTREE
+);
+
 ALTER TABLE hrsa_push_record ADD COLUMN fail_reason varchar(4000);
 
 ALTER TABLE hrsa_push_record_detail ADD COLUMN fail_reason varchar(4000) ;
diff --git a/resource/sqlupgrade/Oracle/sql202411190103.sql b/resource/sqlupgrade/Oracle/sql202411190103.sql
index 09f3ee1bd..68b19ec3e 100644
--- a/resource/sqlupgrade/Oracle/sql202411190103.sql
+++ b/resource/sqlupgrade/Oracle/sql202411190103.sql
@@ -31,41 +31,4 @@ CREATE TABLE hrsa_push_setting_item
     delete_type number,
     tenant_key  varchar2(10)
 )
-/
-
-
-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)
-)
 /
\ No newline at end of file
diff --git a/resource/sqlupgrade/Oracle/sql202504020203.sql b/resource/sqlupgrade/Oracle/sql202504020203.sql
index ea71581d2..b6737d61f 100644
--- a/resource/sqlupgrade/Oracle/sql202504020203.sql
+++ b/resource/sqlupgrade/Oracle/sql202504020203.sql
@@ -1,5 +1,41 @@
-ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
+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)
+)
 /
 
-ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
+CREATE TABLE hrsa_push_record_detail
+(
+    id           NUMBER(38,0) NOT NULL,
+    record_id    NUMBER(38,0),
+    acct_emp_id  NUMBER(38,0),
+    formula CLOB,
+    execute_time date,
+    status       number,
+    creator      NUMBER(38,0),
+    create_time  date,
+    update_time  date,
+    delete_type  number,
+    tenant_key   varchar2(10)
+)
+/
+
+ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000)
+/
+
+ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000)
 /
\ No newline at end of file
diff --git a/resource/sqlupgrade/Oracle/sql202504030103.sql b/resource/sqlupgrade/Oracle/sql202504030103.sql
index 8c2ab620f..37869d261 100644
--- a/resource/sqlupgrade/Oracle/sql202504030103.sql
+++ b/resource/sqlupgrade/Oracle/sql202504030103.sql
@@ -1,5 +1,5 @@
-ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER;
+ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER
 /
 
-ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0);
+ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0)
 /
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202411190103.sql b/resource/sqlupgrade/PG/sql202411190103.sql
index 5f4272388..3874c397f 100644
--- a/resource/sqlupgrade/PG/sql202411190103.sql
+++ b/resource/sqlupgrade/PG/sql202411190103.sql
@@ -31,41 +31,4 @@ CREATE TABLE hrsa_push_setting_item
     delete_type int,
     tenant_key  varchar(10),
     PRIMARY KEY (id)
-);
-
-
-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)
 );
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202504020203.sql b/resource/sqlupgrade/PG/sql202504020203.sql
index adb7b31e2..6643f1adf 100644
--- a/resource/sqlupgrade/PG/sql202504020203.sql
+++ b/resource/sqlupgrade/PG/sql202504020203.sql
@@ -1,3 +1,39 @@
+CREATE TABLE hrsa_push_record
+(
+    id             bigint NOT NULL,
+    name           varchar(200),
+    setting_id     bigint,
+    mode_id        int,
+    table_name     varchar(100),
+    acct_record_id bigint,
+    type           int,
+    status         int,
+    start_time     timestamp,
+    end_time       timestamp,
+    creator        bigint,
+    create_time    timestamp,
+    update_time    timestamp,
+    delete_type    int,
+    tenant_key     varchar(10),
+    PRIMARY KEY (id)
+);
+
+CREATE TABLE hrsa_push_record_detail
+(
+    id            bigint NOT NULL,
+    record_id    bigint,
+    acct_emp_id  bigint,
+    formula text,
+    execute_time timestamp,
+    status       int,
+    creator      bigint,
+    create_time  timestamp,
+    update_time  timestamp,
+    delete_type  int,
+    tenant_key   varchar(10),
+    PRIMARY KEY (id)
+);
+
 alter table hrsa_push_record add fail_reason VARCHAR(4000) ;
 
 alter table hrsa_push_record_detail add fail_reason VARCHAR(4000) ;
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202411190103.sql b/resource/sqlupgrade/SQLServer/sql202411190103.sql
index dd06040a8..334e78b42 100644
--- a/resource/sqlupgrade/SQLServer/sql202411190103.sql
+++ b/resource/sqlupgrade/SQLServer/sql202411190103.sql
@@ -33,43 +33,4 @@ CREATE TABLE hrsa_push_setting_item
     tenant_key  varchar(10),
     PRIMARY KEY (id)
 )
-GO
-
-
-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
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202504020203.sql b/resource/sqlupgrade/SQLServer/sql202504020203.sql
index 312077f79..fbedb9edd 100644
--- a/resource/sqlupgrade/SQLServer/sql202504020203.sql
+++ b/resource/sqlupgrade/SQLServer/sql202504020203.sql
@@ -1,3 +1,41 @@
+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
 
diff --git a/resource/sqlupgrade/ST/sql202411190103.sql b/resource/sqlupgrade/ST/sql202411190103.sql
index 1d13e52dd..a02da0e03 100644
--- a/resource/sqlupgrade/ST/sql202411190103.sql
+++ b/resource/sqlupgrade/ST/sql202411190103.sql
@@ -32,39 +32,3 @@ CREATE TABLE hrsa_push_setting_item
 );
 /
 
-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)
-);
-/
-
diff --git a/resource/sqlupgrade/ST/sql202504020203.sql b/resource/sqlupgrade/ST/sql202504020203.sql
index d54eff0ca..fb88e05b0 100644
--- a/resource/sqlupgrade/ST/sql202504020203.sql
+++ b/resource/sqlupgrade/ST/sql202504020203.sql
@@ -1,3 +1,39 @@
+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);
 /
 
diff --git a/src/com/engine/salary/biz/SalarySendRangeObjBiz.java b/src/com/engine/salary/biz/SalarySendRangeObjBiz.java
index 05ccaaadb..53633dce6 100644
--- a/src/com/engine/salary/biz/SalarySendRangeObjBiz.java
+++ b/src/com/engine/salary/biz/SalarySendRangeObjBiz.java
@@ -7,6 +7,8 @@ import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeTaxAgentDTO;
 import com.engine.salary.mapper.salarybill.SalarySendRangeObjMapper;
 import com.engine.salary.service.TaxAgentService;
 import com.engine.salary.service.impl.TaxAgentServiceImpl;
+import com.engine.salary.util.db.MapperProxyFactory;
+import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
@@ -23,6 +25,10 @@ public class SalarySendRangeObjBiz {
         return ServiceUtil.getService(TaxAgentServiceImpl.class);
     }
 
+    private SalarySendRangeObjMapper getSalarySendRangeObjMapper() {
+        return MapperProxyFactory.getProxy(SalarySendRangeObjMapper.class);
+    }
+
     public  <R> R applyMapper(Function<SalarySendRangeObjMapper, R> mapper) {
         try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) {
             final SalarySendRangeObjMapper salarySendRangeObjMapper = sqlSession.getMapper(SalarySendRangeObjMapper.class);
@@ -41,7 +47,13 @@ public class SalarySendRangeObjBiz {
     }
 
     public List<SalarySendUserInfoDTO> getSalarySendUserInfoDTOs(List<Long> employees) {
-        List<SalarySendUserInfoDTO> userDTOs = applyMapper(mapper -> mapper.getUserInfoByEmployeeIds(employees));
+        List<SalarySendUserInfoDTO> userDTOs = new ArrayList<>();
+        List<List<Long>> partition = Lists.partition(employees, 500);
+        partition.forEach(l->{
+            List<SalarySendUserInfoDTO> userInfos = getSalarySendRangeObjMapper().getUserInfoByEmployeeIds(l);
+            userDTOs.addAll(userInfos);
+        });
+
         Map<Long, SalarySendUserInfoDTO> userMap = userDTOs.stream()
                 .collect(Collectors.toMap(SalarySendUserInfoDTO::getResourceId, Function.identity()));
 
diff --git a/src/com/engine/salary/entity/push/param/PushParam.java b/src/com/engine/salary/entity/push/param/PushParam.java
index f653c639b..36aefd747 100644
--- a/src/com/engine/salary/entity/push/param/PushParam.java
+++ b/src/com/engine/salary/entity/push/param/PushParam.java
@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 
 @Data
 @Builder
@@ -13,9 +15,6 @@ import lombok.NoArgsConstructor;
 public class PushParam {
 
 
-    private Long id;
-
-    private Long salaryAcctRecordId;
-
+    private List<Long> ids;
 
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/push/param/WithdrawParam.java b/src/com/engine/salary/entity/push/param/WithdrawParam.java
new file mode 100644
index 000000000..2535db525
--- /dev/null
+++ b/src/com/engine/salary/entity/push/param/WithdrawParam.java
@@ -0,0 +1,20 @@
+package com.engine.salary.entity.push.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WithdrawParam {
+
+
+    private List<Long> ids;
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/push/param/WithdrawPushParam.java b/src/com/engine/salary/entity/push/param/WithdrawPushParam.java
new file mode 100644
index 000000000..cc0915bc2
--- /dev/null
+++ b/src/com/engine/salary/entity/push/param/WithdrawPushParam.java
@@ -0,0 +1,29 @@
+package com.engine.salary.entity.push.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * 创建推送记录
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WithdrawPushParam {
+
+
+    private List<Long> ids;
+
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
index b36deb78b..aa32a8829 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
@@ -630,7 +630,8 @@ public class SalaryBillBO {
                     } else {
                         for (Object keyName : e.keySet()) {
                             if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
-                                boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString()))
+                                String itemValue = Util.null2String(e.get(keyName.toString()));
+                                boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue))
                                         ||
                                         (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString())
                                                 && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0);
@@ -641,7 +642,7 @@ public class SalaryBillBO {
                                     emailContent.append("</th>");
 
                                     emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
-                                    emailContent.append(e.get(keyName.toString()));
+                                    emailContent.append(itemValue.replaceAll("null", ""));
                                     emailContent.append("</td>");
                                 }
                                 break;
@@ -710,7 +711,8 @@ public class SalaryBillBO {
                     SalaryTemplateSalaryItemListDTO salaryItem = itemPartition.get(i);
                     for (Object keyName : e.keySet()) {
                         if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
-                            boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString()))
+                            String itemValue = Util.null2String(e.get(keyName.toString()));
+                            boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue))
                                     ||
                                     (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString())
                                             && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0);
@@ -721,7 +723,7 @@ public class SalaryBillBO {
                                 emailContent.append("</th>");
 
                                 emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
-                                emailContent.append(e.get(keyName.toString()));
+                                emailContent.append(itemValue.replaceAll("null", ""));
                                 emailContent.append("</td>");
                             }
                             break;
@@ -848,7 +850,7 @@ public class SalaryBillBO {
         if ("text".equals(wmClassify)) {
             wmTextFieldIds = (List<String>) salaryBillWatermark.getWmSetting().getOrDefault("wmSelectedFieldIds", Collections.emptyList());
 
-            List<String> empFields = Arrays.asList(HRM_Name, HRM_Num, HRM_Mobile, HRM_Email, HRM_CurrentOperatorId, HRM_Department);
+            List<String> empFields = Arrays.asList(HRM_Name, HRM_Num, HRM_Mobile, HRM_Email, HRM_CurrentOperatorId, HRM_Department, HRM_SecondDepartment);
             if (wmTextFieldIds.contains(HRM_SecondDepartment)) {
                 // 需要查分部
                 salaryBillWatermark.getWmSetting().put("needQuerySubDepart", true);
diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendBatParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendBatParam.java
new file mode 100644
index 000000000..40f529cc5
--- /dev/null
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendBatParam.java
@@ -0,0 +1,27 @@
+package com.engine.salary.entity.salaryBill.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 工资单批量操作参数
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySendBatParam {
+
+//    工资单发放Id
+    private List<Long> salarySendIds;
+
+}
diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java
index d5155f0ae..d5399daab 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java
@@ -1,5 +1,6 @@
 package com.engine.salary.entity.salaryacct.bo;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.salary.constant.TaxDeclarationDataIndexConstant;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
@@ -73,6 +74,9 @@ public class SalaryAcctConsolidatedTaxBO {
                     .filter(e -> Objects.equals(e.getSalaryItemId(), optional.get()))
                     .map(e -> SalaryEntityUtil.empty2Zero(e.getResultValue()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
+            if (StrUtil.isBlank(resultValue)) {
+                resultValue = "0.00";
+            }
             return new BigDecimal(resultValue).add(income).toPlainString();
         }
         // 个税调差为0
@@ -98,6 +102,9 @@ public class SalaryAcctConsolidatedTaxBO {
                         .map(e -> SalaryEntityUtil.empty2Zero(e.getResultValue()))
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
             }
+            if (StrUtil.isBlank(resultValue)) {
+                resultValue = "0.00";
+            }
             return new BigDecimal(resultValue).add(refundedOrSupplementedTax).subtract(taxAdjustment).toPlainString();
         }
         return resultValue;
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctBatParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctBatParam.java
new file mode 100644
index 000000000..63dc4310a
--- /dev/null
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctBatParam.java
@@ -0,0 +1,34 @@
+package com.engine.salary.entity.salaryacct.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 批量操作参数
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalaryAcctBatParam {
+
+    //薪资所属月
+    private Date salaryMonth;
+    //薪资账套id
+    private List<Long> salarySobIds;
+    //备注
+    private String description;
+
+
+    private List<Long> salaryAcctRecordIds;
+}
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java
index 52c3b7f13..d07b79a6b 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SalaryAcctCalculateParam {
+public class SalaryAcctCalculateParam  {
 
    //核算人员的id,不是employeeId而是salaryAcctEmpId
     private Collection<Long> ids;
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java
index b737f857e..8424aa765 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.YearMonth;
+import java.util.List;
 
 /**
  * 薪资核算列表查询参数
@@ -31,6 +32,11 @@ public class SalaryAcctRecordQueryParam extends BaseQueryParam {
     //账套名称")
     private String name;
 
+    /**
+     * 扣缴义务人id集合
+     */
+    private List<Long> taxAgentIds;
+
     private String startMonthStr;
     private String endMonthStr;
 }
diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
index b1a76a4a4..2daccbec2 100644
--- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
@@ -144,7 +144,7 @@ public class SalarySobItemAggregateBO {
                             .canEdit(openFormulaForcedEditing || Objects.equals(salaryItemPO.getCanEdit(), 1))
                             .canDelete(openFormulaForcedEditing || salaryItemPO.getCanDelete() == null || Objects.equals(salaryItemPO.getCanDelete(), 1))
                             .width(salaryItemPO.getWidth())
-                            .defaultValue(salaryItemPO.getDefaultValue())
+                            .defaultValue(salarySobItemPO.getDefaultValue())
                             .build());
                 }
             }
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java
index d0555321d..fc0094ba5 100644
--- a/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java
@@ -28,4 +28,6 @@ public class SalarySobQueryParam extends BaseQueryParam {
      * 数据过滤级别
      */
     private AuthFilterTypeEnum filterType;
+
+    private boolean isShare;
 }
diff --git a/src/com/engine/salary/entity/siaccount/param/AccountBatParam.java b/src/com/engine/salary/entity/siaccount/param/AccountBatParam.java
new file mode 100644
index 000000000..fa9de96fc
--- /dev/null
+++ b/src/com/engine/salary/entity/siaccount/param/AccountBatParam.java
@@ -0,0 +1,40 @@
+package com.engine.salary.entity.siaccount.param;
+
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AccountBatParam {
+
+    //账单月份")
+    //@NotNull
+    @DataCheck(require = true,message = "账单月份不能为空")
+    private String billMonth;
+
+    //备注")
+    //@Length(max = 60)
+    @DataCheck(max = 60,message = "备注长度不能超过60个字符")
+    private String remarks;
+
+
+    /**
+     * 个税扣缴义务人id
+     */
+    @DataCheck(require = true,message = "个税扣缴义务人不能为空")
+    private List<Long> paymentOrganizations;
+
+
+
+    private List<Long> ids;
+
+}
diff --git a/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java b/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java
index 410b0b2b4..1ac46a384 100644
--- a/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java
+++ b/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java
@@ -26,4 +26,6 @@ public class TaxAgentQueryParam extends BaseQueryParam {
 
     //个税扣缴义务人名称
     private String name;
+
+    private boolean isShare;
 }
diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java
index 5104871b5..94e015dd6 100644
--- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java
@@ -38,6 +38,10 @@ public class TaxDeclarationListDTO {
     @TableTitle(title = "薪资类型", dataIndex = "incomeCategory", key = "incomeCategory")
     private String incomeCategory;
 
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    @TableTitle(title = "税款所属期", dataIndex = "taxCycle", key = "taxCycle")
+    private Date taxCycle;
+
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @TableTitle(title = "薪资所属月", dataIndex = "salaryMonth", key = "salaryMonth")
     private Date salaryMonth;
@@ -48,10 +52,6 @@ public class TaxDeclarationListDTO {
     @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
     private String taxAgentName;
 
-    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
-    @TableTitle(title = "税款所属期", dataIndex = "taxCycle", key = "taxCycle")
-    private Date taxCycle;
-
     //@TableTitle(title = "操作人id", dataIndex = "operateEmployeeId", key = "operateEmployeeId")
     private Long operateEmployeeId;
 
diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java
new file mode 100644
index 000000000..0168f9c89
--- /dev/null
+++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java
@@ -0,0 +1,54 @@
+package com.engine.salary.entity.taxdeclaration.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.YearMonth;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 生成个税申报表参数
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TaxDeclarationBatParam {
+
+    /**
+     * 个税申报id
+     */
+    private Long taxDeclarationId;
+
+    /**
+     * 薪资所属月
+     */
+    private YearMonth salaryMonth;
+
+    /**
+     * 个税扣缴义务人
+     */
+    private List<Long> taxAgentIds;
+
+    /**
+     * 备注
+     */
+    private String description;
+
+    private String salaryMonthStr;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date taxCycle;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date salaryDate;
+}
diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
index 521fadd56..a7de714a9 100644
--- a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
+++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
@@ -1,9 +1,14 @@
 package com.engine.salary.entity.taxdeclaration.param;
 
 import com.engine.salary.common.BaseQueryParam;
-import lombok.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import java.time.YearMonth;
+
+import java.util.Date;
 
 /**
  * 个税申报记录查询条件
@@ -20,12 +25,13 @@ import java.time.YearMonth;
 public class TaxDeclarationListQueryParam extends BaseQueryParam {
 
     //薪资所属月范围起点
-    private YearMonth fromSalaryMonth;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date fromSalaryMonth;
 
-   //薪资所属月范围终点
-    private YearMonth endSalaryMonth;
+    //薪资所属月范围终点
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endSalaryMonth;
 
-    private String fromSalaryMonthStr;
-
-    private String endSalaryMonthStr;
+    //个税扣缴义务人菜单")
+    private String taxAgentName;
 }
diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
index 7a02a14d2..b667fb071 100644
--- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
@@ -90,6 +90,13 @@ public class TaxDeclarationPO {
     LocalDateRange salaryMonths;
 
 
+    //"开始日期
+    private Date taxCycleFromDate;
+
+    //结束日期
+    private Date taxCycleEndDate;
+
+
 
     private Collection<Long> taxAgentIds;
     private Set<String> opts;
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index f95e563df..51694405a 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -11,6 +11,7 @@
                e.workcode,
                e.certificatenum as idNo,
                e.accounttype as accountType,
+               e.sex as sex,
                'false' as extEmp
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
@@ -21,6 +22,7 @@
     <select id="getEmployeeByIds" resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
         select e.id as employeeId,
         e.lastname as username,
+        e.sex as sex,
         e.certificatenum as idNo,
         e.status as status,
         e.workcode as workcode,
@@ -42,6 +44,7 @@
             resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
         select e.id as employeeId,
         e.lastname as username,
+        e.sex as sex,
         e.certificatenum as idNo,
         e.status as status,
         e.workcode as workcode,
@@ -123,6 +126,7 @@
         select e.id as employeeId,
         e.lastname as username,
         e.status as status,
+        e.sex as sex,
         e.certificatenum as idNo,
         e.workcode as workcode,
         d.departmentname as departmentName,
@@ -229,6 +233,7 @@
         select e.id               as employeeId,
                e.lastname         as username,
                e.status           as status,
+               e.sex as sex,
                e.certificatenum   as idNo,
                e.workcode         as workcode,
                d.departmentname   as departmentName,
@@ -283,6 +288,7 @@
                e.lastname         as username,
                e.status           as status,
                e.workcode         as workcode,
+               e.sex as sex,
                e.certificatenum   as idNo,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
@@ -304,6 +310,7 @@
                e.status           as status,
                e.workcode         as workcode,
                e.certificatenum   as idNo,
+               e.sex as sex,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
                e.accounttype as accountType,
@@ -324,6 +331,7 @@
                e.status           as status,
                e.workcode         as workcode,
                e.certificatenum   as idNo,
+               e.sex as sex,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
                e.departmentid     as departmentId,
@@ -495,6 +503,7 @@
                e.lastname         as username,
                e.status           as status,
                e.certificatenum   as idNo,
+               e.sex as sex,
                e.workcode         as workcode,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
@@ -570,6 +579,7 @@
         e.lastname as username,
         e.status as status,
         e.certificatenum as idNo,
+        e.sex as sex,
         e.workcode as workcode,
         d.departmentname as departmentName,
         d.id as departmentId,
diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
index 7dc0600f2..571c026d6 100644
--- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
+++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
@@ -61,6 +61,12 @@
         <if test="salaryMonths != null and salaryMonths.endDate != null">
             AND salary_month <![CDATA[ <= ]]> #{salaryMonths.endDate}
         </if>
+        <if test="taxCycleFromDate != null">
+            AND tax_cycle <![CDATA[ >= ]]> #{taxCycleFromDate}
+        </if>
+        <if test="taxCycleEndDate != null">
+            AND tax_cycle <![CDATA[ <= ]]> #{taxCycleEndDate}
+        </if>
         <if test="taxAgentIds != null and taxAgentIds.size()>0">
             AND tax_agent_id IN
             <foreach collection="taxAgentIds" open="(" item="id" separator="," close=")">
diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsDataPerspectiveQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsDataPerspectiveQueryParam.java
index d0afd0c00..0d8303b72 100644
--- a/src/com/engine/salary/report/entity/param/SalaryStatisticsDataPerspectiveQueryParam.java
+++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsDataPerspectiveQueryParam.java
@@ -45,6 +45,9 @@ public class SalaryStatisticsDataPerspectiveQueryParam extends BaseQueryParam {
     //个税扣缴义务人配置
     private List<Long> taxAgent;
 
+    @JsonIgnore
+    private List<Long> salarySob;
+
     @JsonIgnore
     //收入所得项目配置
     private List<Integer> incomeCategory;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index c2d62d0a6..a894213bb 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -464,12 +464,21 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
         if (reportPO.getTaxAgentSetting() != null) {
             param.setTaxAgent(((List<Map>) JSON.parseArray(reportPO.getTaxAgentSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList()));
         }
+        if (reportPO.getSalarySobSetting() != null) {
+            param.setSalarySob(((List<Map>) JSON.parseArray(reportPO.getSalarySobSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList()));
+        }
         if (reportPO.getSubCompanySetting() != null) {
             param.setSubCompany(((List<Map>) JSON.parseArray(reportPO.getSubCompanySetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList()));
         }
         if (reportPO.getDepartSetting() != null) {
             param.setDepart(((List<Map>) JSON.parseArray(reportPO.getDepartSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList()));
         }
+        if (reportPO.getPositionSetting() != null) {
+            param.setPosition(((List<Map>) JSON.parseArray(reportPO.getPositionSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList()));
+        }
+        if (reportPO.getStatusSetting() != null) {
+            param.setStatus(((List<Map>) JSON.parseArray(reportPO.getStatusSetting(), Map.class)).stream().map(m -> m.get(key).toString()).collect(Collectors.toList()));
+        }
         if (reportPO.getEmployeeSetting() != null) {
             param.setEmployee(((List<Map>) JSON.parseArray(reportPO.getEmployeeSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList()));
         }
@@ -499,7 +508,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
             List<Long> finalSalaryAcctEmpIds = getSalaryAcctResultService(user).listAcctEmpIdByAcctEmpId(salaryAcctEmployeeIds);
             Map<Long, List<SalaryAcctResultPO>> salaryAcctEmpResultMap = SalaryEntityUtil.group2Map(salaryAcctResultValues, SalaryAcctResultPO::getSalaryAcctEmpId);
             salaryAcctEmpResultMap.forEach((k, v) -> {
-                Map<String, String> collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), SalaryAcctResultPO::getResultValue, (key1, key2) -> key2));
+                Map<String, String> collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2String(p.getResultValue()), (key1, key2) -> key2));
                 resultMap.put(k, collect);
             });
             salaryAcctEmployeeIds.stream().forEach(id -> {
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index 3a5efdb87..2a4bdd282 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -334,7 +334,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
                     sumRow.add(Util.null2String(countResult.get(weaTableColumnGroup.getColumn())));
                 }
             } else {
-                sumRow.add(Util.null2String(countResult.get(weaTableColumnGroup.getColumn())));
+                sumRow.add("");
             }
         }
         rowList.add(sumRow);
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 7d0d48d53..d92d62957 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -303,6 +303,7 @@ public class SalaryStatisticsReportWrapper extends Service {
             // 如果是被分享的报表，校验分享权限，通过后将user赋值为报表创建人
             User creator = new User();
             creator.setUid(po.getCreator().intValue());
+            creator.setLogintype("1");
             user = creator;
         } else {
             // 判断报表是否是登陆人创建的,或薪酬总管理员
diff --git a/src/com/engine/salary/service/SIAccountService.java b/src/com/engine/salary/service/SIAccountService.java
index 55a578556..e299c15f0 100644
--- a/src/com/engine/salary/service/SIAccountService.java
+++ b/src/com/engine/salary/service/SIAccountService.java
@@ -324,5 +324,13 @@ public interface SIAccountService {
     void deleteSocialAcctEmp(SaveCommonAccountParam param);
 
     String addSocialAcctEmp(SaveCommonAccountParam param);
+
+    void batSave(AccountBatParam param);
+
+    void batDelete(AccountBatParam param);
+
+    void batFile(AccountBatParam param);
+
+    void batSocialSecurityBenefitsRecalculate(AccountBatParam batParam);
 }
 
diff --git a/src/com/engine/salary/service/SalaryAcctRecordService.java b/src/com/engine/salary/service/SalaryAcctRecordService.java
index fcf00580b..603e2a164 100644
--- a/src/com/engine/salary/service/SalaryAcctRecordService.java
+++ b/src/com/engine/salary/service/SalaryAcctRecordService.java
@@ -1,6 +1,7 @@
 package com.engine.salary.service;
 
 import com.engine.salary.common.LocalDateRange;
+import com.engine.salary.entity.salaryacct.param.SalaryAcctBatParam;
 import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;
 import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordSaveParam;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
@@ -210,4 +211,11 @@ public interface SalaryAcctRecordService {
     List<SalaryAcctRecordPO> listSome(SalaryAcctRecordPO po);
 
     void updateDate(Long id, Date updateTime);
+
+    void batSave(SalaryAcctBatParam saveParam);
+
+    void batFile(SalaryAcctBatParam param);
+
+    void batReCalculate(SalaryAcctBatParam param);
+
 }
diff --git a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java
index 582887859..2f9259b60 100644
--- a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java
+++ b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java
@@ -21,6 +21,7 @@ import com.engine.salary.mapper.auth.AuthRoleMapper;
 import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -156,7 +157,7 @@ public class AuthDataServiceImpl extends Service implements AuthDataService {
     public List<AuthRoleDataDTO> listRoleData( AuthDataQueryParam param) {
         List<AuthRoleDataDTO> authRoleDataDTOS = getAuthRoleDataMapper().listRoleData(param.getRoleId());
         if (StrUtil.isNotEmpty(param.getUsername())){
-            authRoleDataDTOS = authRoleDataDTOS.stream().filter(authRoleDataDTO -> authRoleDataDTO.getUsername().contains(param.getUsername())).collect(Collectors.toList());
+            authRoleDataDTOS = authRoleDataDTOS.stream().filter(authRoleDataDTO -> StringUtils.isNotBlank(authRoleDataDTO.getUsername()) && authRoleDataDTO.getUsername().contains(param.getUsername())).collect(Collectors.toList());
         }
         return authRoleDataDTOS;
     }
diff --git a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
index 6cba5f99a..ad97609ed 100644
--- a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
+++ b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
@@ -24,6 +24,7 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -196,7 +197,7 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService
     public List<AuthRoleEmpDTO> listRoleEmp(AuthMemberQueryParam param) {
         List<AuthRoleEmpDTO> empDTOS = getAuthRoleEmpMapper().getByRoleId(param.getRoleId());
         if(StrUtil.isNotEmpty(param.getUsername())){
-            empDTOS =  empDTOS.stream().filter(item -> item.getUsername().contains(param.getUsername())).collect(Collectors.toList());
+            empDTOS =  empDTOS.stream().filter(item -> StringUtils.isNotBlank(item.getUsername()) && item.getUsername().contains(param.getUsername())).collect(Collectors.toList());
         }
 
         return empDTOS;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index 79451855e..e1b1945dc 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -275,7 +275,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
                     .collect(Collectors.toList());
 
             effectiveFields.forEach(attendQuoteField -> {
-                        header.add(attendQuoteField.getFieldName());
+                        header.add(Util.formatMultiLang(attendQuoteField.getFieldName(), String.valueOf(user.getLanguage())));
                     }
             );
         }
@@ -608,7 +608,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
             header.add(SalaryI18nUtil.getI18nLabel(86317, "证件号码"));
             // 动态列
             for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
-                header.add(attendQuoteField.getFieldName());
+                header.add(Util.formatMultiLang(attendQuoteField.getFieldName(), String.valueOf(user.getLanguage())));
             }
             List<List<Object>> rows = new ArrayList<>();
             rows.add(header);
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index 2448254f9..9ddab6625 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -27,6 +27,7 @@ import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
+import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.util.*;
@@ -292,7 +293,7 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
                 Map<String, String> column = columnsOptional.get();
                 updates.add(AttendQuoteFieldPO.builder()
                         .code(column.get("code"))
-                        .fieldName(column.get("name"))
+                        .fieldName(Util.formatMultiLang(column.get("name"), String.valueOf(user.getLanguage())))
                         .updateTime(now)
                         .build());
             }
@@ -312,7 +313,7 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
             Optional<Map<String, String>> columnsOptional = columns.stream().filter(column -> code.equals(column.get("code"))).findFirst();
             if (columnsOptional.isPresent()) {
                 Map<String, String> column = columnsOptional.get();
-                saves.add(buildAttendQuoteField(column.get("code"), column.get("name")));
+                saves.add(buildAttendQuoteField(column.get("code"), Util.formatMultiLang(column.get("name"), String.valueOf(user.getLanguage()))));
             }
         }
         if (CollectionUtils.isNotEmpty(saves)) {
diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java
index cf01efde8..8996e88ad 100644
--- a/src/com/engine/salary/service/impl/PushServiceImpl.java
+++ b/src/com/engine/salary/service/impl/PushServiceImpl.java
@@ -112,16 +112,16 @@ public class PushServiceImpl extends Service implements PushService {
         Map<Long, SalarySobPO> sobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId);
 
         List<PushSettingDTO> list = pushSettingPOS.stream()
-                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName())).map(
-                        po -> PushSettingDTO.builder()
-                                .id(po.getId())
-                                .name(po.getName())
-                                .tableName(po.getTableName())
-                                .modeName(po.getModeName())
-                                .modeId(po.getModeId())
-                                .able(po.getAble())
-                                .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
-                                .build()).collect(Collectors.toList());
+                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
+                .map(po -> PushSettingDTO.builder()
+                        .id(po.getId())
+                        .name(po.getName())
+                        .tableName(po.getTableName())
+                        .modeName(po.getModeName())
+                        .modeId(po.getModeId())
+                        .able(po.getAble())
+                        .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
+                        .build()).collect(Collectors.toList());
         return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, PushSettingDTO.class);
     }
 
@@ -526,8 +526,9 @@ public class PushServiceImpl extends Service implements PushService {
     @Override
     public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) {
         List<PushRecordPO> pushRecordPOS = getPushRecordMapper().listAll();
-        List<PushRecordDTO> listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordPOS)
+        List<PushRecordDTO> listDTOS = pushRecordPOS
                 .stream()
+                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
                 .map(po -> PushRecordDTO.builder()
                         .id(po.getId())
                         .name(po.getName())
@@ -544,7 +545,6 @@ public class PushServiceImpl extends Service implements PushService {
                 .collect(Collectors.toList());
 
         PageInfo<PushRecordDTO> pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDTO.class);
-        pageInfo.setTotal(pushRecordPOS.size());
         return pageInfo;
     }
 
diff --git a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java
index 8a447abba..7c2262f15 100644
--- a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java
@@ -36,6 +36,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.lang.reflect.Field;
@@ -483,7 +484,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic
         List<FormulaVar> formulaVars = fields.stream().map(e -> {
             FormulaVar formulaVar = new FormulaVar();
             formulaVar.setFieldId(referenceEnum.getValue() + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR + e.getId());
-            formulaVar.setName(e.getFieldName());
+            formulaVar.setName(Util.formatMultiLang(e.getFieldName(), String.valueOf(user.getLanguage())));
             formulaVar.setSource("" + referenceEnum.getValue());
             formulaVar.setFieldType(DataType.NUMBER);
             return formulaVar;
diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
index 79f3ee877..39d4116b7 100644
--- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
@@ -172,7 +172,8 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar
         List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
         List<Long> canAccountIds = baseInfoPOList.stream()
                 .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
-                        && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
+                        && !f.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())
+                )
                 .map(InsuranceArchivesBaseInfoPO::getEmployeeId)
                 .collect(Collectors.toList());
         accountExportPOS = accountExportPOS.stream().filter(v -> canAccountIds.contains(v.getEmployeeId())).collect(Collectors.toList());
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 01aec157f..8d97dbeaf 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -6719,6 +6719,55 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(welfareNames));
     }
 
+    @Override
+    public void batSave(AccountBatParam accountBatParam) {
+        List<Long> paymentOrganizations = accountBatParam.getPaymentOrganizations();
+        for (Long paymentOrganization : paymentOrganizations) {
+            AccountParam param = AccountParam.builder()
+                    .billMonth(accountBatParam.getBillMonth())
+                    .paymentOrganization(paymentOrganization)
+                    .flag(true)
+                    .remarks(accountBatParam.getRemarks())
+                    .build();
+            save(param);
+        }
+    }
+
+    @Override
+    public void batDelete(AccountBatParam batParam) {
+        List<Long> ids = batParam.getIds();
+        for (Long id : ids) {
+            InsuranceAccountBatchPO po = getInsuranceAccountBatchMapper().getById(id);
+            AccountParam param = AccountParam.builder()
+                    .billMonth(po.getBillMonth())
+                    .paymentOrganization(po.getPaymentOrganization())
+                    .build();
+            delete(param);
+        }
+    }
+
+    @Override
+    public void batFile(AccountBatParam batParam) {
+        List<Long> ids = batParam.getIds();
+        for (Long id : ids) {
+            InsuranceAccountBatchPO po = getInsuranceAccountBatchMapper().getById(id);
+            AccountParam param = AccountParam.builder()
+                    .billMonth(po.getBillMonth())
+                    .paymentOrganization(po.getPaymentOrganization())
+                    .build();
+            file(param);
+        }
+    }
+
+    @Override
+    public void batSocialSecurityBenefitsRecalculate(AccountBatParam batParam) {
+        List<Long> ids = batParam.getIds();
+        for (Long id : ids) {
+            InsuranceAccountBatchPO param = InsuranceAccountBatchPO.builder().id(id).build();
+            socialSecurityBenefitsRecalculate(param);
+        }
+    }
+
     public void accountOtherView(InsuranceAccountViewListDTO dto, List<InsuranceAccountDetailPO> pos) {
         int otherNum = 0;
         BigDecimal otherPaySum = new BigDecimal("0");
diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
index c77ff7375..ba0f7df9a 100644
--- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
@@ -2770,12 +2770,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 if (otherPaymentBaseString != null) {
                     updateOtherInfo.setOtherPaymentBaseString(otherPaymentBaseString);
                 }
+                if (!welBaseDiffSign) {
+                    otherPaymentBaseString = adaptWelBaseLimit(updateOtherInfo.getOtherSchemeId(), updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                    if (otherPaymentBaseString != null) {
+                        updateOtherInfo.setOtherPaymentBaseString(otherPaymentBaseString);
+                    }
+                }
             } else {
                 StringBuilder errorMsg = new StringBuilder("");
                 if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg)) {
                     // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
                     combineErrorMsg = "其他福利个人： " + errorMsg;
                 }
+                if ( (!welBaseDiffSign) && (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg))) {
+                    // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
+                    combineErrorMsg = "其他福利公司： " + errorMsg;
+                }
             }
             //需要拆分个人和公司福利基数时
             if (welBaseDiffSign) {
@@ -2841,12 +2851,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 if (otherPaymentBaseString != null) {
                     insertOtherInfo.setOtherPaymentBaseString(otherPaymentBaseString);
                 }
+                if (!welBaseDiffSign) {
+                    otherPaymentBaseString = adaptWelBaseLimit(insertOtherInfo.getOtherSchemeId(), insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                    if (otherPaymentBaseString != null) {
+                        insertOtherInfo.setOtherPaymentBaseString(otherPaymentBaseString);
+                    }
+                }
             } else {
                 StringBuilder errorMsg = new StringBuilder("");
                 if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg)) {
                     // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
                     combineErrorMsg = "其他福利个人：" + errorMsg;
                 }
+                if ( (!welBaseDiffSign) && (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg))) {
+                    // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
+                    combineErrorMsg = "其他福利公司：" + errorMsg;
+                }
             }
             //需要拆分个人和公司福利基数时
             if (welBaseDiffSign) {
@@ -2981,12 +3001,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 if (fundPaymentBaseString != null) {
                     updateFundInfo.setFundPaymentBaseString(fundPaymentBaseString);
                 }
+                if (!welBaseDiffSign) {
+                    fundPaymentBaseString = adaptWelBaseLimit(updateFundInfo.getFundSchemeId(), updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                    if (fundPaymentBaseString != null) {
+                        updateFundInfo.setFundPaymentBaseString(fundPaymentBaseString);
+                    }
+                }
             } else {
                 StringBuilder errorMsg = new StringBuilder("");
                 if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg)) {
                     // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
                     combineErrorMsg = "公积金个人" + errorMsg;
                 }
+                if ( (!welBaseDiffSign) && (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg))) {
+                    // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
+                    combineErrorMsg = "公积金公司" + errorMsg;
+                }
             }
 
             //需要拆分个人和公司福利基数时
@@ -3057,12 +3087,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 if (fundPaymentBaseString != null) {
                     insertFundInfo.setFundPaymentBaseString(fundPaymentBaseString);
                 }
+                if (!welBaseDiffSign) {
+                    fundPaymentBaseString = adaptWelBaseLimit(insertFundInfo.getFundSchemeId(), insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                    if (fundPaymentBaseString != null) {
+                        insertFundInfo.setFundPaymentBaseString(fundPaymentBaseString);
+                    }
+                }
             } else {
                 StringBuilder errorMsg = new StringBuilder("");
                 if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg)) {
                     // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
                     combineErrorMsg = "公积金个人：" + errorMsg;
                 }
+                if ((!welBaseDiffSign) && (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg))) {
+                    // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
+                    combineErrorMsg = "公积金公司：" + errorMsg;
+                }
             }
 
             //需要拆分个人和公司福利基数时
@@ -3204,12 +3244,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 if (socialPaymentBaseString != null) {
                     updateSocialInfo.setSocialPaymentBaseString(socialPaymentBaseString);
                 }
+                if (!welBaseDiffSign) {
+                    socialPaymentBaseString = adaptWelBaseLimit(updateSocialInfo.getSocialSchemeId(), updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                    if (socialPaymentBaseString != null) {
+                        updateSocialInfo.setSocialPaymentBaseString(socialPaymentBaseString);
+                    }
+                }
             } else {
                 StringBuilder errorMsg = new StringBuilder("");
                 if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg)) {
                     // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
                     combineErrorMsg = "社保个人：" + errorMsg;
                 }
+                if ((!welBaseDiffSign) && (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg))) {
+                    // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
+                    combineErrorMsg = "社保公司：" + errorMsg;
+                }
             }
 
             //需要拆分个人和公司福利基数时
@@ -3279,12 +3329,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 if (socialPaymentBaseString != null) {
                     insertSocialInfo.setSocialPaymentBaseString(socialPaymentBaseString);
                 }
+                if (!welBaseDiffSign) {
+                    socialPaymentBaseString = adaptWelBaseLimit(insertSocialInfo.getSocialSchemeId(), insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                    if (socialPaymentBaseString != null) {
+                        insertSocialInfo.setSocialPaymentBaseString(socialPaymentBaseString);
+                    }
+                }
             } else {
                 StringBuilder errorMsg = new StringBuilder("");
                 if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg)) {
                     // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
                     combineErrorMsg = "社保个人：" + errorMsg;
                 }
+                if ((!welBaseDiffSign) && (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg))) {
+                    // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"));
+                    combineErrorMsg = "社保公司：" + errorMsg;
+                }
             }
             //需要拆分个人和公司福利基数时
             if (welBaseDiffSign) {
@@ -4028,7 +4088,12 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
         if (org.apache.commons.collections.CollectionUtils.isEmpty(employeeIds)) {
             return Collections.emptyList();
         }
-        return getInsuranceBaseInfoMapper().listEndDateIsNull(employeeIds);
+        List<InsuranceArchivesBaseInfoPO> resultList = new ArrayList<>();
+        List<List<Long>> partition = Lists.partition(employeeIds, 500);
+        partition.forEach(part -> {
+            resultList.addAll(getInsuranceBaseInfoMapper().listEndDateIsNull(part));
+        });
+        return resultList;
     }
 
     /**
diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
index a6c4cb5d8..276a39af7 100644
--- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
@@ -1,7 +1,6 @@
 package com.engine.salary.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alipay.oceanbase.jdbc.StringUtils;
 import com.cloudstore.eccom.pc.table.WeaTable;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.engine.common.util.ServiceUtil;
@@ -41,6 +40,7 @@ import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.Column;
 import com.google.common.collect.Lists;
 import com.engine.salary.util.db.IdGenerator;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import weaver.hrm.User;
 
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index cef8f80b8..0484a1079 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -1409,6 +1409,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
 
             Boolean otherCheckBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue(), errorMsg);
 
+            Boolean socialCheckBase2 = true;
+            Boolean fundCheckBase2 = true;
+            Boolean otherCheckBase2 = true;
+            if (!welBaseDiffSign) {
+                socialCheckBase2 = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg);
+                fundCheckBase2 = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg);
+                otherCheckBase2 = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg);
+            }
             Boolean socialCheckComBase = true;
             Boolean fundCheckComBase = true;
             Boolean otherCheckComBase = true;
@@ -1417,17 +1425,17 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
                 fundCheckComBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg);
                 otherCheckComBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue(), errorMsg);
             }
-            if (socialCheckBase && fundCheckBase && otherCheckBase && socialCheckComBase && fundCheckComBase && otherCheckComBase) {
+            if (socialCheckBase && fundCheckBase && otherCheckBase && socialCheckBase2 && fundCheckBase2 && otherCheckBase2 && socialCheckComBase && fundCheckComBase && otherCheckComBase) {
                 insuranceArchivesAccountPOS.add(insuranceArchivesAccountPO);
             } else {
                 String checkMessage = "该条数据中";
-                if (!socialCheckBase || !socialCheckComBase) {
+                if (!socialCheckBase || !socialCheckBase2 || !socialCheckComBase) {
                     checkMessage = checkMessage + "社保福利基数、";
                 }
-                if (!fundCheckBase || !fundCheckComBase) {
+                if (!fundCheckBase || !fundCheckBase2 || !fundCheckComBase) {
                     checkMessage = checkMessage + "公积金福利基数、";
                 }
-                if (!otherCheckBase || !otherCheckComBase) {
+                if (!otherCheckBase || !otherCheckBase2 || !otherCheckComBase) {
                     checkMessage = checkMessage + "其他福利基数、";
                 }
                 checkMessage = checkMessage.substring(0, checkMessage.length() - 1);
@@ -1447,6 +1455,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
             insuranceArchivesSocialSchemePO.setSocialPaymentBaseString(newSocialPaymentBaseString);
             insuranceArchivesFundSchemePO.setFundPaymentBaseString(newFundPaymentBaseString);
             insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(newOtherPaymentBaseString);
+            if (!welBaseDiffSign) {
+                newSocialPaymentBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                newFundPaymentBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                newOtherPaymentBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
+                insuranceArchivesSocialSchemePO.setSocialPaymentBaseString(newSocialPaymentBaseString);
+                insuranceArchivesFundSchemePO.setFundPaymentBaseString(newFundPaymentBaseString);
+                insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(newOtherPaymentBaseString);
+            }
 
             if (welBaseDiffSign) {
                 String newSocialPaymentComBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue());
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index d45e179fe..b64bc1dee 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -409,11 +409,13 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) {
             total = true;
             Map<String, Object> sumRow = getSalaryAcctResultService(user).sumRow(queryParam);
-            sumRow.forEach((k, v) -> {
-                if (NumberUtils.isCreatable(v.toString())) {
-                    sumRow.put(k, new BigDecimal(v.toString()));
-                }
-            });
+            if (sumRow != null) {
+                sumRow.forEach((k, v) -> {
+                    if (NumberUtils.isCreatable(v.toString())) {
+                        sumRow.put(k, new BigDecimal(v.toString()));
+                    }
+                });
+            }
             if (sumRow != null) {
                 sumRow.put("taxAgentName", "总计");
                 resultMapList.add(sumRow);
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index c451f0f67..254208b86 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.api.formmode.mybatis.util.SqlProxyHandle;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
@@ -8,6 +9,7 @@ import com.engine.salary.common.LocalDateRange;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.salary.entity.salaryBill.po.SalarySendPO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO;
+import com.engine.salary.entity.salaryacct.param.SalaryAcctBatParam;
 import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;
 import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordSaveParam;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
@@ -42,6 +44,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import weaver.hrm.User;
 
+import java.time.YearMonth;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -187,6 +190,21 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
             Set<Long> salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId);
             po.setSalarySobIds(salarySobIds);
         }
+        if (CollUtil.isNotEmpty(queryParam.getTaxAgentIds())) {
+            List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentIds(queryParam.getTaxAgentIds());
+            if (CollectionUtils.isEmpty(salarySobPOS)) {
+                return page;
+            }
+            Set<Long> salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId);
+
+            Collection<Long> existIds = po.getSalarySobIds();
+            if (CollectionUtils.isNotEmpty(existIds)) {
+                existIds = SalaryEntityUtil.intersectionForList(existIds, salarySobIds);
+                po.setSalarySobIds(existIds);
+            } else {
+                po.setSalarySobIds(salarySobIds);
+            }
+        }
         LocalDateRange localDateRange = new LocalDateRange();
         if (Objects.nonNull(queryParam.getStartMonth())) {
             localDateRange.setFromDate(SalaryDateUtil.localDateToDate(queryParam.getStartMonth().atDay(1)));
@@ -804,6 +822,40 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
 
     @Override
     public void updateDate(Long id, Date updateTime) {
-        getSalaryAcctRecordMapper().updateDate(id,updateTime);
+        getSalaryAcctRecordMapper().updateDate(id, updateTime);
+    }
+
+    @Override
+    public void batSave(SalaryAcctBatParam saveParam) {
+
+        List<Long> salarySobIds = saveParam.getSalarySobIds();
+        YearMonth salaryMonth = SalaryDateUtil.localDate2YearMonth(saveParam.getSalaryMonth());
+        for (int i = 0; i < salarySobIds.size(); i++) {
+            Long salarySobId = salarySobIds.get(i);
+            SalaryAcctRecordSaveParam param = SalaryAcctRecordSaveParam.builder()
+                    .salarySobId(salarySobId)
+                    .salaryMonth(salaryMonth)
+                    .description(saveParam.getDescription())
+                    .build();
+            save(param);
+        }
+    }
+
+    @Override
+    public void batFile(SalaryAcctBatParam param) {
+        List<Long> salaryAcctRecordIds = param.getSalaryAcctRecordIds();
+        for (int i = 0; i < salaryAcctRecordIds.size(); i++) {
+            Long recordId = salaryAcctRecordIds.get(i);
+            file(recordId);
+        }
+    }
+
+    @Override
+    public void batReCalculate(SalaryAcctBatParam param) {
+        List<Long> salaryAcctRecordIds = param.getSalaryAcctRecordIds();
+        for (int i = 0; i < salaryAcctRecordIds.size(); i++) {
+            Long recordId = salaryAcctRecordIds.get(i);
+            reCalculate(recordId);
+        }
     }
 }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 8a28081d2..04153b970 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -1053,7 +1053,14 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
 
     @Override
     public void updateLockStatusByParam(SalaryAcctResultUpdateLockStatusParam updateParam) {
-        List<SalaryAcctEmployeePO> salaryAcctEmployees = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(updateParam.getSalaryAcctRecordId());
+        Set<Long> acctEmpIds = updateParam.getAcctEmpIds();
+        List<SalaryAcctEmployeePO> salaryAcctEmployees;
+        if (CollUtil.isNotEmpty(acctEmpIds)) {
+            salaryAcctEmployees = getSalaryAcctEmployeeService(user).listByIds(acctEmpIds);
+        } else {
+            salaryAcctEmployees = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(updateParam.getSalaryAcctRecordId());
+        }
+
         if (CollectionUtils.isEmpty(salaryAcctEmployees)) {
             return;
         }
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
index c5c9879e8..e8465791f 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
@@ -662,8 +662,6 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
     public XSSFWorkbook exportAdjustRecordList(SalaryItemAdjustRecordQueryParam queryParam) {
         // 1.工作簿名称
         String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资项目调整记录");
-        // 获取所有可被引用的薪资项目
-        List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
         String[] header = {
                 SalaryI18nUtil.getI18nLabel(85429, "姓名"),
                 SalaryI18nUtil.getI18nLabel(86187, "员工状态"),
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 6d6041d7d..3874b1b07 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -515,7 +515,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         // 1.工作簿名称
         String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资档案");
         // 获取所有可被引用的薪资项目
-        List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
+        List<SalaryItemPO> salaryItems = getSalaryArchiveItemService(user).getCanAdjustSalaryItems();
         Object[] header = {
                 new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "", "", 0),
                 new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "", "", 0),
@@ -1359,7 +1359,12 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         if (CollectionUtils.isEmpty(employeeIds)) {
             return Collections.emptyList();
         }
-        return getSalaryArchiveMapper().listPayEndDateIsNull(employeeIds);
+        List<List<Long>> partition = Lists.partition(employeeIds, 500);
+        List<SalaryArchivePO> resultList = new ArrayList<>();
+        partition.forEach(part -> {
+            resultList.addAll(getSalaryArchiveMapper().listPayEndDateIsNull(part));
+        });
+        return resultList;
     }
 
     @Override
diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
index 41bec2448..e51b45513 100644
--- a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
@@ -166,16 +166,6 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService
                 && Optional.ofNullable(salaryBillProgress.getProgress()).orElse(BigDecimal.ZERO).compareTo(BigDecimal.ONE) < 0) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(136104, "有其他人员正在发送中，请等待其他人员发送结束后再操作"));
         }
-        // 初始化进度
-        ProgressDTO initProgress = ProgressDTO.builder()
-                .title(SalaryI18nUtil.getI18nLabel(136097, "发送中"))
-                .totalQuantity(NumberUtils.INTEGER_ZERO)
-                .calculatedQuantity(NumberUtils.INTEGER_ZERO)
-                .progress(BigDecimal.ZERO)
-                .status(true)
-                .message("")
-                .build();
-        getProgressService(user).initProgress(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), initProgress);
 
         List<Long> ids = param.getIds();
 
@@ -187,6 +177,17 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService
                 throw new SalaryRunTimeException("工资发放范围内没有匹配员工");
             }
         }
+        // 初始化进度
+        ProgressDTO initProgress = ProgressDTO.builder()
+                .title(SalaryI18nUtil.getI18nLabel(136097, "发送中"))
+                .totalQuantity(NumberUtils.INTEGER_ZERO)
+                .calculatedQuantity(NumberUtils.INTEGER_ZERO)
+                .progress(BigDecimal.ZERO)
+                .status(true)
+                .message("")
+                .build();
+        getProgressService(user).initProgress(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), initProgress);
+
         // 异步执行
         List<Long> finalIds = ids;
         LocalRunnable localRunnable = new LocalRunnable() {
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 8d85c172c..b35a89f6e 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -1,7 +1,6 @@
 package com.engine.salary.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Validator;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.api.formmode.mybatis.util.SqlProxyHandle;
@@ -497,6 +496,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
         if (salarySendInfo == null) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));
         }
+
+        if (!Objects.equals(salarySendInfo.getSendStatus(), 1)) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));
+        }
+
         Long employeeId = salarySendInfo.getEmployeeId();
         if (currentEmployeeId.compareTo(employeeId) != 0) {
 
@@ -1386,7 +1390,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
     }
 
 
-
     @Override
     public Map<String, Object> withdraw(SalarySendWithdrawParam param) {
         if (param.getSalarySendId() == null) {
@@ -1748,9 +1751,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
         }
 
         String mobile = employee.getMobile();
-        if (Validator.isMobile(mobile)) {
-            throw new SalaryRunTimeException("手机号信息有误");
-        }
 
         boolean checkSendSMS = MessageUtil.checkSendSMS();
         if (!checkSendSMS) {
@@ -1778,6 +1778,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
 
         //取出验证码
         String cacheValue = getSalaryCacheService(user).get(SALARY_CACHE_SMS_CODE + "_" + id);
+        if (cacheValue == null) {
+            throw new SalaryRunTimeException("未获取到验证码，请重新发送");
+        }
         String[] cache = cacheValue.split("_");
         String code = cache[0];
         //失效时间
diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
index ac2c94e36..1273809a6 100644
--- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
@@ -238,6 +238,9 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
         }
 
         List<SalarySobPO> list = getSalarySobMapper().listSome(build);
+        if (param.isShare() == true) {
+            return list;
+        }
         return getAuthService(user).auth(list, param.getFilterType(), SalarySobPO.class);
     }
 
@@ -268,7 +271,7 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
         }
         if (queryParam.getTaxAgentId() != null) {
             List<SobTaxLinkPO> sobTaxLinkPOS = getSobTaxLinkMapper().listSome(SobTaxLinkPO.builder().taxAgentId(queryParam.getTaxAgentId()).build());
-            build.setIds(sobTaxLinkPOS.stream().map(SobTaxLinkPO::getTaxAgentId).collect(Collectors.toList()));
+            build.setIds(sobTaxLinkPOS.stream().map(SobTaxLinkPO::getSobId).collect(Collectors.toList()));
         }
 
         List<SalarySobPO> list = getSalarySobMapper().listSome(build);
diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
index 840c48884..b560d22c3 100644
--- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
@@ -291,6 +291,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
     public List<TaxAgentPO> listAuth(TaxAgentQueryParam queryParam) {
         List<TaxAgentPO> taxAgents = getTaxAgentMapper().listBySome(queryParam);
         AuthFilterTypeEnum filterType = queryParam.getFilterType();
+        if (queryParam.isShare()) {
+            return taxAgents;
+        }
         return getAuthService(user).auth(taxAgents, filterType, TaxAgentPO.class);
     }
 
@@ -586,7 +589,7 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
     public List<Map<String, Object>> selectList(boolean needAuth) {
         List<TaxAgentPO> taxAgents = getTaxAgentMapper().listAll();
         if (needAuth) {
-            taxAgents = handleForDevolution(taxAgents, (long) user.getUID(), true);
+            taxAgents = getAuthService(user).auth(taxAgents, AuthFilterTypeEnum.QUERY_DATA, TaxAgentPO.class);
         }
         return taxAgents.stream().map(m -> {
             Map<String, Object> map = new HashMap<>(2);
@@ -687,29 +690,15 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
             return taxAgentManageRangeEmployeeList;
         }
 
-        List<Long> taxAgentIds = allTaxAgents.stream().map(TaxAgentPO::getId).collect(Collectors.toList());
-        if (employeeStatus != null) {
-            List<String> personnelStatusList;
-            // 查询人员状态
-//            if (employeeStatus.equals(SalaryEmployeeStatusEnum.NORMAL)) {
-//                allEmployees = allEmployees.stream().filter(f -> UserStatusEnum.getNormalStatus().contains(f.getStatus())).collect(Collectors.toList());
-//            } else if (employeeStatus.equals(SalaryEmployeeStatusEnum.UNAVAILABLE)) {
-//                allEmployees = allEmployees.stream().filter(f -> UserStatusEnum.getUnavailableStatus().contains(f.getStatus())).collect(Collectors.toList());
-//            }
-        }
+        TaxAgentQueryParam param = TaxAgentQueryParam.builder().build();
+        param.setFilterType(AuthFilterTypeEnum.QUERY_DATA);
+        List<TaxAgentPO> taxAgentList = listAuth(param);
+        List<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId, Collectors.toList());
 
-        // 是否开启分权
-        if (!isOpenDevolution() || isChief(employeeId)) {
-            return getTaxAgentEmp(allTaxAgents, taxAgentIds);
-        }
 
-        // 1.判断自己是否是管理员， 如果是管理员，就是能够操作所属个税扣缴义务人下的所有人的数据
-        List<TaxAgentAdminPO> taxAgentAdminList = getTaxAgentAdminService(user).listByTaxAgentIdsAndEmployeeId(taxAgentIds, (long) user.getUID());
-        // 是管理员的列表
-        List<Long> adminTaxAgentIds = taxAgentAdminList.stream().map(TaxAgentAdminPO::getTaxAgentId).collect(Collectors.toList());
-
-        if (CollectionUtils.isNotEmpty(adminTaxAgentIds)) {
-            taxAgentManageRangeEmployeeList.addAll(getTaxAgentEmp(allTaxAgents, adminTaxAgentIds));
+        if (CollectionUtils.isNotEmpty(taxAgentIds)) {
+            List<TaxAgentManageRangeEmployeeDTO> taxAgentEmp = getTaxAgentEmp(allTaxAgents, taxAgentIds);
+            taxAgentManageRangeEmployeeList.addAll(taxAgentEmp);
         }
 
         return taxAgentManageRangeEmployeeList;
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index 62a3df5a8..e6ad762f4 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
@@ -119,20 +120,24 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
     public PageInfo<TaxDeclarationPO> listPageByParam(TaxDeclarationListQueryParam queryParam) {
         // 分页参数
         TaxDeclarationPO po = TaxDeclarationPO.builder().build();
-        LocalDateRange localDateRange = new LocalDateRange();
         if (Objects.nonNull(queryParam.getFromSalaryMonth())) {
-            localDateRange.setFromDate(SalaryDateUtil.localDateToDate(queryParam.getFromSalaryMonth().atDay(1)));
+            po.setTaxCycleFromDate(queryParam.getFromSalaryMonth());
         }
         if (Objects.nonNull(queryParam.getEndSalaryMonth())) {
-            localDateRange.setEndDate(SalaryDateUtil.localDateToDate(queryParam.getEndSalaryMonth().atEndOfMonth()));
+            po.setTaxCycleEndDate(queryParam.getEndSalaryMonth());
         }
-        po.setSalaryMonths(localDateRange);
 
         // 查询个税申报表
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
-
         taxDeclarationPOS = getAuthService(user).auth(taxDeclarationPOS, AuthFilterTypeEnum.DATA_OPT, TaxDeclarationPO.class);
 
+        if (StrUtil.isNotBlank(queryParam.getTaxAgentName())) {
+            List<TaxAgentPO> taxAgentPOs = getTaxAgentService(user).list(TaxAgentQueryParam.builder().name(queryParam.getTaxAgentName()).build());
+            Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOs, TaxAgentPO::getId);
+            taxDeclarationPOS = taxDeclarationPOS.stream().filter(tax -> taxAgentIds.contains(tax.getTaxAgentId())).collect(Collectors.toList());
+        }
+
+
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 taxDeclarationPOS, TaxDeclarationPO.class);
 
@@ -205,7 +210,14 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
                         .replace("{1}", SalaryDateUtil.getFormatYearMonth(saveParam.getSalaryMonth())));
             }
             // 查询薪资所属月的薪资核算记录
-            salaryAcctRecordPOS = listBySalaryMonth(SalaryAcctRecordPO.builder().salaryMonths(salaryMonthDateRange).taxAgentId(taxAgentId).build());
+            salaryAcctRecordPOS = listBySalaryMonth(SalaryAcctRecordPO.builder().salaryMonths(salaryMonthDateRange).build());
+            List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentId(saveParam.getTaxAgentId());
+            if (CollectionUtils.isEmpty(salarySobPOS)) {
+                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98874, "{0}该义务人下无账套数据").replace("{0}", saveParam.getSalaryMonth().toString()));
+            }
+            List<Long> salarySobIds = salarySobPOS.stream().map(SalarySobPO::getId).collect(Collectors.toList());
+
+            salaryAcctRecordPOS.stream().filter(record -> salarySobIds.contains(record.getSalarySobId())).collect(Collectors.toList());
 
             // 无薪资核算记录，不允许生成个税申报表
             if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) {
diff --git a/src/com/engine/salary/util/ResponseResult.java b/src/com/engine/salary/util/ResponseResult.java
index 2036fd1a2..4fef6c0a1 100644
--- a/src/com/engine/salary/util/ResponseResult.java
+++ b/src/com/engine/salary/util/ResponseResult.java
@@ -8,6 +8,7 @@ import com.engine.salary.common.SalaryContext;
 import com.engine.salary.exception.ExceptionUtil;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.BaseBean;
@@ -15,6 +16,7 @@ import weaver.hrm.User;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -52,6 +54,17 @@ public class ResponseResult<T, R> {
         SalaryContext.get().setValue("response", response);
     }
 
+    public T parseParams(HttpServletRequest request, Class<T> clazz) {
+        T t = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            t = mapper.readValue(request.getInputStream(), clazz);
+        } catch (IOException e) {
+            log.error("salary api parseParams fail , param {}", t, e);
+        }
+        return t;
+    }
 
     /**
      * 统一返回方法
diff --git a/src/com/engine/salary/util/excel/ExcelUtil.java b/src/com/engine/salary/util/excel/ExcelUtil.java
index 5b7410994..6877e7e03 100644
--- a/src/com/engine/salary/util/excel/ExcelUtil.java
+++ b/src/com/engine/salary/util/excel/ExcelUtil.java
@@ -1,5 +1,6 @@
 package com.engine.salary.util.excel;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryI18nUtil;
@@ -139,8 +140,10 @@ public class ExcelUtil {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     cell.setCellType(CellType.NUMERIC);
                     cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
@@ -235,8 +238,10 @@ public class ExcelUtil {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     cell.setCellType(CellType.NUMERIC);
                     cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
@@ -311,8 +316,10 @@ public class ExcelUtil {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     cell.setCellType(CellType.NUMERIC);
                     cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
@@ -377,8 +384,10 @@ public class ExcelUtil {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof Boolean) {
                     cell.setCellType(CellType.BOOLEAN);
                     cell.setCellValue(String.valueOf(o));
@@ -458,8 +467,10 @@ public class ExcelUtil {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof Boolean) {
                     cell.setCellType(CellType.BOOLEAN);
                     cell.setCellValue(String.valueOf(o));
diff --git a/src/com/engine/salary/util/excel/ExcelUtilPlus.java b/src/com/engine/salary/util/excel/ExcelUtilPlus.java
index 9da402ce7..96cff32ec 100644
--- a/src/com/engine/salary/util/excel/ExcelUtilPlus.java
+++ b/src/com/engine/salary/util/excel/ExcelUtilPlus.java
@@ -1,11 +1,13 @@
 package com.engine.salary.util.excel;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.salary.component.WeaTableColumnGroup;
 import com.engine.salary.util.SalaryDateUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
+import weaver.wechat.util.Utils;
 
 import java.awt.Color;
 import java.math.BigDecimal;
@@ -131,10 +133,10 @@ public class ExcelUtilPlus {
         for (int i = 0; i < header.size(); i++) {
             WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) header.get(i);
             XSSFCell rowZeroCell = row0.createCell(i, CellType.STRING);
-            rowZeroCell.setCellValue(columnGroupItem.getText().toString());
+            rowZeroCell.setCellValue(columnGroupItem.getText());
             rowZeroCell.setCellStyle(titleCellStyle);
             //设置列宽
-            sheet.setColumnWidth(i, Math.min(255, Math.max(12, columnGroupItem.getText().length() * 4)) * 256);
+            sheet.setColumnWidth(i, Math.min(255, Math.max(12, Utils.null2String(columnGroupItem.getText()).length() * 4)) * 256);
             patternList.add(columnGroupItem.getPattern());
         }
 
@@ -190,8 +192,10 @@ public class ExcelUtilPlus {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     if (lastRowRed && rowIndex == rowList.size() - 1) {
                         cell.setCellStyle(numberRedCellStyleMap.get(patternList.get(cellIndex)));
@@ -199,8 +203,7 @@ public class ExcelUtilPlus {
                         cell.setCellStyle(numberCellStyleMap.get(patternList.get(cellIndex)));
                     }
                     cell.setCellType(CellType.NUMERIC);
-                    double value = o == null ? 0 : ((BigDecimal) o).doubleValue();
-                    cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
+                    cell.setCellValue(((BigDecimal) o).doubleValue());
                 } else if (o instanceof Boolean) {
                     cell.setCellType(CellType.BOOLEAN);
                     cell.setCellValue(String.valueOf(o));
@@ -220,6 +223,7 @@ public class ExcelUtilPlus {
         }
         return workbook;
     }
+
     public static XSSFWorkbook genWorkbookV2(List<List<Object>> rowList, String sheetName) {
         XSSFWorkbook workbook = new XSSFWorkbook();
 
@@ -280,11 +284,13 @@ public class ExcelUtilPlus {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     cell.setCellType(CellType.NUMERIC);
-                    cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
+                    cell.setCellValue(((BigDecimal) o).doubleValue());
                 } else if (o instanceof Boolean) {
                     cell.setCellType(CellType.BOOLEAN);
                     cell.setCellValue(String.valueOf(o));
@@ -367,8 +373,10 @@ public class ExcelUtilPlus {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof Boolean) {
                     cell.setCellType(CellType.BOOLEAN);
                     cell.setCellValue(String.valueOf(o));
@@ -476,11 +484,13 @@ public class ExcelUtilPlus {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     cell.setCellType(CellType.NUMERIC);
-                    cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
+                    cell.setCellValue(((BigDecimal) o).doubleValue());
                 } else if (o instanceof Boolean) {
                     cell.setCellType(CellType.BOOLEAN);
                     cell.setCellValue(String.valueOf(o));
@@ -674,8 +684,10 @@ public class ExcelUtilPlus {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     if (lastRowRed && rowIndex == rowList.size() - 1) {
                         cell.setCellStyle(numberRedCellStyleMap.get(patternList.get(cellIndex)));
@@ -839,8 +851,10 @@ public class ExcelUtilPlus {
                 }
                 Object o = infoList.get(cellIndex);
                 if (o instanceof String) {
-                    cell.setCellType(CellType.STRING);
-                    cell.setCellValue(String.valueOf(o));
+                    if (StrUtil.isNotBlank(String.valueOf(o))) {
+                        cell.setCellType(CellType.STRING);
+                        cell.setCellValue(String.valueOf(o));
+                    }
                 } else if (o instanceof BigDecimal) {
                     cell.setCellType(CellType.NUMERIC);
                     cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
diff --git a/src/com/engine/salary/util/valid/ValidUtil.java b/src/com/engine/salary/util/valid/ValidUtil.java
index 906718077..bcdec10d6 100644
--- a/src/com/engine/salary/util/valid/ValidUtil.java
+++ b/src/com/engine/salary/util/valid/ValidUtil.java
@@ -250,7 +250,9 @@ public class ValidUtil {
                                 .replace("ｂｅｔｗｅｅｎ", "between")
                                 .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
                                 .replace("ｕｎｉｏｎ", "union")
-                                .replace("ＵＮＩＯＮ", "UNION");
+                                .replace("ＵＮＩＯＮ", "UNION")
+                                .replace("ｓｕｂｓｔｒ", "substr")
+                                .replace("ＳＵＢＳＴＲ", "SUBSTR");
                     }
                     setValue(t, field.getName(), result);
                 } else if (valueTypeEnum == ValueTypeEnum.OBJECT) {
diff --git a/src/com/engine/salary/web/PushController.java b/src/com/engine/salary/web/PushController.java
index 1ad8fe061..1b3340469 100644
--- a/src/com/engine/salary/web/PushController.java
+++ b/src/com/engine/salary/web/PushController.java
@@ -123,4 +123,12 @@ public class PushController {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<PushParam, String>(user).run(getPushWrapper(user)::push, param);
     }
+
+    @POST
+    @Path("/record/withdraw")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String push(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody WithdrawParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<WithdrawParam, String>(user).run(getPushWrapper(user)::withdraw, param);
+    }
 }
diff --git a/src/com/engine/salary/web/SIAccountController.java b/src/com/engine/salary/web/SIAccountController.java
index 73a01b5e6..9e213dba2 100644
--- a/src/com/engine/salary/web/SIAccountController.java
+++ b/src/com/engine/salary/web/SIAccountController.java
@@ -217,6 +217,38 @@ public class SIAccountController {
         return new ResponseResult<AccountParam, String>(user).run(getService(user)::save, param);
     }
 
+    @POST
+    @Path("/batSave")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batSave(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AccountBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<AccountBatParam, String>(user).run(getService(user)::batSave, param);
+    }
+
+    @POST
+    @Path("/batDelete")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batDelete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AccountBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<AccountBatParam, String>(user).run(getService(user)::batDelete, param);
+    }
+
+    @POST
+    @Path("/batFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batFile(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AccountBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<AccountBatParam, String>(user).run(getService(user)::batFile, param);
+    }
+
+    @POST
+    @Path("/batSocialSecurityBenefitsRecalculate")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batSocialSecurityBenefitsRecalculate(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody AccountBatParam batParam ){
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<AccountBatParam, String>(user).run(getService(user)::batSocialSecurityBenefitsRecalculate,batParam);
+    }
+
 
     /**
      * 正常缴纳页核算
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index a196d53ef..57483fd40 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -141,6 +141,43 @@ public class SalaryAcctController {
         return new ResponseResult<Long, Long>(user).run(getSalaryAcctRecordWrapper(user)::reCalculate, param.getSalaryAcctRecordId());
     }
 
+    //薪资核算
+    @POST
+    @Path("/batAccounting")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batAccounting(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalaryAcctBatParam, String>(user).run(getSalaryAcctRecordWrapper(user)::batCalculate, param);
+    }
+
+    //保存薪资核算的基本信息
+    @POST
+    @Path("/basic/batSave")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batSave(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalaryAcctBatParam, Long>(user).run(getSalaryAcctRecordWrapper(user)::batSave, param);
+    }
+
+
+    //归档薪资核算记录
+    @POST
+    @Path("/batFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batFile(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalaryAcctBatParam, Long>(user).run(getSalaryAcctRecordWrapper(user)::batFile, param);
+    }
+
+    //重新核算
+    @POST
+    @Path("/batReAccounting")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batReAccounting(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalaryAcctBatParam, Long>(user).run(getSalaryAcctRecordWrapper(user)::batReCalculate, param);
+    }
+
     //判断是否存在合并计税
     @GET
     @Path("/hasConsolidatedTax")
diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java
index 64437a579..ab505d1ce 100644
--- a/src/com/engine/salary/web/SalaryBillController.java
+++ b/src/com/engine/salary/web/SalaryBillController.java
@@ -480,6 +480,29 @@ public class SalaryBillController {
         return new ResponseResult<SalarySendWithdrawParam, Map<String, Object>>(user).run(getSalarySendWrapper(user)::withdraw, queryParam);
     }
 
+    @POST
+    @Path("/send/batGrant")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batGrant(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendBatParam queryParam) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalarySendBatParam, Map<String, Object>>(user).run(getSalarySendWrapper(user)::batGrant, queryParam);
+    }
+
+    /**
+     * 工资单撤回
+     *
+     * @param queryParam
+     * @return
+     */
+    @POST
+    @Path("/send/batWithdraw")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batWithdraw(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendBatParam queryParam) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalarySendBatParam, Map<String, Object>>(user).run(getSalarySendWrapper(user)::batWithdraw, queryParam);
+    }
+
+
     /**
      * 工资单发放详情列表的高级搜索
      *
diff --git a/src/com/engine/salary/web/TaxDeclarationController.java b/src/com/engine/salary/web/TaxDeclarationController.java
index 6d2332dd4..e6205eaaa 100644
--- a/src/com/engine/salary/web/TaxDeclarationController.java
+++ b/src/com/engine/salary/web/TaxDeclarationController.java
@@ -4,6 +4,7 @@ import com.engine.common.util.ServiceUtil;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationFormDTO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationInfoDTO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationListDTO;
+import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationBatParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationDetailListQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam;
@@ -31,7 +32,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.text.ParseException;
 import java.time.LocalDate;
 
 
@@ -58,10 +58,8 @@ public class TaxDeclarationController {
     @POST
     @Path("/list")
     @Produces(MediaType.APPLICATION_JSON)
-    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationListQueryParam queryParam) throws ParseException {
+    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationListQueryParam queryParam){
         User user = HrmUserVarify.getUser(request, response);
-        queryParam.setFromSalaryMonth(SalaryDateUtil.String2YearMonth(queryParam.getFromSalaryMonthStr() == null ? "" : queryParam.getFromSalaryMonthStr()));
-        queryParam.setEndSalaryMonth(SalaryDateUtil.String2YearMonth(queryParam.getEndSalaryMonthStr() == null ? "" : queryParam.getEndSalaryMonthStr()));
         return new ResponseResult<TaxDeclarationListQueryParam, PageInfo<TaxDeclarationListDTO>>(user).run(getTaxDeclarationWrapper(user)::listPage, queryParam);
     }
 
@@ -102,6 +100,15 @@ public class TaxDeclarationController {
         return new ResponseResult<TaxDeclarationSaveParam, Long>(user).run(getTaxDeclarationWrapper(user)::save, param);
     }
 
+    @POST
+    @Path("/batSave")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String batSave(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationBatParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        param.setSalaryMonth(SalaryDateUtil.String2YearMonth(param.getSalaryMonthStr()));
+        return new ResponseResult<TaxDeclarationBatParam, Long>(user).run(getTaxDeclarationWrapper(user)::batSave, param);
+    }
+
     //个税申报表详情列表
     @POST
     @Path("/detail/list")
diff --git a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
index 2e5d4e579..523ec3c58 100644
--- a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
+++ b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
@@ -92,7 +92,7 @@ public class AttendQuoteDataWrapper extends Service {
             attendQuoteFields.stream()
                     .filter(attendQuoteField->effectiveColumns.contains(Util.null2String(attendQuoteField.getId())))
                     .forEach(attendQuoteField -> {
-                        columns.add(Column.builder().title(attendQuoteField.getFieldName())
+                        columns.add(Column.builder().title(Util.formatMultiLang(attendQuoteField.getFieldName(), String.valueOf(user.getLanguage())))
                                 .dataIndex(attendQuoteField.getId() + "_attendQuoteData")
                                 .key(attendQuoteField.getId() + "_attendQuoteData").display(Boolean.TRUE).build());
                     }
diff --git a/src/com/engine/salary/wrapper/PushWrapper.java b/src/com/engine/salary/wrapper/PushWrapper.java
index 6d557ba8f..0950f19e3 100644
--- a/src/com/engine/salary/wrapper/PushWrapper.java
+++ b/src/com/engine/salary/wrapper/PushWrapper.java
@@ -1,5 +1,6 @@
 package com.engine.salary.wrapper;
 
+import cn.hutool.core.collection.CollUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.entity.push.dto.PushRecordDTO;
@@ -16,6 +17,7 @@ import com.engine.salary.util.page.PageInfo;
 import weaver.hrm.User;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -67,10 +69,25 @@ public class PushWrapper extends Service {
         });
     }
 
-    public void push(PushParam pushParam) {
-        getPushService(user).push(pushParam.getId());
+    public void push(PushParam param) {
+        List<Long> ids = param.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        ids.forEach(id -> {
+            getPushService(user).push(id);
+        });
     }
 
+    public void withdraw(WithdrawParam param) {
+        List<Long> ids = param.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        ids.forEach(id -> {
+            getPushService(user).withdraw(id);
+        });
+    }
 
 
     public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) {
diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
index a9f9e0556..c96bf0a5d 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
@@ -10,12 +10,13 @@ import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO;
 import com.engine.salary.entity.salaryacct.dto.SalaryAcctEmployeeCountDTO;
 import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordFormDTO;
 import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO;
+import com.engine.salary.entity.salaryacct.param.SalaryAcctBatParam;
+import com.engine.salary.entity.salaryacct.param.SalaryAcctCalculateParam;
 import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;
 import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordSaveParam;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctSobConfigPO;
 import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
-import com.engine.salary.entity.salarysob.po.SalaryApprovalRulePO;
 import com.engine.salary.entity.salarysob.po.*;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
@@ -55,6 +56,9 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
     private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
         return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
     }
+    private SalaryAcctResultWrapper getSalaryAcctResultWrapper(User user) {
+        return ServiceUtil.getService(SalaryAcctResultWrapper.class, user);
+    }
 
     private SalarySobService getSalarySobService(User user) {
         return ServiceUtil.getService(SalarySobServiceImpl.class, user);
@@ -380,4 +384,28 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
     public void updateSobConfig(Long id) {
         getSalaryAcctSobConfigService(user).updateBySalaryAcctRecordId(id);
     }
+
+
+    public void batSave(SalaryAcctBatParam param) {
+        getSalaryAcctRecordService(user).batSave(param);
+    }
+
+
+    public void batFile(SalaryAcctBatParam param) {
+        getSalaryAcctRecordService(user).batFile(param);
+    }
+
+    public void batReCalculate(SalaryAcctBatParam param) {
+        getSalaryAcctRecordService(user).batReCalculate(param);
+
+    }
+
+    public void batCalculate(SalaryAcctBatParam param) {
+        List<Long> salaryAcctRecordIds = param.getSalaryAcctRecordIds();
+        for (int i = 0; i < salaryAcctRecordIds.size(); i++) {
+            Long recordId = salaryAcctRecordIds.get(i);
+            SalaryAcctCalculateParam calculateParam = SalaryAcctCalculateParam.builder().salaryAcctRecordId(recordId).build();
+            getSalaryAcctResultWrapper(user).calculate(calculateParam);
+        }
+    }
 }
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
index 0050b5848..96f1c43aa 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
@@ -540,9 +540,6 @@ public class SalaryArchiveWrapper extends Service {
         return map;
     }
 
-    public Map<String, Object> selectSalaryArchiveColumns(String importType) {
-        return getSalaryArchiveService(user).selectSalaryArchiveColumns(SalaryArchiveImportTypeEnum.parseByValue(importType));
-    }
 
 
     public Map<String, Object> checkSalaryArchiveInit(SalaryArchiveImportActionParam importData) {
diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java
index f97a798dc..cf263db9d 100644
--- a/src/com/engine/salary/wrapper/SalarySendWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java
@@ -738,4 +738,28 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy
     public String genPdfBeforeExport(SalaryExportPdfParam salaryExportPdfParam) {
         return getSalaryBillService(user).genPdfBeforeExport(salaryExportPdfParam);
     }
+
+
+    public void batGrant(SalarySendBatParam param) {
+        List<Long> salarySendIds = param.getSalarySendIds();
+
+        for (int i = 0; i < salarySendIds.size(); i++) {
+            Long sendId = salarySendIds.get(i);
+            SalarySendGrantParam grantParam = SalarySendGrantParam.builder()
+                    .salarySendId(sendId)
+                    .build();
+            grant(grantParam);
+        }
+    }
+    public void batWithdraw(SalarySendBatParam param) {
+        List<Long> salarySendIds = param.getSalarySendIds();
+
+        for (int i = 0; i < salarySendIds.size(); i++) {
+            Long sendId = salarySendIds.get(i);
+            SalarySendWithdrawParam grantParam = SalarySendWithdrawParam.builder()
+                    .salarySendId(sendId)
+                    .build();
+            withdraw(grantParam);
+        }
+    }
 }
diff --git a/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java b/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
index 1ae272efc..b308f7b82 100644
--- a/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
@@ -97,7 +97,10 @@ public class SalarySobRangeWrapper extends Service {
                                 .replace("ｂｅｔｗｅｅｎ", "between")
                                 .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
                                 .replace("ｕｎｉｏｎ", "union")
-                                .replace("ＵＮＩＯＮ", "UNION"));
+                                .replace("ＵＮＩＯＮ", "UNION")
+                                .replace("ｓｕｂｓｔｒ", "substr")
+                                .replace("ＳＵＢＳＴＲ", "SUBSTR")
+                        );
                     }
                 });
 
@@ -127,7 +130,10 @@ public class SalarySobRangeWrapper extends Service {
                                 .replace("ｂｅｔｗｅｅｎ", "between")
                                 .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
                                 .replace("ｕｎｉｏｎ", "union")
-                                .replace("ＵＮＩＯＮ", "UNION"));
+                                .replace("ＵＮＩＯＮ", "UNION")
+                                .replace("ｓｕｂｓｔｒ", "substr")
+                                .replace("ＳＵＢＳＴＲ", "SUBSTR")
+                        );
                     }
                 });
 
diff --git a/src/com/engine/salary/wrapper/TaxAgentWrapper.java b/src/com/engine/salary/wrapper/TaxAgentWrapper.java
index c56cc7f76..81bb3e2c4 100644
--- a/src/com/engine/salary/wrapper/TaxAgentWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxAgentWrapper.java
@@ -356,7 +356,10 @@ public class TaxAgentWrapper extends Service {
                                 .replace("ｂｅｔｗｅｅｎ", "between")
                                 .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
                                 .replace("ｕｎｉｏｎ", "union")
-                                .replace("ＵＮＩＯＮ", "UNION"));
+                                .replace("ＵＮＩＯＮ", "UNION")
+                                .replace("ｓｕｂｓｔｒ", "substr")
+                                .replace("ＳＵＢＳＴＲ", "SUBSTR")
+                        );
                     }
                 });
 
@@ -390,7 +393,10 @@ public class TaxAgentWrapper extends Service {
                                 .replace("ｂｅｔｗｅｅｎ", "between")
                                 .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
                                 .replace("ｕｎｉｏｎ", "union")
-                                .replace("ＵＮＩＯＮ", "UNION"));
+                                .replace("ＵＮＩＯＮ", "UNION")
+                                .replace("ｓｕｂｓｔｒ", "substr")
+                                .replace("ＳＵＢＳＴＲ", "SUBSTR")
+                        );
                     }
                 });
 
diff --git a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
index 38670737a..0bfd23343 100644
--- a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
@@ -9,6 +9,7 @@ import com.engine.salary.entity.taxdeclaration.bo.TaxDeclarationBO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationFormDTO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationInfoDTO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationListDTO;
+import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationBatParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam;
 import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO;
@@ -158,4 +159,20 @@ public class TaxDeclarationWrapper extends Service {
     public void withDrawTaxDeclaration(Long taxDeclarationId) {
         getTaxDeclarationService(user).withDrawTaxDeclaration(taxDeclarationId);
     }
+
+    public void batSave(TaxDeclarationBatParam param) {
+        List<Long> taxAgentIds = param.getTaxAgentIds();
+        for (int i = 0; i < taxAgentIds.size(); i++) {
+            Long taxAgentId = taxAgentIds.get(i);
+            TaxDeclarationSaveParam saveParam = TaxDeclarationSaveParam.builder()
+                    .salaryMonth(param.getSalaryMonth())
+                    .taxAgentId(taxAgentId)
+                    .description(param.getDescription())
+                    .taxCycle(param.getTaxCycle())
+                    .salaryDate(param.getSalaryDate())
+                    .build();
+            save(saveParam);
+        }
+
+    }
 }