Merge branch 'release/2.19.1.2501.01' into custom/金华交投
# Conflicts: # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/sys/constant/SalarySysConstant.java # src/com/engine/salary/util/SalaryTokenUtil.java # src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java # src/com/engine/salary/wrapper/SalaryApprovalWrapper.java
This commit is contained in:
Harryxzy
commit
84e567f100
|
|
@ -1,5 +1,5 @@
|
|||
log=false
|
||||
defaultCloseNonStandard149=true
|
||||
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
|
||||
version=2.16.1.2410.01
|
||||
version=2.19.1.2501.01
|
||||
openFormulaForcedEditing=false
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_acct_emp add account_type NUMBER;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE hrsa_page_list_setting add (
|
||||
default_setting number
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE hrsa_page_list_template add (
|
||||
system_type number
|
||||
);
|
||||
/
|
||||
|
||||
update hrsa_page_list_template set system_type=0;
|
||||
/
|
||||
|
||||
|
|
@ -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
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_page_list_template add file_id int;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_acct_emp add account_type NUMBER;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE hrsa_page_list_setting add (
|
||||
default_setting number
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE hrsa_page_list_template add (
|
||||
system_type number
|
||||
);
|
||||
/
|
||||
|
||||
update hrsa_page_list_template set system_type=0;
|
||||
/
|
||||
|
||||
|
|
@ -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
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_page_list_template add file_id int;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_acct_emp add account_type NUMBER;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE hrsa_page_list_setting add (
|
||||
default_setting number
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE hrsa_page_list_template add (
|
||||
system_type number
|
||||
);
|
||||
/
|
||||
|
||||
update hrsa_page_list_template set system_type=0;
|
||||
/
|
||||
|
||||
|
|
@ -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
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_page_list_template add file_id int;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE hrsa_salary_acct_emp ADD COLUMN account_type int(0);
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE hrsa_page_list_setting ADD COLUMN default_setting int;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
ALTER TABLE hrsa_page_list_template ADD COLUMN system_type int;
|
||||
|
||||
update hrsa_page_list_template set system_type=0;
|
||||
|
|
@ -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
|
||||
) ;
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE hrsa_page_list_template ADD COLUMN file_id int(0);
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
alter table hrsa_salary_acct_emp add account_type NUMBER
|
||||
/
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
ALTER TABLE hrsa_page_list_setting add (
|
||||
default_setting number
|
||||
)
|
||||
/
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
ALTER TABLE hrsa_page_list_template add (
|
||||
system_type number
|
||||
)
|
||||
/
|
||||
|
||||
update hrsa_page_list_template set system_type=0
|
||||
/
|
||||
|
|
@ -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
|
||||
)
|
||||
|
||||
/
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
alter table hrsa_page_list_template add file_id int
|
||||
/
|
||||
|
|
@ -0,0 +1 @@
|
|||
alter table hrsa_salary_acct_emp add account_type int;
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE hrsa_page_list_setting ADD COLUMN default_setting int ;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
ALTER TABLE hrsa_page_list_template ADD COLUMN system_type int ;
|
||||
|
||||
update hrsa_page_list_template set system_type=0;
|
||||
|
|
@ -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)
|
||||
) ;
|
||||
|
|
@ -0,0 +1 @@
|
|||
alter table hrsa_page_list_template add file_id int;
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
ALTER TABLE hrsa_salary_acct_emp ADD account_type int
|
||||
GO
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
ALTER TABLE hrsa_page_list_setting ADD default_setting int NULL
|
||||
GO
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
alter table hrsa_page_list_template add file_id int
|
||||
go
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_salary_acct_emp add account_type NUMBER;
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE hrsa_page_list_setting add (
|
||||
default_setting number
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE hrsa_page_list_template add (
|
||||
system_type number
|
||||
);
|
||||
/
|
||||
|
||||
update hrsa_page_list_template set system_type=0;
|
||||
/
|
||||
|
||||
|
|
@ -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
|
||||
);
|
||||
/
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
alter table hrsa_page_list_template add file_id int;
|
||||
/
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -63,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 {
|
||||
|
|
@ -70,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 = ?";
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -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不能为空");
|
||||
|
|
|
|||
|
|
@ -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 = ?";
|
||||
|
|
|
|||
|
|
@ -14,6 +14,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;
|
||||
|
|
@ -55,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 {
|
||||
|
|
@ -63,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 = ?";
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -146,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()的取法
|
||||
|
|
|
|||
|
|
@ -34,5 +34,7 @@ public class SalaryMySalaryBillListDTO {
|
|||
|
||||
private Long employeeId;
|
||||
|
||||
private String salaryCode;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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()));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import com.engine.salary.entity.salarysob.dto.SalarySobItemDTO;
|
|||
import com.engine.salary.entity.salarysob.dto.SalarySobItemGroupDTO;
|
||||
import com.engine.salary.entity.salarysob.po.*;
|
||||
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
|
||||
import com.engine.salary.enums.AccountTypeEnum;
|
||||
import com.engine.salary.enums.SalaryValueTypeEnum;
|
||||
import com.engine.salary.enums.UserStatusEnum;
|
||||
import com.engine.salary.enums.salaryaccounting.LockStatusEnum;
|
||||
|
|
@ -310,6 +311,10 @@ public class SalaryAcctResultBO {
|
|||
map.put("status", e.getStatus());
|
||||
} else if ("statusName".equals(salarySobEmpField.getFieldCode())) {
|
||||
map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(e.getStatus(), "1"))));
|
||||
} else if ("accountType".equals(salarySobEmpField.getFieldCode())) {
|
||||
map.put("accountType", e.getAccountType());
|
||||
} else if ("accountTypeName".equals(salarySobEmpField.getFieldCode())) {
|
||||
map.put("accountTypeName", AccountTypeEnum.getDefaultLabelByValue(e.getAccountType()));
|
||||
} else {
|
||||
map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
|
||||
}
|
||||
|
|
@ -397,6 +402,10 @@ public class SalaryAcctResultBO {
|
|||
map.put("status", salaryAcctEmployee.getStatus());
|
||||
} else if ("statusName".equals(salarySobEmpField.getFieldCode())) {
|
||||
map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(salaryAcctEmployee.getStatus(), "1"))));
|
||||
} else if ("accountType".equals(salarySobEmpField.getFieldCode())) {
|
||||
map.put("accountType", salaryAcctEmployee.getAccountType());
|
||||
} else if ("accountTypeName".equals(salarySobEmpField.getFieldCode())) {
|
||||
map.put("accountTypeName", AccountTypeEnum.getDefaultLabelByValue(salaryAcctEmployee.getAccountType()));
|
||||
} else {
|
||||
map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public class SalaryAccEmployeeListDTO {
|
|||
@TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
|
||||
private String employeeName;
|
||||
|
||||
//个税扣缴义务人id")
|
||||
//个税扣缴义务人id
|
||||
private Long taxAgentId;
|
||||
|
||||
|
||||
|
|
@ -38,30 +38,28 @@ public class SalaryAccEmployeeListDTO {
|
|||
@TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
|
||||
private String taxAgentName;
|
||||
|
||||
//部门id")
|
||||
//部门id
|
||||
private Long departmentId;
|
||||
|
||||
|
||||
//部门")
|
||||
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
|
||||
private String departmentName;
|
||||
|
||||
//手机号
|
||||
@TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile")
|
||||
private String mobile;
|
||||
|
||||
|
||||
//工号")
|
||||
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
|
||||
private String jobNum;
|
||||
|
||||
|
||||
//员工状态")
|
||||
@TableTitle(title = "员工状态", dataIndex = "status", key = "status")
|
||||
private String status;
|
||||
|
||||
@TableTitle(title = "账号类型", dataIndex = "accountType", key = "accountType")
|
||||
private String accountType;
|
||||
|
||||
|
||||
//入职日期")
|
||||
@TableTitle(title = "入职日期", dataIndex = "hireDate", key = "hireDate")
|
||||
private String hireDate;
|
||||
|
||||
|
|
|
|||
|
|
@ -157,6 +157,13 @@ public class SalaryAcctEmployeePO {
|
|||
private List<Long> lockItems;
|
||||
|
||||
|
||||
/**
|
||||
* 主次账号 0/null：主账号 1：次账号
|
||||
*/
|
||||
private Integer accountType;
|
||||
|
||||
|
||||
|
||||
//--------条件----------
|
||||
//主键id集合
|
||||
private Collection<Long> ids;
|
||||
|
|
|
|||
|
|
@ -77,14 +77,12 @@ public class SalaryAcctRecordPO {
|
|||
* 回算（上次核算的薪资核算记录id）
|
||||
*/
|
||||
@Deprecated
|
||||
// //备用字段1", ignore = true)
|
||||
private Long superId;
|
||||
|
||||
/**
|
||||
* 回算（最原始的那次薪资核算记录id）
|
||||
*/
|
||||
@Deprecated
|
||||
// //备用字段2", ignore = true)
|
||||
private Long rootId;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public class SalaryArchiveBO {
|
|||
*
|
||||
* @param salaryItems
|
||||
*/
|
||||
public static List<WeaTableColumn> buildSalaryArchiveTable(List<SalaryItemPO> salaryItems) {
|
||||
public static List<WeaTableColumn> buildSalaryArchiveTable(List<SalaryItemPO> salaryItems, boolean openSecondaryAccount) {
|
||||
// 表格表头
|
||||
List<WeaTableColumn> columns = new ArrayList<>();
|
||||
WeaTableColumn idColumn = new WeaTableColumn("100px", "id", "id");
|
||||
|
|
@ -72,6 +72,9 @@ public class SalaryArchiveBO {
|
|||
employeeIdColumn.setDisplay(WeaBoolAttr.FALSE);
|
||||
columns.add(employeeIdColumn);
|
||||
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username"));
|
||||
if (openSecondaryAccount) {
|
||||
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "账号类型"), "accountType"));
|
||||
}
|
||||
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgentName"));
|
||||
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "分部"), "subcompanyName"));
|
||||
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
|
||||
|
|
|
|||
|
|
@ -782,6 +782,7 @@ public class SalaryArchiveExcelBO extends Service {
|
|||
// .modifier(importHandleParam.getCurrentEmployeeId())
|
||||
.deleteType(NumberUtils.INTEGER_ZERO)
|
||||
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
|
||||
.employeeType(importHandleParam.isExtEmp() ? 1 : null)
|
||||
.build();
|
||||
// 定薪action 保持状态为待定薪
|
||||
if (importHandleParam.isInit() && importHandleParam.getKeepStatus() != null && importHandleParam.getKeepStatus().equals(Boolean.TRUE)) {
|
||||
|
|
|
|||
|
|
@ -121,4 +121,7 @@ public class SalaryArchiveListDTO {
|
|||
*/
|
||||
private String archiveStatus;
|
||||
|
||||
//主次账号 0/null：主账号 1：次账号
|
||||
private Integer accountType;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,6 +69,11 @@ public class SalaryFormulaEmployeeDTO {
|
|||
@SalaryFormulaVar(defaultLabel = "状态", labelId = 98622, dataType = "string")
|
||||
private String statusName;
|
||||
|
||||
@SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "string")
|
||||
private String accountTypeName;
|
||||
|
||||
@SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "string")
|
||||
private Integer accountType;
|
||||
//工号
|
||||
@SalaryFormulaVar(defaultLabel = "工号", labelId = 98622, dataType = "string")
|
||||
private String workcode;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.engine.salary.common.LocalDateRange;
|
|||
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
|
||||
import com.engine.salary.entity.salarysob.po.SalarySobPO;
|
||||
import com.engine.salary.enums.SalaryCycleTypeEnum;
|
||||
import com.engine.salary.util.SalaryDateUtil;
|
||||
|
||||
import java.time.*;
|
||||
import java.util.Date;
|
||||
|
|
@ -30,7 +31,8 @@ public class SalarySobCycleBO {
|
|||
if (salarySob == null) {
|
||||
return null;
|
||||
}
|
||||
return SalarySobCycleDTO.builder()
|
||||
|
||||
SalarySobCycleDTO salarySobCycleDTO = SalarySobCycleDTO.builder()
|
||||
.salarySobId(salarySob.getId())
|
||||
.salaryMonth(salaryMonth)
|
||||
.taxCycle(buildCycle(salaryMonth, salarySob.getTaxCycleType()))
|
||||
|
|
@ -38,6 +40,18 @@ public class SalarySobCycleBO {
|
|||
.salaryCycle(buildCycleDateRange(salaryMonth, salarySob.getSalaryCycleType(), salarySob.getSalaryCycleFromDay()))
|
||||
.attendCycle(buildCycleDateRange(salaryMonth, salarySob.getAttendCycleType(), salarySob.getAttendCycleFromDay()))
|
||||
.build();
|
||||
|
||||
salarySobCycleDTO.setSalaryDate(SalaryDateUtil.toDate(salarySobCycleDTO.getSalaryMonth(), 1));
|
||||
salarySobCycleDTO.setTaxDate(SalaryDateUtil.toDate(salarySobCycleDTO.getTaxCycle(), 1));
|
||||
salarySobCycleDTO.setSocialSecurityDate(SalaryDateUtil.toDate(salarySobCycleDTO.getSocialSecurityCycle(), 1));
|
||||
LocalDateRange salaryCycle = salarySobCycleDTO.getSalaryCycle();
|
||||
salarySobCycleDTO.setSalaryCycleFromDate(salaryCycle.getFromDate());
|
||||
salarySobCycleDTO.setSalaryCycleEndDate(salaryCycle.getEndDate());
|
||||
LocalDateRange attendCycle = salarySobCycleDTO.getAttendCycle();
|
||||
salarySobCycleDTO.setAttendCycleFromDate(attendCycle.getFromDate());
|
||||
salarySobCycleDTO.setAttendCycleEndDate(attendCycle.getEndDate());
|
||||
|
||||
return salarySobCycleDTO;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.engine.salary.entity.setting.dto;
|
||||
|
||||
import com.cloudstore.eccom.pc.table.WeaTableColumn;
|
||||
import com.engine.salary.annotation.TableTitle;
|
||||
import com.engine.salary.enums.common.SharedTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
|
@ -8,13 +9,66 @@ import lombok.NoArgsConstructor;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 薪资帐套表
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
//hrsa_page_list_template
|
||||
public class PageListTemplateDTO {
|
||||
private List<WeaTableColumn> setting;
|
||||
private List<WeaTableColumn> checked;
|
||||
|
||||
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 模板名称
|
||||
*/
|
||||
@TableTitle(title = "模板名称",dataIndex = "name",key = "name")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 页面
|
||||
*/
|
||||
private String page;
|
||||
|
||||
/**
|
||||
* 设置
|
||||
*/
|
||||
private List<String> setting;
|
||||
|
||||
/**
|
||||
* 是否共享,0否，1是
|
||||
* @see SharedTypeEnum
|
||||
*/
|
||||
private Integer sharedType;
|
||||
|
||||
@TableTitle(title = "可见性",dataIndex = "sharedTypeName",key = "sharedTypeName")
|
||||
private String sharedTypeName;
|
||||
|
||||
/**
|
||||
* 是否系统模板
|
||||
*/
|
||||
private Integer systemType;
|
||||
|
||||
@TableTitle(title = "是否系统模板",dataIndex = "systemTypeName",key = "systemTypeName")
|
||||
private String systemTypeName;
|
||||
|
||||
@TableTitle(title = "范围",dataIndex = "limits",key = "limits")
|
||||
private String limits;
|
||||
|
||||
@TableTitle(title = "导出模板",dataIndex = "fileName",key = "fileName")
|
||||
private String fileName;
|
||||
private Integer fileId;
|
||||
|
||||
|
||||
/**
|
||||
* 限制
|
||||
*/
|
||||
private List<Long> limitIds;
|
||||
|
||||
private Boolean canEdit;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.engine.salary.entity.setting.dto;
|
||||
|
||||
import com.cloudstore.eccom.pc.table.WeaTableColumn;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PageListTemplateDetailDTO {
|
||||
private List<WeaTableColumn> setting;
|
||||
private List<WeaTableColumn> checked;
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.engine.salary.entity.setting.param;
|
||||
|
||||
import com.engine.salary.util.valid.DataCheck;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DownloadTemplateParam {
|
||||
|
||||
@DataCheck(require = true,message = "请选择表头")
|
||||
private List<String> heads;
|
||||
|
||||
@DataCheck(require = true,message = "请选择设置")
|
||||
private List<String> setting;
|
||||
|
||||
}
|
||||
|
|
@ -19,4 +19,5 @@ public class PageListSettingQueryParam {
|
|||
private String page;
|
||||
|
||||
private String name;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.engine.salary.entity.setting.param;
|
||||
|
||||
import com.engine.salary.util.valid.DataCheck;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 恢复默认值
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PageListSettingResetParam {
|
||||
/**
|
||||
* 页面，0：薪资明细
|
||||
*/
|
||||
@DataCheck(require = true,message = "请选择页面")
|
||||
private String page;
|
||||
}
|
||||
|
|
@ -17,6 +17,12 @@ import java.util.List;
|
|||
@AllArgsConstructor
|
||||
public class PageListSettingSaveParam {
|
||||
|
||||
/**
|
||||
* 默认设置
|
||||
*/
|
||||
@DataCheck(require = true,message = "是否为默认设置")
|
||||
private Integer defaultSetting;
|
||||
|
||||
/**
|
||||
* 页面，0：薪资明细
|
||||
*/
|
||||
|
|
@ -27,5 +33,5 @@ public class PageListSettingSaveParam {
|
|||
* 设置
|
||||
*/
|
||||
@DataCheck(require = true,message = "请选择设置")
|
||||
private List<Long> setting;
|
||||
private List<String> setting;
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.engine.salary.entity.setting.param;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PageListTemplateDeleteParam {
|
||||
private List<Long> ids;
|
||||
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package com.engine.salary.entity.setting.param;
|
||||
|
||||
import com.engine.salary.common.BaseQueryParam;
|
||||
import com.engine.salary.util.valid.DataCheck;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
|
|
@ -13,7 +14,7 @@ import lombok.NoArgsConstructor;
|
|||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PageListTemplateQueryParam {
|
||||
public class PageListTemplateQueryParam extends BaseQueryParam {
|
||||
|
||||
private Long id;
|
||||
|
||||
|
|
|
|||
|
|
@ -40,4 +40,9 @@ public class PageListTemplateSaveParam {
|
|||
*/
|
||||
@DataCheck(require = true,message = "请选择设置")
|
||||
private List<String> setting;
|
||||
|
||||
/**
|
||||
* 导出模板id
|
||||
*/
|
||||
private Integer fileId;
|
||||
}
|
||||
|
|
@ -10,13 +10,11 @@ import java.util.Collection;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 薪资帐套表
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
//hrsa_page_list_setting
|
||||
public class PageListSettingPO {
|
||||
|
||||
@ElogTransform(name = "id")
|
||||
|
|
@ -32,7 +30,12 @@ public class PageListSettingPO {
|
|||
* 设置
|
||||
*/
|
||||
@ElogTransform(name = "设置")
|
||||
private List<Long> setting;
|
||||
private List<String> setting;
|
||||
|
||||
/**
|
||||
* 默认设置
|
||||
*/
|
||||
private Integer defaultSetting;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.engine.salary.entity.setting.po;
|
||||
|
||||
import com.engine.hrmelog.annotation.ElogTransform;
|
||||
import com.engine.salary.enums.common.SharedTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
|
@ -11,12 +12,13 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 薪资帐套表
|
||||
* 页面模板表
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
//hrsa_page_list_template
|
||||
public class PageListTemplatePO {
|
||||
|
||||
|
||||
|
|
@ -44,16 +46,29 @@ public class PageListTemplatePO {
|
|||
|
||||
/**
|
||||
* 是否共享,0否，1是
|
||||
* @see SharedTypeEnum
|
||||
*/
|
||||
@ElogTransform(name = "是否共享,0否，1是")
|
||||
@ElogTransform(name = "可见性：1私有，0共享")
|
||||
private Integer sharedType;
|
||||
|
||||
/**
|
||||
* 是否系统模板
|
||||
*/
|
||||
@ElogTransform(name = "是否系统模板,0否，1是")
|
||||
private Integer systemType;
|
||||
|
||||
/**
|
||||
* 限制
|
||||
*/
|
||||
@ElogTransform(name = "限制")
|
||||
private List<Long> limitIds;
|
||||
|
||||
/**
|
||||
* 限制
|
||||
*/
|
||||
@ElogTransform(name = "限制")
|
||||
private List<Long> limitIds;
|
||||
|
||||
/**
|
||||
* excel模板文件id
|
||||
*/
|
||||
@ElogTransform(name = "模板文件id")
|
||||
private Integer fileId;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
|
|
@ -67,23 +82,23 @@ public class PageListTemplatePO {
|
|||
@ElogTransform(name = "更新时间")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ElogTransform(name = "创建时间")
|
||||
private Date createTime;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ElogTransform(name = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@ElogTransform(name = "创建人")
|
||||
private Long creator;
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@ElogTransform(name = "创建人")
|
||||
private Long creator;
|
||||
|
||||
/**
|
||||
* 是否已删除。0：未删除、1：已删除
|
||||
*/
|
||||
@ElogTransform(name = "是否已删除。0：未删除、1：已删除")
|
||||
private Integer deleteType;
|
||||
/**
|
||||
* 是否已删除。0：未删除、1：已删除
|
||||
*/
|
||||
@ElogTransform(name = "是否已删除。0：未删除、1：已删除")
|
||||
private Integer deleteType;
|
||||
|
||||
|
||||
//主键id集合
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
package com.engine.salary.entity.taxdeclaration.param;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.YearMonth;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 生成个税申报表参数
|
||||
|
|
@ -42,4 +44,10 @@ public class TaxDeclarationSaveParam {
|
|||
private String description;
|
||||
|
||||
private String salaryMonthStr;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date taxCycle;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date salaryDate;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
package com.engine.salary.enums;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* 账号类型
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
public enum AccountTypeEnum implements BaseEnum {
|
||||
|
||||
MAIN(0, "主账号", 1),
|
||||
SECOND(1, "次账号", 1);
|
||||
|
||||
private Integer value;
|
||||
private String defaultLabel;
|
||||
private int labelId;
|
||||
|
||||
|
||||
AccountTypeEnum(Integer value, String defaultLabel, int labelId) {
|
||||
this.value = value;
|
||||
this.defaultLabel = defaultLabel;
|
||||
this.labelId = labelId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultLabel() {
|
||||
return defaultLabel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getLabelId() {
|
||||
return labelId;
|
||||
}
|
||||
|
||||
public static String getDefaultLabelByValue(Integer value) {
|
||||
if (value == null) {
|
||||
return MAIN.defaultLabel;
|
||||
}
|
||||
Optional<AccountTypeEnum> optional = Arrays.stream(AccountTypeEnum.values()).filter(r -> r.getValue().equals(value)).findFirst();
|
||||
return optional.isPresent() ? optional.get().defaultLabel : "";
|
||||
}
|
||||
|
||||
|
||||
public static AccountTypeEnum parseByValue(Integer value) {
|
||||
if (value == null) {
|
||||
return MAIN;
|
||||
}
|
||||
|
||||
for (AccountTypeEnum statusEnum : AccountTypeEnum.values()) {
|
||||
if (Objects.equals(statusEnum.getValue(), value)) {
|
||||
return statusEnum;
|
||||
}
|
||||
}
|
||||
return MAIN;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package com.engine.salary.enums.common;
|
||||
|
||||
import com.engine.salary.enums.BaseEnum;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
public enum SharedTypeEnum implements BaseEnum<Integer> {
|
||||
PRIVATE(1, "私有", 86569),
|
||||
PUBLIC(0, "共享", 86568);
|
||||
|
||||
private Integer value;
|
||||
|
||||
private String defaultLabel;
|
||||
|
||||
private Integer labelId;
|
||||
|
||||
SharedTypeEnum(Integer value, String defaultLabel, Integer labelId) {
|
||||
this.value = value;
|
||||
this.defaultLabel = defaultLabel;
|
||||
this.labelId = labelId;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Integer getValue() {
|
||||
return this.value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getLabelId() {
|
||||
return this.labelId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultLabel() {
|
||||
return this.defaultLabel;
|
||||
}
|
||||
|
||||
public static SharedTypeEnum parseByValue(Integer value) {
|
||||
for (SharedTypeEnum enums : SharedTypeEnum.values()) {
|
||||
if (Objects.equals(enums.getValue(), value)) {
|
||||
return enums;
|
||||
}
|
||||
}
|
||||
return PUBLIC;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
package com.engine.salary.handle;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.ibatis.type.BaseTypeHandler;
|
||||
import org.apache.ibatis.type.JdbcType;
|
||||
|
||||
import java.sql.CallableStatement;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 集合的转换
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
@Slf4j
|
||||
public class LongListTypeHandler extends BaseTypeHandler<List<Long>> {
|
||||
|
||||
@Override
|
||||
public void setNonNullParameter(PreparedStatement preparedStatement, int i, List<Long> list, JdbcType jdbcType) throws SQLException {
|
||||
preparedStatement.setString(i, JSON.toJSONString(list));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> getNullableResult(ResultSet resultSet, String s) throws SQLException {
|
||||
List jsonArray = JSONArray.parseArray(resultSet.getString(s), Long.class);
|
||||
return jsonArray == null ? new ArrayList<>() : jsonArray;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> getNullableResult(ResultSet resultSet, int i) throws SQLException {
|
||||
List jsonArray = JSONArray.parseArray(resultSet.getString(i), Long.class);
|
||||
return jsonArray == null ? new ArrayList<>() : jsonArray;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
|
||||
List jsonArray = JSONArray.parseArray(callableStatement.getString(i), Long.class);
|
||||
return jsonArray == null ? new ArrayList<>() : jsonArray;
|
||||
}
|
||||
}
|
||||
|
|
@ -54,7 +54,7 @@ public class AddUpSituationManager extends Service {
|
|||
// 调用生成申报单接口
|
||||
YearMonth yearMonth = YearMonth.of(localDate.getYear(), localDate.getMonth());
|
||||
try {
|
||||
getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).taxAgentId(po.getTaxAgentId()).build());
|
||||
getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).salaryDate(po.getSalaryMonth()).taxCycle(po.getTaxCycle()).taxAgentId(po.getTaxAgentId()).build());
|
||||
} catch (Exception e) {
|
||||
bb.writeLog("错误:" + e);
|
||||
result = false;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
LEFT JOIN hrmresource e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
</select>
|
||||
<select id="exportExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="oracle">
|
||||
SELECT
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
LEFT JOIN hrmresource e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
</select>
|
||||
<select id="exportExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="sqlserver">
|
||||
SELECT
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
LEFT JOIN hrmresource e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
|
||||
|
|
@ -205,7 +205,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
|
||||
|
|
|
|||
|
|
@ -15,4 +15,6 @@ import java.util.Map;
|
|||
**/
|
||||
public interface SQLMapper {
|
||||
List<Map> runSQL(@Param("sql") String sql);
|
||||
|
||||
List<Long> listLong(@Param("sql") String sql);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,4 +4,9 @@
|
|||
<select id="runSQL" resultType="java.util.Map">
|
||||
${sql}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="listLong" resultType="long">
|
||||
${sql}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@
|
|||
, e.enddate as dismissdate
|
||||
, e.status AS employeeStatus
|
||||
,e.certificatenum as idNo
|
||||
,e.accounttype as accountType
|
||||
, d.departmentname AS departmentName
|
||||
, c.subcompanyname AS subcompanyName
|
||||
</sql>
|
||||
|
|
@ -116,9 +117,9 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
WHERE t.delete_type = 0
|
||||
and t.employee_type is null
|
||||
and (t.employee_type is null or t.employee_type = 0)
|
||||
and e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<if test="param.ids != null and param.ids.size()>0">
|
||||
AND t.id IN
|
||||
<foreach collection="param.ids" open="(" item="id" separator="," close=")">
|
||||
|
|
@ -220,9 +221,9 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
WHERE t.delete_type = 0
|
||||
and t.employee_type is null
|
||||
and (t.employee_type is null or t.employee_type = 0)
|
||||
and e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<if test="param.ids != null and param.ids.size()>0">
|
||||
AND t.id IN
|
||||
<foreach collection="param.ids" open="(" item="id" separator="," close=")">
|
||||
|
|
@ -321,9 +322,9 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
WHERE t.delete_type = 0
|
||||
and t.employee_type is null
|
||||
and (t.employee_type is null or t.employee_type = 0)
|
||||
and e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<if test="param.ids != null and param.ids.size()>0">
|
||||
AND t.id IN
|
||||
<foreach collection="param.ids" open="(" item="id" separator="," close=")">
|
||||
|
|
@ -440,7 +441,7 @@
|
|||
hrsa_salary_archive t
|
||||
LEFT JOIN hrsa_external_employee e ON e.id = t.employee_id
|
||||
WHERE t.delete_type = 0
|
||||
and t.employee_type is not null
|
||||
and t.employee_type = 1
|
||||
<if test="param.ids != null and param.ids.size()>0">
|
||||
AND t.id IN
|
||||
<foreach collection="param.ids" open="(" item="id" separator="," close=")">
|
||||
|
|
|
|||
|
|
@ -556,7 +556,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0
|
||||
AND e.status != '7'
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<!-- 关键字（姓名、部门、个税扣缴义务人） -->
|
||||
<if test="param.keyword != null and param.keyword != ''">
|
||||
AND (
|
||||
|
|
@ -580,7 +580,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0
|
||||
AND e.status != '7'
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<if test="param.keyword != null and param.keyword != ''">
|
||||
AND (
|
||||
e.lastname like '%'||#{param.keyword}||'%'
|
||||
|
|
@ -602,7 +602,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0
|
||||
AND e.status != '7'
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<if test="param.keyword != null and param.keyword != ''">
|
||||
AND (
|
||||
e.lastname like '%'+#{param.keyword}+'%'
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
from hrmresource e
|
||||
left join hrmdepartment d on e.departmentid = d.id
|
||||
where e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
|
@ -326,7 +326,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0 AND t2.delete_type = 0
|
||||
AND e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<include refid="paramSql"/>
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -347,7 +347,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0 AND t2.delete_type = 0
|
||||
AND e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<include refid="paramSql"/>
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0 AND t2.delete_type = 0
|
||||
AND e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<include refid="paramSql"/>
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -649,7 +649,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0 AND t2.delete_type = 0
|
||||
AND e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<include refid="paramSql"/>
|
||||
ORDER BY t1.declare_month DESC
|
||||
</select>
|
||||
|
|
@ -664,7 +664,7 @@
|
|||
WHERE
|
||||
t1.delete_type = 0 AND t2.delete_type = 0
|
||||
AND e.status not in (7)
|
||||
and (e.accounttype is null or e.accounttype = 0)
|
||||
|
||||
<if test="taxAgentIds != null and taxAgentIds.size() != 0">
|
||||
and tax_agent_id in
|
||||
<foreach collection="taxAgentIds" item="taxAgentId" open="(" separator="," close=")">
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue