Merge branch 'release/2.19.1.2501.01' into custom/科蓝柏

# Conflicts:
#	src/com/engine/salary/service/SalaryApprovalRuleService.java
#	src/com/engine/salary/service/impl/SalaryApprovalRuleServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java

resource/WEB-INF/prop/hrmSalary.properties

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

resource/sqlupgrade/DM/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/DM/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/DM/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/DM/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/DM/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/DM/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/DM/sql202501150103.sql

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

resource/sqlupgrade/DM/sql202502060103.sql

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

resource/sqlupgrade/GS/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/GS/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/GS/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/GS/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/GS/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/GS/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/GS/sql202501150103.sql

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

resource/sqlupgrade/GS/sql202502060103.sql

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

resource/sqlupgrade/JC/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/JC/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/JC/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/JC/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/JC/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/JC/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/JC/sql202501150103.sql

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

resource/sqlupgrade/JC/sql202502060103.sql

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

resource/sqlupgrade/Mysql/sql202410090103.sql

@@ -0,0 +1,22 @@
+ALTER TABLE hrsa_bill_detail_temp
+ADD COLUMN subcompany_name text ,
+ADD COLUMN subcompany_id bigint(0),
+ADD COLUMN department_name text ,
+ADD COLUMN department_id bigint(0),
+ADD COLUMN jobtitle_name text ,
+ADD COLUMN jobtitle_id bigint(0) ,
+ADD COLUMN jobcall text ,
+ADD COLUMN jobcall_id bigint(0),
+ADD COLUMN status text ;
+
+
+ALTER TABLE hrsa_bill_detail
+ADD COLUMN subcompany_name text ,
+ADD COLUMN subcompany_id bigint(0),
+ADD COLUMN department_name text ,
+ADD COLUMN department_id bigint(0),
+ADD COLUMN jobtitle_name text  ,
+ADD COLUMN jobtitle_id bigint(0) ,
+ADD COLUMN jobcall text ,
+ADD COLUMN jobcall_id bigint(0),
+ADD COLUMN status text ;

resource/sqlupgrade/Mysql/sql202410090203.sql

@@ -0,0 +1,29 @@
+update  hrsa_bill_detail a INNER JOIN (
+    select e.id as employeeId,
+    d.departmentname as departmentName,
+    d.id as departmentId,
+    sc.SUBCOMPANYNAME as subcompanyName,
+    sc.id as subcompanyid,
+    c.jobtitlename as jobtitleName,
+    c.id as jobtitleId,
+    e.status as status,
+    e.jobcall as jobcallId,
+    job.name as jobcall
+    from hrmresource e
+    left join hrmdepartment d on e.departmentid = d.id
+    left join hrmjobtitles c on e.jobtitle = c.id
+    left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+    left join hrmjobcall job on e.jobcall=job.id
+    where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    ) as b
+on a.employee_id = b.employeeId
+    set a.department_id = b.departmentId,
+        a.department_name = b.departmentName,
+        a.subcompany_id = b.subcompanyid,
+        a.subcompany_name = b.subcompanyName,
+        a.jobtitle_id = b.jobtitleId,
+        a.jobtitle_name = b.jobtitleName,
+        a.jobcall_id = b.jobcallId,
+        a.jobcall = b.jobcall,
+        a.status = b.status
+where a.delete_type=0;

resource/sqlupgrade/Mysql/sql202410250303.sql

@@ -0,0 +1 @@
+ALTER TABLE hrsa_salary_acct_emp ADD COLUMN account_type int(0);

resource/sqlupgrade/Mysql/sql202411060203.sql

@@ -0,0 +1,28 @@
+CREATE TABLE hrsa_page_link
+(
+    id              bigint(0) NOT NULL,
+    employee_id     bigint(0),
+    page            varchar(200),
+    template_id bigint(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_page_list_template  (
+id bigint(0) NOT NULL,
+name varchar(200),
+page varchar(200),
+shared_type int(0),
+limit_ids varchar(2000),
+setting text,
+creator bigint(0),
+create_time datetime(0),
+update_time datetime(0),
+delete_type int(0),
+tenant_key varchar(10),
+PRIMARY KEY (id) USING BTREE
+);

resource/sqlupgrade/Mysql/sql202411250103.sql

@@ -0,0 +1 @@
+ALTER TABLE hrsa_page_list_setting ADD COLUMN default_setting int;

resource/sqlupgrade/Mysql/sql202412030103.sql

@@ -0,0 +1,3 @@
+ALTER TABLE hrsa_page_list_template ADD COLUMN system_type int;
+
+update hrsa_page_list_template set system_type=0;

resource/sqlupgrade/Mysql/sql202501150103.sql

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

resource/sqlupgrade/Mysql/sql202502060103.sql

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

resource/sqlupgrade/Oracle/sql202410090103.sql

@@ -0,0 +1,37 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null
+/
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add department_id NUMBER null
+/
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL
+/
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL
+/
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL
+/
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail add subcompany_id NUMBER null
+/
+alter table hrsa_bill_detail add department_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail add department_id NUMBER null
+/
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL
+/
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL
+/
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL
+/
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL
+/
+alter table hrsa_bill_detail add status varchar2(200) NULL
+/

resource/sqlupgrade/Oracle/sql202410090203.sql

@@ -0,0 +1,69 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          )
+/

resource/sqlupgrade/Oracle/sql202410250303.sql

@@ -0,0 +1,2 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER
+/

resource/sqlupgrade/Oracle/sql202411060203.sql

@@ -0,0 +1,29 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+)
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+)
+/

resource/sqlupgrade/Oracle/sql202411250103.sql

@@ -0,0 +1,4 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+)
+/

resource/sqlupgrade/Oracle/sql202412030103.sql

@@ -0,0 +1,7 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+)
+/
+
+update hrsa_page_list_template set system_type=0
+/

resource/sqlupgrade/Oracle/sql202501150103.sql

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

resource/sqlupgrade/Oracle/sql202502060103.sql

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

resource/sqlupgrade/PG/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/

resource/sqlupgrade/PG/sql202410090203.sql

@@ -0,0 +1,68 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );

resource/sqlupgrade/PG/sql202410250303.sql

@@ -0,0 +1 @@
+alter table hrsa_salary_acct_emp add account_type int;

resource/sqlupgrade/PG/sql202411060203.sql

@@ -0,0 +1,27 @@
+create table hrsa_page_link
+(
+    id              bigint primary key,
+    employee_id     bigint,
+    page            varchar(200),
+    template_id bigint,
+    creator         bigint,
+    create_time     timestamp,
+    update_time     timestamp,
+    delete_type     int,
+    tenant_key      varchar(10)
+);
+
+create table hrsa_page_list_template
+(
+    id              bigint primary key,
+    name varchar(200),
+    page varchar(200),
+    shared_type int,
+    limit_ids varchar(2000),
+    setting text,
+    creator         bigint,
+    create_time     timestamp,
+    update_time     timestamp,
+    delete_type     int,
+    tenant_key      varchar(10)
+);

resource/sqlupgrade/PG/sql202411250103.sql

@@ -0,0 +1 @@
+ALTER TABLE hrsa_page_list_setting  ADD COLUMN default_setting int  ;

resource/sqlupgrade/PG/sql202412030103.sql

@@ -0,0 +1,3 @@
+ALTER TABLE hrsa_page_list_template  ADD COLUMN system_type int  ;
+
+update hrsa_page_list_template set system_type=0;

resource/sqlupgrade/PG/sql202501150103.sql

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

resource/sqlupgrade/PG/sql202502060103.sql

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

resource/sqlupgrade/SQLServer/sql202410090103.sql

@@ -0,0 +1,23 @@
+ALTER TABLE hrsa_bill_detail_temp 
+ADD subcompany_name varchar(200),
+subcompany_id bigint,
+department_name varchar(200),
+department_id bigint,
+jobtitle_name varchar(200),
+jobtitle_id bigint,
+jobcall varchar(200),
+jobcall_id bigint,
+status varchar(200)
+GO
+
+ALTER TABLE hrsa_bill_detail
+ADD subcompany_name varchar(200),
+subcompany_id bigint,
+department_name varchar(200),
+department_id bigint,
+jobtitle_name varchar(200),
+jobtitle_id bigint,
+jobcall varchar(200),
+jobcall_id bigint,
+status varchar(200)
+GO

resource/sqlupgrade/SQLServer/sql202410090203.sql

@@ -0,0 +1,31 @@
+UPDATE hrsa_bill_detail
+set department_id = b.departmentId,
+    department_name = b.departmentName,
+    subcompany_id = b.subcompanyid,
+    subcompany_name = b.subcompanyName,
+    jobtitle_id = b.jobtitleId,
+    jobtitle_name = b.jobtitleName,
+    jobcall_id = b.jobcallId,
+    jobcall = b.jobcall,
+    status = b.status
+FROM hrsa_bill_detail a INNER JOIN (
+    select e.id as employeeId,
+    d.departmentname as departmentName,
+    d.id as departmentId,
+    sc.SUBCOMPANYNAME as subcompanyName,
+    sc.id as subcompanyid,
+    c.jobtitlename as jobtitleName,
+    c.id as jobtitleId,
+    e.status as status,
+    e.jobcall as jobcallId,
+    job.name as jobcall
+    from hrmresource e
+    left join hrmdepartment d on e.departmentid = d.id
+    left join hrmjobtitles c on e.jobtitle = c.id
+    left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+    left join hrmjobcall job on e.jobcall=job.id
+    where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    ) as b
+on a.employee_id = b.employeeId
+WHERE a.delete_type=0
+GO

resource/sqlupgrade/SQLServer/sql202410250303.sql

@@ -0,0 +1,2 @@
+ALTER TABLE hrsa_salary_acct_emp ADD account_type int
+GO

resource/sqlupgrade/SQLServer/sql202411060203.sql

@@ -0,0 +1,29 @@
+create table hrsa_page_link
+(
+    id              bigint primary key,
+    employee_id     bigint,
+    page            varchar(200),
+    template_id bigint,
+    creator         bigint,
+    create_time     datetime,
+    update_time     datetime,
+    delete_type     int,
+    tenant_key      varchar(10)
+)
+GO
+
+create table hrsa_page_list_template
+(
+    id              bigint primary key,
+    name varchar(200),
+    page varchar(200),
+    shared_type int,
+    limit_ids varchar(2000),
+    setting text,
+    creator         bigint,
+    create_time     datetime,
+    update_time     datetime,
+    delete_type     int,
+    tenant_key      varchar(10)
+)
+GO

resource/sqlupgrade/SQLServer/sql202411250103.sql

@@ -0,0 +1,2 @@
+ALTER TABLE hrsa_page_list_setting ADD default_setting int NULL
+GO

resource/sqlupgrade/SQLServer/sql202412030103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_template ADD system_type int NULL
+GO
+
+update hrsa_page_list_template set system_type=0
+GO

resource/sqlupgrade/SQLServer/sql202501150103.sql

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

resource/sqlupgrade/SQLServer/sql202502060103.sql

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

resource/sqlupgrade/ST/sql202410090103.sql

@@ -0,0 +1,54 @@
+alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add subcompany_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add department_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add department_id NUMBER null;
+/
+
+alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
+/
+
+alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
+/
+
+alter table hrsa_bill_detail add status varchar2(200) NULL;
+/
+

resource/sqlupgrade/ST/sql202410090203.sql

@@ -0,0 +1,70 @@
+update hrsa_bill_detail a
+set
+(
+    department_id ,
+    department_name,
+    subcompany_id ,
+    subcompany_name,
+    jobtitle_id ,
+    jobtitle_name ,
+    jobcall_id,
+    jobcall,
+    status
+)
+    =
+(
+    select
+    b.departmentId,
+    b.departmentName,
+    b.subcompanyid,
+    b.subcompanyName,
+    b.jobtitleId,
+    b.jobtitleName,
+    b.jobcallId,
+    b.jobcall,
+    b.status from
+    (
+     select
+     e.id as employeeId,
+     d.departmentname as departmentName,
+     d.id as departmentId,
+     sc.SUBCOMPANYNAME as subcompanyName,
+     sc.id as subcompanyid,
+     c.jobtitlename as jobtitleName,
+     c.id as jobtitleId,
+     e.status as status,
+     e.jobcall as jobcallId,
+     job.name as jobcall
+     from hrmresource e
+     left join hrmdepartment d on e.departmentid = d.id
+     left join hrmjobtitles c on e.jobtitle = c.id
+     left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+     left join hrmjobcall job on e.jobcall=job.id
+     where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+    )  b
+    where a.employee_id = b.employeeId
+)
+where a.delete_type=0 and
+      exists (select 1 from (
+                             select
+                                 e.id as employeeId,
+                                 d.departmentname as departmentName,
+                                 d.id as departmentId,
+                                 sc.SUBCOMPANYNAME as subcompanyName,
+                                 sc.id as subcompanyid,
+                                 c.jobtitlename as jobtitleName,
+                                 c.id as jobtitleId,
+                                 e.status as status,
+                                 e.jobcall as jobcallId,
+                                 job.name as jobcall
+                             from hrmresource e
+                                      left join hrmdepartment d on e.departmentid = d.id
+                                      left join hrmjobtitles c on e.jobtitle = c.id
+                                      left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+                                      left join hrmjobcall job on e.jobcall=job.id
+                             where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+                            )  b
+                            where a.employee_id = b.employeeId
+          );
+/
+

resource/sqlupgrade/ST/sql202410250303.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

resource/sqlupgrade/ST/sql202411060203.sql

@@ -0,0 +1,30 @@
+CREATE TABLE hrsa_page_link
+(
+    id              NUMBER(38,0) primary key NOT NULL,
+    employee_id     NUMBER(38,0),
+    page            varchar2(200),
+    template_id NUMBER(38,0),
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+
+CREATE TABLE hrsa_page_list_template
+(
+    id   NUMBER(38,0) primary key NOT NULL,
+    name varchar2(200),
+    page varchar2(200),
+    shared_type number,
+    limit_ids varchar2(2000),
+    setting CLOB,
+    creator         NUMBER(38,0),
+    create_time     date,
+    update_time     date,
+    delete_type     number,
+    tenant_key      varchar2(10)
+);
+/
+

resource/sqlupgrade/ST/sql202411250103.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+

resource/sqlupgrade/ST/sql202412030103.sql

@@ -0,0 +1,8 @@
+ALTER TABLE hrsa_page_list_template add (
+	system_type number
+);
+/
+
+update hrsa_page_list_template set system_type=0;
+/
+

resource/sqlupgrade/ST/sql202501150103.sql

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

resource/sqlupgrade/ST/sql202502060103.sql

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

resource/wiki/人员生成不了档案.sql

@@ -1,5 +1,9 @@
 select id from hrsa_tax_agent_emp
-where  tax_agent_id =扣缴义务人id and delete_type = 0 and employee_id not in (select employee_id from hrsa_salary_archive where tax_agent_id =扣缴义务人id and delete_type = 0)
+where  tax_agent_id =扣缴义务人id
+and delete_type = 0
+and employee_id not in
+(select employee_id from hrsa_salary_archive
+where tax_agent_id =扣缴义务人id and delete_type = 0)
 
 
 update hrsa_tax_agent_emp set delete_type = 3

resource/wiki/常用查询.md

@@ -25,5 +25,5 @@ where item.name = '工资薪金合计'
  left join hrsa_salary_item c on c.id=i.salary_item_id 
  left join hrsa_tax_agent t on a.tax_agent_id=t.id  
  where a.delete_type=0 and i.delete_type=0 and t.delete_type=0   and c.delete_type=0 
- and a.employee_id=人员id and t.name=扣缴义务人名称
- c.name='基本工资' order by effective_time desc
+ and a.employee_id=人员id and t.name=扣缴义务人名称 
+ and c.name='基本工资' order by effective_time desc

src/com/engine/salary/action/BatEditSalaryExcelAction.java

@@ -7,6 +7,7 @@ import com.engine.salary.enums.salaryarchive.SalaryArchiveListTypeEnum;
 import com.engine.salary.service.SalaryArchiveExcelService;
 import com.engine.salary.service.impl.SalaryArchiveExcelServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -45,6 +46,17 @@ public class BatEditSalaryExcelAction implements Action {
         this.operatorField = operatorField;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -53,6 +65,11 @@ public class BatEditSalaryExcelAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             String docId = fieldMap.get(batSalaryExcelField);
 
             RecordSet rs = new RecordSet();

src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java

@@ -7,6 +7,7 @@ import com.engine.salary.enums.salaryarchive.SalaryArchiveListTypeEnum;
 import com.engine.salary.service.SalaryArchiveExcelService;
 import com.engine.salary.service.impl.SalaryArchiveExcelServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -46,6 +47,17 @@ public class CheckBatEditSalaryExcelAction implements Action {
         this.operatorField = operatorField;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -53,6 +65,11 @@ public class CheckBatEditSalaryExcelAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             String docId = fieldMap.get(batSalaryExcelField);
 
             RecordSet rs = new RecordSet();

src/com/engine/salary/action/CheckEditSIArchiveAction.java

@@ -7,6 +7,7 @@ import com.engine.salary.service.impl.SISchemeServiceImpl;
 import com.engine.salary.util.SalaryEntityUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -42,6 +43,17 @@ public class CheckEditSIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -49,6 +61,11 @@ public class CheckEditSIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/CheckEditSalaryAction.java

@@ -6,6 +6,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.wrapper.SalaryArchiveWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -38,6 +39,17 @@ public class CheckEditSalaryAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -46,7 +58,11 @@ public class CheckEditSalaryAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
-
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/CheckInitSalaryAction.java

@@ -60,6 +60,17 @@ public class CheckInitSalaryAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -68,6 +79,11 @@ public class CheckInitSalaryAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
 
             RecordSet rs = new RecordSet();
 

src/com/engine/salary/action/CheckStayAddToPaySIArchiveAction.java

@@ -9,6 +9,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -49,6 +50,17 @@ public class CheckStayAddToPaySIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -57,6 +69,12 @@ public class CheckStayAddToPaySIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
+
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/CheckStayDelToStopSIArchiveAction.java

@@ -9,6 +9,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -49,6 +50,17 @@ public class CheckStayDelToStopSIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -57,6 +69,11 @@ public class CheckStayDelToStopSIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/CheckStopSalaryAction.java

@@ -54,6 +54,17 @@ public class CheckStopSalaryAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -62,6 +73,11 @@ public class CheckStopSalaryAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";
@@ -80,15 +96,18 @@ public class CheckStopSalaryAction implements Action {
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){
                 requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在！");
                 return FAILURE_AND_CONTINUE;
             }
             Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() );
             Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
             if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){
                 requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段！");
                 return FAILURE_AND_CONTINUE;
             }else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){
                 requestInfo.getRequestManager().setMessage("最后发薪日期格式错误，格式为yyyy-MM-dd");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误，格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString());
                 return FAILURE_AND_CONTINUE;
             }
 
@@ -99,15 +118,17 @@ public class CheckStopSalaryAction implements Action {
             List<SalaryArchivePO> salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build());
             if(CollectionUtils.isEmpty(salaryArchiveList)){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
             if(salaryArchiveList.size() > 1){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
 
         } catch (Exception e) {
-            log.error("停薪校验异常", e);
+            log.error("停薪检查异常", e);
             requestInfo.getRequestManager().setMessage(e.getMessage());
             return FAILURE_AND_CONTINUE;
         }

src/com/engine/salary/action/CopyToPaySIArchiveAction.java

@@ -11,6 +11,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -18,7 +19,10 @@ import weaver.interfaces.workflow.action.Action;
 import weaver.soa.workflow.request.Property;
 import weaver.soa.workflow.request.RequestInfo;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +51,17 @@ public class CopyToPaySIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -54,6 +69,11 @@ public class CopyToPaySIArchiveAction implements Action {
         Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                 property -> Util.null2String(property.getValue())));
 
+        String enable = fieldMap.get(enableField);
+        if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+            // 不执行action
+            return SUCCESS;
+        }
         RecordSet rs = new RecordSet();
 
         String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/EditSIArchiveAction.java

@@ -7,6 +7,7 @@ import com.engine.salary.service.impl.SISchemeServiceImpl;
 import com.engine.salary.util.SalaryEntityUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -41,6 +42,17 @@ public class EditSIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -48,6 +60,11 @@ public class EditSIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/EditSalaryAction.java

@@ -6,6 +6,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.wrapper.SalaryArchiveWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -38,6 +39,17 @@ public class EditSalaryAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -46,7 +58,11 @@ public class EditSalaryAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
-
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/EditToPaySIArchiveAction.java

@@ -15,6 +15,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -59,6 +60,17 @@ public class EditToPaySIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -66,6 +78,11 @@ public class EditToPaySIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/EditToStopSIArchiveAction.java

@@ -15,6 +15,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -59,6 +60,17 @@ public class EditToStopSIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -66,6 +78,11 @@ public class EditToStopSIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/InitSalaryAction.java

@@ -52,6 +52,9 @@ public class InitSalaryAction implements Action {
     private String tableName;
 
 
+    private String archiveStatus;
+
+
     public String getTableName() {
         return tableName;
     }
@@ -60,6 +63,17 @@ public class InitSalaryAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -67,6 +81,11 @@ public class InitSalaryAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";
@@ -132,6 +151,10 @@ public class InitSalaryAction implements Action {
                 .importDatas(importData)
                 .build();
 
+        if (StringUtils.isNotBlank(archiveStatus) && archiveStatus.equals(SalaryArchiveStatusEnum.PENDING.getValue())) {
+            build.setKeepStatus(true);
+        }
+
         //操作人
         String uid = importDataMap.getOrDefault("操作人", "1").toString();
         Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).importSalaryArchiveInit(build);

src/com/engine/salary/action/RehireAction.java

@@ -70,6 +70,17 @@ public class RehireAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -78,6 +89,12 @@ public class RehireAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
+
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/SendSalaryAction.java

@@ -65,12 +65,30 @@ public class SendSalaryAction implements Action {
      */
     private String sendBy;
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
 
     @Override
     public String execute(RequestInfo requestInfo) {
         Property[] properties = requestInfo.getMainTableInfo().getProperty();
         Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                 property -> Util.null2String(property.getValue())));
+
+        String enable = fieldMap.get(enableField);
+        if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+            // 不执行action
+            return SUCCESS;
+        }
+
         String idStr = fieldMap.get(idFieldName);
         if (StringUtils.isBlank(idStr)) {
             requestInfo.getRequestManager().setMessage("核算记录id或工资单id不能为空");

src/com/engine/salary/action/StayAddToPaySIArchiveAction.java

@@ -12,6 +12,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -54,6 +55,17 @@ public class StayAddToPaySIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -62,6 +74,11 @@ public class StayAddToPaySIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";

src/com/engine/salary/action/StayDelToStopSIArchiveAction.java

@@ -5,17 +5,16 @@ import com.engine.common.util.ServiceUtil;
 import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.siaccount.EmployeeStatusEnum;
-import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper;
 import com.engine.salary.mapper.taxagent.TaxAgentMapper;
 import com.engine.salary.service.SIArchivesService;
 import com.engine.salary.service.impl.SIArchivesServiceImpl;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryEntityUtil;
-import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
@@ -57,6 +56,17 @@ public class StayDelToStopSIArchiveAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -65,6 +75,11 @@ public class StayDelToStopSIArchiveAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
             String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?";
@@ -89,11 +104,24 @@ public class StayDelToStopSIArchiveAction implements Action {
             Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
 
             String payEndYearMonth = importDataMap.getOrDefault("最后缴纳月", "").toString();
+            // 如果只有一个“最后缴纳月”， 代表社保、公积金、其他均使用同一个最后缴纳月
+            String fundEndYearMonth = importDataMap.getOrDefault("公积金最后缴纳月", "").toString();
+            String otherEndYearMonth = importDataMap.getOrDefault("其他福利最后缴纳月", "").toString();
             if (StrUtil.isNotBlank(payEndYearMonth) && !SalaryDateUtil.checkYearMonth(payEndYearMonth)) {
                 requestInfo.getRequestManager().setMessage("最后缴纳月格式有误，正确格式示例为'2021-01'");
                 return FAILURE_AND_CONTINUE;
             }
 
+            if (StrUtil.isNotBlank(fundEndYearMonth) && !SalaryDateUtil.checkYearMonth(fundEndYearMonth)) {
+                requestInfo.getRequestManager().setMessage("公积金最后缴纳月格式有误，正确格式示例为'2021-01'");
+                return FAILURE_AND_CONTINUE;
+            }
+
+            if (StrUtil.isNotBlank(otherEndYearMonth) && !SalaryDateUtil.checkYearMonth(otherEndYearMonth)) {
+                requestInfo.getRequestManager().setMessage("其他福利最后缴纳月格式有误，正确格式示例为'2021-01'");
+                return FAILURE_AND_CONTINUE;
+            }
+
             //操作人
             String uid = importDataMap.getOrDefault("操作人","1").toString();
             User user = new User(Integer.parseInt(uid));
@@ -111,7 +139,7 @@ public class StayDelToStopSIArchiveAction implements Action {
             if (StrUtil.isBlank(payEndYearMonth)) {
                 resultMap = getSIArchivesService(user).stayDelToStop(Collections.singletonList(insuranceArchivesBaseInfoPO.getId()));
             } else {
-                resultMap = getSIArchivesService(user).stopWithoutLimit(Collections.singletonList(insuranceArchivesBaseInfoPO.getId()), payEndYearMonth);
+                resultMap = getSIArchivesService(user).stopWithoutLimit(Collections.singletonList(insuranceArchivesBaseInfoPO.getId()), payEndYearMonth, fundEndYearMonth, otherEndYearMonth);
             }
             if (resultMap.get("type").toString().equals("fail")) {
                 requestInfo.getRequestManager().setMessage(resultMap.get("msg").toString());

src/com/engine/salary/action/StopSalaryAction.java

@@ -60,6 +60,17 @@ public class StopSalaryAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -68,6 +79,11 @@ public class StopSalaryAction implements Action {
             Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                     property -> Util.null2String(property.getValue())));
 
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
             RecordSet rs = new RecordSet();
 
 
@@ -91,15 +107,18 @@ public class StopSalaryAction implements Action {
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){
                 requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在！");
                 return FAILURE_AND_CONTINUE;
             }
             Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() );
             Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
             if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){
                 requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段！");
                 return FAILURE_AND_CONTINUE;
             }else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){
                 requestInfo.getRequestManager().setMessage("最后发薪日期格式错误，格式为yyyy-MM-dd");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误，格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString());
                 return FAILURE_AND_CONTINUE;
             }
 
@@ -107,10 +126,12 @@ public class StopSalaryAction implements Action {
             List<SalaryArchivePO> salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build());
             if(CollectionUtils.isEmpty(salaryArchiveList)){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
             if(salaryArchiveList.size() > 1){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
             // 设置最后发薪日期

src/com/engine/salary/action/UpdateSISchemeDetailAction.java

@@ -55,12 +55,32 @@ public class UpdateSISchemeDetailAction implements Action {
         this.tableName = tableName;
     }
 
+    // 是否执行action的字段, 0代表不执行，其余代表执行
+    private String enableField;
+
+    public String getEnableField() {
+        return enableField;
+    }
+
+    public void setEnableField(String enableField) {
+        this.enableField = enableField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
             RequestManager requestManager = requestInfo.getRequestManager();
             User user = requestManager.getUser();
 
+            Property[] properties = requestInfo.getMainTableInfo().getProperty();
+            Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
+                    property -> Util.null2String(property.getValue())));
+            String enable = fieldMap.get(enableField);
+            if (StringUtils.isNotBlank(enable) && enable.equals("0")) {
+                // 不执行action
+                return SUCCESS;
+            }
+
             DetailTable[] detailTables = requestInfo.getDetailTableInfo().getDetailTable();
             List<Map<String, String>> detailList = new ArrayList<>();
             if (detailTables.length > 0) {

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

@@ -439,11 +439,11 @@ public class SIAccountBiz extends Service {
     public List<Long> listCanPayEmpIds(Long paymentOrganization, String billMonth) {
         List<Long> listCanPayEmpIds = new ArrayList<>();
         //社保档案中可进行缴纳的人员
-        List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         //公积金档案中可进行缴纳的人员
-        List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         //其他福利档案中可进行缴纳的人员
-        List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) {
             listCanPayEmpIds.addAll(socialCanPayEmpIds);
         }
@@ -517,7 +517,7 @@ public class SIAccountBiz extends Service {
         //临时表数据入库
         if (CollectionUtils.isNotEmpty(list)) {
             encryptUtil.encryptList(list, InsuranceAccountDetailTempPO.class);
-            List<List<InsuranceAccountDetailTempPO>> lists = splitList(list, 40);
+            List<List<InsuranceAccountDetailTempPO>> lists = splitList(list, 20);
             lists.forEach(subList -> {
                 getSIAccountDetailTempMapper().batchSaveAccountTempDetails(subList);
             });

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

src/com/engine/salary/encrypt/AESEncryptUtil.java

@@ -20,6 +20,8 @@ public class AESEncryptUtil {
 
     static String aesEncryptScrect = bb.getPropValue("hrmSalary", "AESEncryptScrect");
 
+    static String aes4SalaryBillEncryptScrect = "OETEP8JBA1C8IH721C1513AE82IFPE5";
+
     /**
      * AES加密
      *
@@ -34,6 +36,31 @@ public class AESEncryptUtil {
         return source;
     }
 
+    /**
+     * 工资单推送-员工id加密
+     * @param source
+     * @return
+     */
+    public static String encrypt4SalaryBill(String source) {
+        //防止初始化老数据时二次加密
+        if (StringUtils.isNotBlank(source) && !source.startsWith(SalarySysConstant.SALARY_BILL_PRE_SIGN_ENCRYPT)) {
+            return SalarySysConstant.SALARY_BILL_PRE_SIGN_ENCRYPT + AES.encrypt(source, aes4SalaryBillEncryptScrect);
+        }
+        return source;
+    }
+
+    public static String decrypt4SalaryBill(String encryptStr) {
+        if (StringUtils.isNotBlank(encryptStr)) {
+            if (encryptStr.startsWith(SalarySysConstant.SALARY_BILL_PRE_SIGN_ENCRYPT)) {
+                encryptStr = encryptStr.substring(4, encryptStr.length());
+                return AES.decrypt(encryptStr, aes4SalaryBillEncryptScrect);
+            } else {
+                return "";
+            }
+        }
+        return encryptStr;
+    }
+
 
     /**
      * AES解密

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

@@ -114,6 +114,17 @@ public class DataCollectionEmployee {
     @SalaryFormulaVar(defaultLabel = "证件号码", labelId = 98624, dataType = "string")
     private String idNo;
 
+
+    @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "string")
+    private String accountTypeName;
+
+    /**
+     * 账号类型
+     * 0/null：主账号    1：次账号
+     */
+    @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "string")
+    private Integer accountType;
+
     //是否是系统管理员
     private Boolean isAdmin;
 

src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java

@@ -0,0 +1,57 @@
+package com.engine.salary.entity.extemp.dto;
+
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import com.engine.salary.annotation.TableTitle;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 外部人员
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_external_employee
+@ElogTransform( name = "非系统人员")
+public class ExtEmpDTO {
+
+    @ElogTransform(name = "主键id")
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @TableTitle(title = "姓名", dataIndex = "username", key = "username")
+    private String username;
+
+    /**
+     * 部门
+     */
+    @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
+    private String departmentName;
+
+
+    /**
+     * 分部
+     */
+    @TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName")
+    private String subcompanyName;
+
+    /**
+     * 入职日期
+     */
+    @TableTitle(title = "入职日期", dataIndex = "companystartdate", key = "companystartdate")
+    private String companystartdate;
+
+
+    /**
+     * 工号
+     */
+    @TableTitle(title = "工号", dataIndex = "workcode", key = "workcode")
+    private String workcode;
+
+}

src/com/engine/salary/entity/hrm/po/HrmSnapshotPO.java

@@ -0,0 +1,434 @@
+package com.engine.salary.entity.hrm.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Date;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HrmSnapshotPO {
+
+	@ElogTransform(name = "id")
+	private Long id;
+
+	/**
+	 * 快照时间
+	 */
+	@ElogTransform(name = "快照时间")
+	private Date snapshotTime;
+
+
+	/**
+	 * 人员id
+	 */
+	@ElogTransform(name = "人员id")
+	private Long employeeId;
+
+	/**
+	 * 姓名
+	 */
+	@ElogTransform(name = "姓名")
+	private String lastname;
+
+
+	/**
+     * 工资帐号1
+     */
+    @ElogTransform(name = "工资帐号1")
+    private String accountid1;
+
+    /**
+     * 工资账号户名
+     */
+    @ElogTransform(name = "工资账号户名")
+    private String accountname;
+
+    /**
+     * 帐号类型
+     */
+    @ElogTransform(name = "帐号类型")
+    private Integer accounttype;
+
+    /**
+     * 公积金帐号
+     */
+    @ElogTransform(name = "公积金帐号")
+    private String accumfundaccount;
+
+    /**
+     * 助理
+     */
+    @ElogTransform(name = "助理")
+    private Integer assistantid;
+
+    /**
+     * 工资银行1
+     */
+    @ElogTransform(name = "工资银行1")
+    private Integer bankid1;
+
+    /**
+     * 所属主帐号
+     */
+    @ElogTransform(name = "所属主帐号")
+    private Integer belongto;
+
+    /**
+     * 入团时间
+     */
+    @ElogTransform(name = "入团时间")
+    private String bememberdate;
+
+    /**
+     * 入党时间
+     */
+    @ElogTransform(name = "入党时间")
+    private String bepartydate;
+
+    /**
+     * 生日
+     */
+    @ElogTransform(name = "生日")
+    private String birthday;
+
+    /**
+     * 出生地
+     */
+    @ElogTransform(name = "出生地")
+    private String birthplace;
+
+    /**
+     * 身份证号码
+     */
+    @ElogTransform(name = "身份证号码")
+    private String certificatenum;
+
+    /**
+     * 公司开始日期
+     */
+    @ElogTransform(name = "公司开始日期")
+    private String companystartdate;
+
+    /**
+     * 公司年限
+     */
+    @ElogTransform(name = "公司年限")
+    private BigDecimal companyworkyear;
+
+    /**
+     * 所属成本中心
+     */
+    @ElogTransform(name = "所属成本中心")
+    private Integer costcenterid;
+
+    /**
+     * 国家id
+     */
+    @ElogTransform(name = "国家id")
+    private Integer countryid;
+
+    /**
+     * 学位
+     */
+    @ElogTransform(name = "学位")
+    private String degree;
+
+    /**
+     * 所属部门
+     */
+    @ElogTransform(name = "所属部门")
+    private Integer departmentid;
+
+    /**
+     * 部门名称
+     */
+    @ElogTransform(name = "部门名称")
+    private String departmentname;
+
+    /**
+     * 学历
+     */
+    @ElogTransform(name = "学历")
+    private Integer educationlevel;
+
+    /**
+     * 电子邮件
+     */
+    @ElogTransform(name = "电子邮件")
+    private String email;
+
+
+    /**
+     * 合同结束日期
+     */
+    @ElogTransform(name = "合同结束日期")
+    private String enddate;
+
+    /**
+     * 分机
+     */
+    @ElogTransform(name = "分机")
+    private String extphone;
+
+    /**
+     * 传真
+     */
+    @ElogTransform(name = "传真")
+    private String fax;
+
+    /**
+     * 民族
+     */
+    @ElogTransform(name = "民族")
+    private String folk;
+
+    /**
+     * 健康状况
+     */
+    @ElogTransform(name = "健康状况")
+    private String healthinfo;
+
+    /**
+     * 家庭住址
+     */
+    @ElogTransform(name = "家庭住址")
+    private String homeaddress;
+
+
+    /**
+     * 是否为工会会员
+     */
+    @ElogTransform(name = "是否为工会会员")
+    private String islabouunion;
+
+    /**
+     * 职责描述
+     */
+    @ElogTransform(name = "职责描述")
+    private String jobactivitydesc;
+
+    /**
+     * 职称
+     */
+    @ElogTransform(name = "职称")
+    private Integer jobcall;
+
+    /**
+     * 职称名称
+     */
+    @ElogTransform(name = "职称名称")
+    private String jobcallname;
+
+    /**
+     * 工作级别
+     */
+    @ElogTransform(name = "工作级别")
+    private Integer joblevel;
+
+    /**
+     * 岗位
+     */
+    @ElogTransform(name = "岗位")
+    private Integer jobtitle;
+
+    /**
+     * 岗位名称
+     */
+    @ElogTransform(name = "岗位名称")
+    private String jobtitlename;
+
+    /**
+     * 最后登陆日期
+     */
+    @ElogTransform(name = "最后登陆日期")
+    private String lastlogindate;
+
+    /**
+     * 工作地点
+     */
+    @ElogTransform(name = "工作地点")
+    private Integer locationid;
+
+    /**
+     * 系统登陆帐号
+     */
+    @ElogTransform(name = "系统登陆帐号")
+    private String loginid;
+
+    /**
+     * 经理
+     */
+    @ElogTransform(name = "经理")
+    private Integer managerid;
+
+    /**
+     * 所有上级
+     */
+    @ElogTransform(name = "所有上级")
+    private String managerstr;
+
+    /**
+     * 婚姻状况
+     */
+    @ElogTransform(name = "婚姻状况")
+    private String maritalstatus;
+
+    /**
+     * 手机
+     */
+    @ElogTransform(name = "手机")
+    private String mobile;
+
+    /**
+     * 其他电话
+     */
+    @ElogTransform(name = "其他电话")
+    private String mobilecall;
+
+    /**
+     * 国籍
+     */
+    @ElogTransform(name = "国籍")
+    private Integer nationality;
+
+    /**
+     * 籍贯
+     */
+    @ElogTransform(name = "籍贯")
+    private String nativeplace;
+
+    /**
+     * 政治面貌
+     */
+    @ElogTransform(name = "政治面貌")
+    private String policy;
+
+    /**
+     * 试用期结束日期
+     */
+    @ElogTransform(name = "试用期结束日期")
+    private String probationenddate;
+
+    /**
+     * 户口
+     */
+    @ElogTransform(name = "户口")
+    private String regresidentplace;
+
+    /**
+     * 居住地电话
+     */
+    @ElogTransform(name = "居住地电话")
+    private String residentphone;
+
+    /**
+     * 居住地
+     */
+    @ElogTransform(name = "居住地")
+    private String residentplace;
+
+    /**
+     * 居住地邮编
+     */
+    @ElogTransform(name = "居住地邮编")
+    private String residentpostcode;
+
+    /**
+     * 用户类别
+     */
+    @ElogTransform(name = "用户类别")
+    private String resourcetype;
+
+    /**
+     * 安全级别
+     */
+    @ElogTransform(name = "安全级别")
+    private Integer seclevel;
+
+    /**
+     * 性别
+     */
+    @ElogTransform(name = "性别")
+    private String sex;
+
+
+
+    /**
+     * 合同开始日期
+     */
+    @ElogTransform(name = "合同开始日期")
+    private String startdate;
+
+    /**
+     * 0：试用<br>1：正式<br>2：临时<br>3：试用延期<br>4：解聘<br>5：离职<br>6：退休<br>7：无效
+     */
+    @ElogTransform(name = "	0：试用<br>1：正式<br>2：临时<br>3：试用延期<br>4：解聘<br>5：离职<br>6：退休<br>7：无效")
+    private Integer status;
+
+    /**
+     * 所属分部1
+     */
+    @ElogTransform(name = "所属分部1")
+    private Integer subcompanyid1;
+
+    /**
+     * 分部名称
+     */
+    @ElogTransform(name = "分部名称")
+    private String subcompanyname;
+
+    /**
+     * 电话
+     */
+    @ElogTransform(name = "电话")
+    private String telephone;
+
+    /**
+     * 暂住证号码
+     */
+    @ElogTransform(name = "暂住证号码")
+    private String tempresidentnumber;
+
+    /**
+     * 用工性质
+     */
+    @ElogTransform(name = "用工性质")
+    private Integer usekind;
+
+    /**
+     * 编号
+     */
+    @ElogTransform(name = "编号")
+    private String workcode;
+
+    /**
+     * 办公室
+     */
+    @ElogTransform(name = "办公室")
+    private String workroom;
+
+    /**
+     * 工作开始日期
+     */
+    @ElogTransform(name = "工作开始日期")
+    private String workstartdate;
+
+    /**
+     * 工作年限
+     */
+    @ElogTransform(name = "工作年限")
+    private BigDecimal workyear;
+
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}

src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java

@@ -9,6 +9,7 @@ import com.engine.salary.constant.HrmSalaryPayrollConf;
 import com.engine.salary.constant.SalaryArchiveConstant;
 import com.engine.salary.constant.SalaryBillConstant;
 import com.engine.salary.constant.SalaryTemplateSalaryItemSetGroupConstant;
+import com.engine.salary.encrypt.AESEncryptUtil;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.salaryBill.dto.*;
 import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO;
@@ -145,6 +146,8 @@ public class SalaryBillBO {
                     .workcode(simpleEmployee.getWorkcode())
                     .idNo(simpleEmployee.getIdNo())
                     .statusName(simpleEmployee.getStatusName())
+                    .accountType(simpleEmployee.getAccountType())
+                    .accountTypeName(simpleEmployee.getAccountTypeName())
                     .build();
             List<SalaryTemplateSalaryItemListDTO> items = employeeInformation.getItems();
             // 1.SalaryAcctResultBO.buildEmployeeFieldName()的取法
@@ -248,9 +251,9 @@ public class SalaryBillBO {
         String title = billTitle; // 标题
         String context = "点击查看详情"; // 内容
         // PC端链接
-        String linkUrl = weaver.general.GCONST.getContextPath() + "/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=" + id + "&recipient=" + employeeId;
+        String linkUrl = weaver.general.GCONST.getContextPath() + "/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=" + id + "&salaryCode=" + AESEncryptUtil.encrypt4SalaryBill(employeeId.toString());
         // 移动端链接
-        String linkMobileUrl = weaver.general.GCONST.getContextPath() + "/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?type=phone&id=" + id + "&recipient=" + employeeId;
+        String linkMobileUrl = weaver.general.GCONST.getContextPath() + "/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?type=phone&id=" + id + "&salaryCode=" + AESEncryptUtil.encrypt4SalaryBill(employeeId.toString());
         try {
             MessageBean messageBean = Util_Message.createMessage(messageType, userIdList, title, context, linkUrl, linkMobileUrl);
             messageBean.setCreater(Integer.parseInt(salaryBillSendParam.getSendUser().getUID() + ""));// 创建人id
@@ -264,7 +267,7 @@ public class SalaryBillBO {
             }
             Util_Message.store(messageBean);
         } catch (IOException e) {
-            log.error("消息发送失败",e);
+            log.error("消息发送失败", e);
         }
     }
 
@@ -646,7 +649,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);
@@ -657,7 +661,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;
@@ -726,7 +730,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);
@@ -737,7 +742,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;
@@ -864,7 +869,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);

src/com/engine/salary/entity/salaryBill/dto/SalaryMySalaryBillListDTO.java

@@ -34,5 +34,7 @@ public class SalaryMySalaryBillListDTO {
 
     private Long employeeId;
 
+    private String salaryCode;
+
 
 }

src/com/engine/salary/entity/salaryBill/param/SalaryBillGetTokenParam.java

@@ -0,0 +1,26 @@
+package com.engine.salary.entity.salaryBill.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName SalaryBillGetTokenParam
+ * @author Harryxzy
+ * @date 2024/11/6 9:59
+ * @description 第三方获取token参数
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalaryBillGetTokenParam {
+
+    // 新
+    private String salaryCode;
+
+    // 老 未加密
+    private String recipient;
+
+}

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;

src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java

@@ -8,6 +8,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentDataDTO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.enums.AccountTypeEnum;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.google.common.collect.Lists;
@@ -66,6 +67,7 @@ public class SalaryAcctEmployeeBO {
                             .departmentId(e.getDepartmentId())
                             .departmentName(e.getDepartmentName())
                             .status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(e.getStatus())))
+                            .accountType(AccountTypeEnum.getDefaultLabelByValue(e.getAccountType()))
                             .mobile(simpleEmployee.getMobile())
                             .jobNum(simpleEmployee.getWorkcode())
                             .hireDate(simpleEmployee.getCompanystartdate())
@@ -110,6 +112,7 @@ public class SalaryAcctEmployeeBO {
                         .subcompanyId(emp.getSubcompanyid())
                         .subcompanyName(emp.getSubcompanyName())
                         .status(emp.getStatus())
+                        .accountType(emp.getAccountType())
                         .creator(employeeId)
                         .createTime(now)
                         .updateTime(now)
@@ -138,6 +141,8 @@ public class SalaryAcctEmployeeBO {
         simpleEmployee.setJobtitleName(acctEmployeePO.getJobtitleName());
         simpleEmployee.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(acctEmployeePO.getStatus(), "1"))));
         simpleEmployee.setStatus(acctEmployeePO.getStatus());
+        simpleEmployee.setAccountType(acctEmployeePO.getAccountType());
+        simpleEmployee.setAccountTypeName(AccountTypeEnum.getDefaultLabelByValue(acctEmployeePO.getAccountType()));
     }
 
 

src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java

@@ -6,12 +6,14 @@ import com.engine.salary.entity.salaryformula.dto.SalaryFormulaEmployeeDTO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobItemPO;
+import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
 import com.engine.salary.util.JsonUtil;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import weaver.general.Util;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -92,6 +94,8 @@ public class SalaryAcctFormulaBO {
                     .sex(sexName)
                     .status(simpleEmployee.getStatus())
                     .statusName(simpleEmployee.getStatusName())
+                    .accountType(simpleEmployee.getAccountType())
+                    .accountTypeName(simpleEmployee.getAccountTypeName())
                     .departmentName(simpleEmployee.getDepartmentName())
                     .departmentId(simpleEmployee.getDepartmentId())
                     .subcompanyName(simpleEmployee.getSubcompanyName())
@@ -113,8 +117,10 @@ public class SalaryAcctFormulaBO {
                     .mobile(simpleEmployee.getMobile())
                     .telephone(simpleEmployee.getTelephone())
                     .sex(sexName)
-                    .status(simpleEmployee.getStatus())
-                    .statusName(simpleEmployee.getStatusName())
+                    .status(salaryAcctEmployeePO.getStatus())
+                    .statusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(salaryAcctEmployeePO.getStatus(), "1"))))
+                    .accountType(simpleEmployee.getAccountType())
+                    .accountTypeName(simpleEmployee.getAccountTypeName())
                     .departmentName(salaryAcctEmployeePO.getDepartmentName())
                     .departmentId(salaryAcctEmployeePO.getDepartmentId())
                     .subcompanyName(salaryAcctEmployeePO.getSubcompanyName())