Merge pull request 'develop' (#227) from develop into master

Reviewed-on: #227
cx0418hd
liang.cheng 1 year ago
commit b2dfb60622

@ -8,71 +8,4 @@ SYSDATE from cus_treeform where scope='HrmCustomFieldByInfoType';
/
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1;
/
delete from jcl_org_map;
/
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from
HrmDepartment a
left join hrmresource b on a.BMFZR=b.ID
left join hrmjobtitles c on b.JOBTITLE=c.id
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,0,'行政维度',a.job_no,a.job_name,
(case nvl(parent_job,0) when 0 then parent_dept+100000000 else parent_job+200000000 end),
(case nvl(parent_job,0) when 0 then parent_dept else parent_job end),
nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from JCL_ORG_job a
left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'))
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.id
where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
b.id,b.job_name,null,null, nvl( b.id, '' ) +200000000,b.id,
0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.id
where a.status<4;
/

@ -0,0 +1,3 @@
ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER;
/

@ -0,0 +1,85 @@
delete from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789) ;
/
Delete from LeftMenuInfo where id=100190;
/
Delete from LeftMenuConfig where infoid=100190;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190;
/
Delete from LeftMenuInfo where id=100190;
/
Delete from LeftMenuConfig where infoid=100190;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190;
/
CREATE TABLE JCL_ORG_QTXCONFIG (
ID NUMBER NOT NULL,
APP_SECRET NVARCHAR2(255) NULL,
URL NVARCHAR2(255) NULL,
PC_ADDRESS NVARCHAR2(255) NULL,
MOBILE_ADDRESS NVARCHAR2(255) NULL,
SECOND_URL NVARCHAR2(255) NULL,
CREATOR NUMBER NULL,
CREATEDATE NVARCHAR2(10) NULL,
CONSTRAINT JCL_ORG_QTXCONFIG_PK PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_QTXCONFIG_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_QTXCONFIG_ID_TIGGER BEFORE INSERT ON JCL_ORG_QTXCONFIG FOR EACH ROW
BEGIN
SELECT
JCL_ORG_QTXCONFIG_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -8,71 +8,4 @@ SYSDATE from cus_treeform where scope='HrmCustomFieldByInfoType';
/
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1;
/
delete from jcl_org_map;
/
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from
HrmDepartment a
left join hrmresource b on a.BMFZR=b.ID
left join hrmjobtitles c on b.JOBTITLE=c.id
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,0,'行政维度',a.job_no,a.job_name,
(case nvl(parent_job,0) when 0 then parent_dept+100000000 else parent_job+200000000 end),
(case nvl(parent_job,0) when 0 then parent_dept else parent_job end),
nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from JCL_ORG_job a
left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'))
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.id
where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
b.id,b.job_name,null,null, nvl( b.id, '' ) +200000000,b.id,
0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.id
where a.status<4;
/

@ -1,77 +1,319 @@
delete from HtmlLabelIndex where id = 544635 and ( trim(indexdesc) is null ) ;
Delete from LeftMenuInfo where id=100156;
/
insert into HtmlLabelIndex(id,indexdesc) select 544635,'¿ì½ÝËÑË÷×Ô¶¨Òå' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544635 and ( trim(indexdesc) is not null )) and rownum = 1 ;
Delete from LeftMenuConfig where infoid=100156;
/
delete from HtmlLabelInfo where indexid = 544635 and languageid=7 and ( trim(labelname) is null ) ;
CREATE TABLE JCL_ORG_CHARTVERSION (
ID NUMBER NOT NULL,
RECORDDATE NVARCHAR2(100) NULL,
DESCRIPTION NVARCHAR2(255) NULL,
CREATOR NUMBER NULL,
DELETETYPE NUMBER NULL,
CREATETIME NVARCHAR2(100) NULL,
FCLASS NUMBER NULL,
CONSTRAINT JCL_ORG_CHARTVERSION_PK PRIMARY KEY (ID)
);
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544635 as indexid ,'¿ì½ÝËÑË÷×Ô¶¨Òå' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544635 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE SEQUENCE JCL_ORG_CHARTVERSION_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
delete from HtmlLabelInfo where indexid = 544635 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
CREATE
OR REPLACE TRIGGER JCL_ORG_CHARTVERSION_ID_TIGGER BEFORE INSERT ON JCL_ORG_CHARTVERSION FOR EACH ROW
BEGIN
SELECT
JCL_ORG_CHARTVERSION_ID.nextval INTO:new.ID
FROM
dual;
END;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544635 as indexid ,'Quick Search Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544635 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
CREATE TABLE JCL_CHART_COMPANYVIRTUAL (
ID NUMBER NOT NULL,
COMPANYVIRTUALID NUMBER NULL,
CREATER NVARCHAR2(50) NULL,
COMPANYNAME NVARCHAR2(255) NULL,
COMPANYCODE NVARCHAR2(255) NULL,
COMPANYDESC NVARCHAR2(255) NULL,
SHOWORDER NUMBER NULL,
CANCELED NUMBER NULL,
VIRTUALTYPE NVARCHAR2(255) NULL,
VIRTUALTYPEDESC NVARCHAR2(1000) NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
CONSTRAINT JCL_CHART_COMPANYVIRTUAL_PK PRIMARY KEY (ID)
);
/
delete from HtmlLabelInfo where indexid = 544635 and languageid=9 and ( trim(labelname) is null ) ;
CREATE SEQUENCE JCL_CHART_COMPANYVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544635 as indexid ,'¿ì½ÝËÑË÷×Ô¶¨Áx' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544635 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE
OR REPLACE TRIGGER JCL_CHART_COMPVIRTUAL_TIGGER BEFORE INSERT ON JCL_CHART_COMPANYVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_COMPANYVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/
delete from HtmlLabelIndex where id = 544634 and ( trim(indexdesc) is null ) ;
CREATE TABLE JCL_CHART_DEPARTMENT (
ID NUMBER NOT NULL,
CREATER NVARCHAR2(50) NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENTMARK NVARCHAR2(100) NULL,
DEPARTMENTNAME NVARCHAR2(255) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
SUPDEPARTMENTID NUMBER NULL,
SUPDEPARTMENT NVARCHAR2(100) NULL,
CANCELED NUMBER NULL,
DEPARTMENTCODE NVARCHAR2(255) NULL,
COADJUTANT NVARCHAR2(100) NULL,
TLEVEL NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
ISVIRTUAL NUMBER NULL,
FLEADER NVARCHAR2(500) NULL,
CONSTRAINT JCL_CHART_DEPARTMENT_PK PRIMARY KEY (ID)
);
/
insert into HtmlLabelIndex(id,indexdesc) select 544634,'×éÖ¯¿ìËÙµ÷Õû' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544634 and ( trim(indexdesc) is not null )) and rownum = 1 ;
CREATE SEQUENCE JCL_CHART_DEPARTMENT_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
delete from HtmlLabelInfo where indexid = 544634 and languageid=7 and ( trim(labelname) is null ) ;
CREATE
OR REPLACE TRIGGER JCL_CHART_DEPARTMENT_ID_TIGGER BEFORE INSERT ON JCL_CHART_DEPARTMENT FOR EACH ROW
BEGIN
SELECT
JCL_CHART_DEPARTMENT_ID.nextval INTO:new.ID
FROM
dual;
END;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544634 as indexid ,'×éÖ¯¿ìËÙµ÷Õû' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544634 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE TABLE JCL_CHART_DEPARTMENTVIRTUAL (
ID NUMBER NOT NULL,
DEPARTMENTVIRTUALID INT NULL,
CREATER NVARCHAR2(50) NULL,
DEPARTMENTNAME NVARCHAR2(255) NULL,
DEPARTMENTCODE NVARCHAR2(255) NULL,
DEPARTMENTMARK NVARCHAR2(255) NULL,
SUPDEPTMENT NVARCHAR2(100) NULL,
SUPDEPID INT NULL,
ALLSUPDEPID NVARCHAR2(1000) NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
SUBCOMPANYID INT NULL,
CANCELED INT NULL,
VIRTUALTYPE NVARCHAR2(255) NULL,
TLEVEL NVARCHAR2(255) NULL,
SHOWORDER INT NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB INT NULL,
CONSTRAINT JCL_CHART_DEPARTMENTVIRTUAL_PK PRIMARY KEY (ID)
);
/
delete from HtmlLabelInfo where indexid = 544634 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
CREATE SEQUENCE JCL_CHART_DEPARTMENTVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544634 as indexid ,'Quick Organizational Adjustment' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544634 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
CREATE
OR REPLACE TRIGGER JCL_CHART_DEPT_TIGGER BEFORE INSERT ON JCL_CHART_DEPARTMENTVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_DEPARTMENTVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/
delete from HtmlLabelInfo where indexid = 544634 and languageid=9 and ( trim(labelname) is null ) ;
CREATE TABLE JCL_CHART_JOB (
ID NUMBER NOT NULL,
JOBID NUMBER NULL,
CREATER NVARCHAR2(50) NULL,
JOBNAME NVARCHAR2(100) NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENT NVARCHAR2(100) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
JOBRESPONSIBILITY NVARCHAR2(1000) NULL,
CANCELED NUMBER NULL,
JOBCODE NVARCHAR2(255) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
CONSTRAINT JCL_CHART_JOB_PK PRIMARY KEY (ID)
);
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544634 as indexid ,'½M¿—¿ìËÙÕ{Õû' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544634 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE SEQUENCE JCL_CHART_JOB_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
Delete from LeftMenuInfo where id=100188;
CREATE
OR REPLACE TRIGGER JCL_CHART_JOB_ID_TIGGER BEFORE INSERT ON JCL_CHART_JOB FOR EACH ROW
BEGIN
SELECT
JCL_CHART_JOB_ID.nextval INTO:new.ID
FROM
dual;
END;
/
Delete from LeftMenuConfig where infoid=100188;
CREATE TABLE JCL_CHART_RESOURCE (
ID NUMBER NOT NULL,
RESOURCEID NUMBER NULL,
LASTNAME NVARCHAR2(100) NULL,
CREATER NVARCHAR2(50) NULL,
WORKYEAR NUMBER NULL,
COMPANYWORKYEAR NUMBER NULL,
USEKIND NVARCHAR2(50) NULL,
MANAGERSTR NVARCHAR2(500) NULL,
STATUS NUMBER NULL,
SEX CHAR(1) NULL ,
ACCOUNTTYPE NUMBER NULL,
BELONGTO NUMBER NULL,
LOGINID NVARCHAR2(100) NULL,
MARITALSTATUS NVARCHAR2(100) NULL,
TELEPHONE NVARCHAR2(100) NULL,
MOBILE NVARCHAR2(100) NULL,
MOBILECALL NVARCHAR2(100) NULL,
EMAIL NVARCHAR2(100) NULL,
LOCATIONNAME NVARCHAR2(100) NULL,
RESOURCETYPE NVARCHAR2(10) NULL,
STARTDATE NVARCHAR2(100) NULL,
ENDDATE NVARCHAR2(100) NULL,
JOBTITLEID NUMBER NULL,
JOBTITLE NVARCHAR2(100) NULL,
JOBLEVEL NUMBER NULL,
SECLEVEL NUMBER NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENT NVARCHAR2(100) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
COSTCENTER NVARCHAR2(100) NULL,
MANAGER NUMBER NULL,
ASSISTANT NUMBER NULL,
WORKCODE NVARCHAR2(100) NULL,
CLASSIFICATION NVARCHAR2(10) NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
POLICY NVARCHAR2(255) NULL,
DEGREE NVARCHAR2(255) NULL,
CONSTRAINT JCL_CHART_RESOURCE_PK PRIMARY KEY (ID)
);
/
call LMConfig_U_ByInfoInsert (2,100147,5);
CREATE SEQUENCE JCL_CHART_RESOURCE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
call LMInfo_Insert (100188,544634,'','',2,100147,5,2);
CREATE
OR REPLACE TRIGGER JCL_CHART_RESOURCE_ID_TIGGER BEFORE INSERT ON JCL_CHART_RESOURCE FOR EACH ROW
BEGIN
SELECT
JCL_CHART_RESOURCE_ID.nextval INTO:new.ID
FROM
dual;
END;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/orgChart/index.html#/dragtree' where id = 100188;
CREATE TABLE JCL_CHART_RESOURCEVIRTUAL (
ID NUMBER NOT NULL,
RESOURCEID NUMBER NULL,
MANAGERID NUMBER NULL,
SUBCOMPANYID NUMBER NULL,
DEPARTMENTID NUMBER NULL,
MANAGERSTR NVARCHAR2(1000) NULL,
VIRTUALTYPE NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
CONSTRAINT JCL_CHART_RESOURCEVIRTUAL_PK PRIMARY KEY (ID)
);
/
Delete from LeftMenuInfo where id=100189;
CREATE SEQUENCE JCL_CHART_RESOURCEVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
Delete from LeftMenuConfig where infoid=100189;
CREATE
OR REPLACE TRIGGER JCL_CHART_RES_ID_TIGGER BEFORE INSERT ON JCL_CHART_RESOURCEVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_RESOURCEVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/
call LMConfig_U_ByInfoInsert (2,100167,2);
CREATE TABLE JCL_CHART_SUBCOMPANY (
ID NUMBER NOT NULL,
CREATER NVARCHAR2(50) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANYNAME NVARCHAR2(100) NULL,
SUBCOMPANYDESC NVARCHAR2(255) NULL,
COMPANY NVARCHAR2(100) NULL,
SUPSUBCOMPANYID NUMBER NULL,
SUPSUBCOMPANY NVARCHAR2(100) NULL,
CANCELED NUMBER NULL,
SUBCOMPANYCODE NVARCHAR2(255) NULL,
LIMITUSERS NUMBER NULL,
TLEVEL NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
ISVIRTUAL NUMBER NULL,
CONSTRAINT JCL_CHART_SUBCOMPANY_PK PRIMARY KEY (ID)
);
/
call LMInfo_Insert (100189,544635,'','',2,100167,2,2);
CREATE SEQUENCE JCL_CHART_SUBCOMPANY_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/quickSearch' where id = 100189;
CREATE
OR REPLACE TRIGGER JCL_CHART_SUBCOMPANY_ID_TIGGER BEFORE INSERT ON JCL_CHART_SUBCOMPANY FOR EACH ROW
BEGIN
SELECT
JCL_CHART_SUBCOMPANY_ID.nextval INTO:new.ID
FROM
dual;
END;
/
CREATE TABLE JCL_CHART_SUBCOMPANYVIRTUAL (
ID NUMBER NOT NULL,
SUBCOMPANYVIRTUALID NUMBER NULL,
CREATER NVARCHAR2(50) NULL,
SUBCOMPANYNAME NVARCHAR2(100) NULL,
SUBCOMPANYCODE NVARCHAR2(255) NULL,
SUBCOMPANYDESC NVARCHAR2(255) NULL,
SUPSUBCOMPANY NVARCHAR2(100) NULL,
SUPSUBCOMPANYID NUMBER NULL,
COMPANY NVARCHAR2(100) NULL,
COMPANYID NUMBER NULL,
CANCELED NUMBER NULL,
VIRTUALTYPE NVARCHAR2(255) NULL,
TLEVEL NVARCHAR2(255) NULL,
SHOWORDER NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
CONSTRAINT JCL_CHART_SUBCOMPANYVIRTUAL_PK PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_CHART_SUBCOMPANYVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_CHART_SUBCOMP_TIGGER BEFORE INSERT ON JCL_CHART_SUBCOMPANYVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_SUBCOMPANYVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -0,0 +1,3 @@
ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER;
/

@ -0,0 +1,44 @@
delete from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789) ;
/
Delete from LeftMenuInfo where id=100190;
/
Delete from LeftMenuConfig where infoid=100190;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190;
/

@ -8,73 +8,4 @@ SYSDATE from cus_treeform where scope='HrmCustomFieldByInfoType';
/
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1;
/
delete from jcl_org_map;
/
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from
HrmDepartment a
left join hrmresource b on a.BMFZR=b.ID
left join hrmjobtitles c on b.JOBTITLE=c.id
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename,
ec_department+100000000,
ec_department,
nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from JCL_ORG_job a
left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd')) and delete_type=0
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.ec_jobTitle
left join HrmJobTitles g on a.ec_jobTitle = g.id
where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
c.id,c.jobtitlename,null,null, nvl( b.id, '' ) +200000000,b.id,
0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
left join HrmJobTitles c on b.ec_jobTitle = c.id
where a.status<4;
/

@ -0,0 +1,3 @@
ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER;
/

@ -0,0 +1,70 @@
delete from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789) ;
/
Delete from LeftMenuInfo where id=100190;
/
Delete from LeftMenuConfig where infoid=100190;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190;
/
CREATE TABLE JCL_ORG_QTXCONFIG (
ID NUMBER NOT NULL,
APP_SECRET NVARCHAR2(255) NULL,
URL NVARCHAR2(255) NULL,
PC_ADDRESS NVARCHAR2(255) NULL,
MOBILE_ADDRESS NVARCHAR2(255) NULL,
SECOND_URL NVARCHAR2(255) NULL,
CREATOR NUMBER NULL,
CREATEDATE NVARCHAR2(10) NULL,
CONSTRAINT JCL_ORG_QTXCONFIG_PK PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_QTXCONFIG_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_QTXCONFIG_ID_TIGGER BEFORE INSERT ON JCL_ORG_QTXCONFIG FOR EACH ROW
BEGIN
SELECT
JCL_ORG_QTXCONFIG_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -5,68 +5,4 @@ delete_type, creator, create_time, update_time) select ID,
FORMLABEL , 1, 0, 0, 0, 0, 1, now(),
now() from cus_treeform where scope='HrmCustomFieldByInfoType';
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1;
delete from jcl_org_map;
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, NOW(), '2099-12-31' FROM hrmcompany;
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',ifnull(a.supsubcomid,0),ifnull(a.supsubcomid,0),
0,0,0,NOW(),'2099-12-31' from hrmsubcompany as a
where IFNULL(a.canceled,0) <>1;
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case ifnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case ifnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,NOW(),'2099-12-31'
from
HrmDepartment as a
left join hrmresource as b on a.BMFZR=b.ID
left join hrmjobtitles as c on b.JOBTITLE=c.id
where IFNULL(a.canceled,0) <>1;
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename,
ec_department+100000000,
ec_department,
ifnull(e.fcnt,0),ifnull(f.fcnt,0),0,NOW(),'2099-12-31'
from JCL_ORG_job as a
left join (select job_id,sum(ifnull(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=NOW() and time_end>NOW() and delete_type=0)
group by job_id) e on a.id=e.job_id
left join (select JOBTITLE,count(1) fcnt from hrmresource group by JOBTITLE
) f
on f.JOBTITLE=a.ec_jobTitle
left join HrmJobTitles g on a.ec_jobTitle = g.id
where ifnull(a.delete_type,0) <>1 and ifnull(a.forbidden_tag,0) <>1;
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
c.id,c.jobtitlename,null,null, ifnull( b.id, '' ) +200000000,b.id,
0,NOW(),'2099-12-31'
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
left join HrmJobTitles c on b.ec_jobTitle = c.id
where a.status<4;
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1;

@ -0,0 +1 @@
alter table jcl_org_scheme add subcompanyid int;

@ -0,0 +1,43 @@
delete from HtmlLabelIndex where id = 544789 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789)
;
Delete from LeftMenuInfo where id=100190
;
Delete from LeftMenuConfig where infoid=100190
;
call LMConfig_U_ByInfoInsert (2,100167,3)
;
call LMInfo_Insert (100190,544789,'','',2,100167,3,2)
;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190
;
CREATE TABLE JCL_ORG_QTXCONFIG (
ID int(11) NOT NULL AUTO_INCREMENT,
APP_SECRET varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
URL varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
PC_ADDRESS varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
MOBILE_ADDRESS varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
SECOND_URL varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
CREATOR int(11) NULL DEFAULT NULL,
CREATEDATE varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
PRIMARY KEY (id) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;

@ -8,73 +8,4 @@ SYSDATE from cus_treeform where scope='HrmCustomFieldByInfoType'
/
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1
/
delete from jcl_org_map
/
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a
where nvl(a.canceled,0) <>1
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from
HrmDepartment a
left join hrmresource b on a.BMFZR=b.ID
left join hrmjobtitles c on b.JOBTITLE=c.id
where nvl(a.canceled,0) <>1
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename,
ec_department+100000000,
ec_department,
nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from JCL_ORG_job a
left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd')) and delete_type=0
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.ec_jobTitle
left join HrmJobTitles g on a.ec_jobTitle = g.id
where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
c.id,c.jobtitlename,null,null, nvl( b.id, '' ) +200000000,b.id,
0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
left join HrmJobTitles c on b.ec_jobTitle = c.id
where a.status<4
/

@ -0,0 +1,2 @@
ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER
/

@ -0,0 +1,57 @@
delete from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789)
/
Delete from LeftMenuInfo where id=100190
/
Delete from LeftMenuConfig where infoid=100190
/
call LMConfig_U_ByInfoInsert (2,100167,3)
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2)
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190
/
CREATE TABLE JCL_ORG_QTXCONFIG (
ID NUMBER NOT NULL,
APP_SECRET NVARCHAR2(255) NULL,
URL NVARCHAR2(255) NULL,
PC_ADDRESS NVARCHAR2(255) NULL,
MOBILE_ADDRESS NVARCHAR2(255) NULL,
SECOND_URL NVARCHAR2(255) NULL,
CREATOR NUMBER NULL,
CREATEDATE NVARCHAR2(10) NULL,
CONSTRAINT JCL_ORG_QTXCONFIG_PK PRIMARY KEY (ID)
)
/
CREATE SEQUENCE JCL_ORG_QTXCONFIG_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_QTXCONFIG_ID_TIGGER BEFORE INSERT ON JCL_ORG_QTXCONFIG FOR EACH ROW
BEGIN
SELECT
JCL_ORG_QTXCONFIG_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -1,148 +1,145 @@
delete from HtmlLabelIndex where id = 539805 and ( trim(indexdesc) is null );
delete from HtmlLabelIndex where id = 539805 and ( indexdesc is null or indexdesc = '' )
;
/
insert into HtmlLabelIndex(id,indexdesc) select 539805,'模块管理分权' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539805 and ( trim(indexdesc) is not null )) and rownum = 1;
insert into HtmlLabelIndex(id,indexdesc) select 539805,'模块管理分权' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539805 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
/
delete from HtmlLabelInfo where indexid = 539805 and languageid=7 and ( trim(labelname) is null );
delete from HtmlLabelInfo where indexid = 539805 and languageid=7 and ( labelname is null or labelname = '' )
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539805 as indexid ,'模块管理分权' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539805 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539805 as indexid ,'模块管理分权' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539805 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
/
delete from HtmlLabelInfo where indexid = 539805 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) );
delete from HtmlLabelInfo where indexid = 539805 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539805 as indexid ,'Decentralization of module management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539805 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539805 as indexid ,'Decentralization of module management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539805 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
/
delete from HtmlLabelInfo where indexid = 539805 and languageid=9 and ( trim(labelname) is null );
delete from HtmlLabelInfo where indexid = 539805 and languageid=9 and ( labelname is null or labelname = '' )
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539805 as indexid ,'模塊管理分權' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539805 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539805 as indexid ,'模塊管理分權' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539805 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
/
delete from HtmlLabelIndex where id = 539804 and ( trim(indexdesc) is null );
/
insert into HtmlLabelIndex(id,indexdesc) select 539804,'分权管理中心' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539804 and ( trim(indexdesc) is not null )) and rownum = 1;
delete from HtmlLabelIndex where id = 539804 and ( indexdesc is null or indexdesc = '' )
;
/
delete from HtmlLabelInfo where indexid = 539804 and languageid=7 and ( trim(labelname) is null );
insert into HtmlLabelIndex(id,indexdesc) select 539804,'分权管理中心' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539804 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539804 as indexid ,'分权管理中心' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539804 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1;
delete from HtmlLabelInfo where indexid = 539804 and languageid=7 and ( labelname is null or labelname = '' )
;
/
delete from HtmlLabelInfo where indexid = 539804 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) );
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539804 as indexid ,'分权管理中心' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539804 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539804 as indexid ,'Decentralized management center' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539804 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1;
delete from HtmlLabelInfo where indexid = 539804 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
/
delete from HtmlLabelInfo where indexid = 539804 and languageid=9 and ( trim(labelname) is null );
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539804 as indexid ,'Decentralized management center' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539804 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539804 as indexid ,'分權管理中心' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539804 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1;
delete from HtmlLabelInfo where indexid = 539804 and languageid=9 and ( labelname is null or labelname = '' )
;
/
Delete from LeftMenuInfo where id=100178;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539804 as indexid ,'分權管理中心' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539804 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
/
Delete from LeftMenuConfig where infoid=100178;
Delete from LeftMenuInfo where id=100178
;
/
call LMConfig_U_ByInfoInsert (2,100139,5);
Delete from LeftMenuConfig where infoid=100178
;
/
call LMInfo_Insert (100178,539804,'','',2,100139,5,2);
select LMConfig_U_ByInfoInsert (2,100139,5)
;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100178;
select LMInfo_Insert (100178,539804,'','',2,100139,5,2)
;
/
Delete from LeftMenuInfo where id=100179;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100178
;
/
Delete from LeftMenuConfig where infoid=100179;
Delete from LeftMenuInfo where id=100179
;
/
call LMConfig_U_ByInfoInsert (2,100178,-1);
Delete from LeftMenuConfig where infoid=100179
;
/
call LMInfo_Insert (100179,539805,'','',2,100178,-1,2);
select LMConfig_U_ByInfoInsert (2,100178,-1)
;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/managerDetach' where id = 100179;
select LMInfo_Insert (100179,539805,'','',2,100178,-1,2)
;
/
delete from SystemRightDetail where rightid =2727;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/managerDetach' where id = 100179
;
/
delete from SystemRightsLanguage where id =2727;
/
delete from SystemRights where id =2727;
/
delete from SystemRightToGroup where rightid =2727;
delete from SystemRightDetail where rightid =2727
;
/
delete from SystemRightType where id =37;
delete from SystemRightsLanguage where id =2727
;
/
delete from SystemRightGroups where id =-23;
delete from SystemRights where id =2727
;
/
insert into SystemRights (id,rightdesc,righttype,detachable) values (2727,'模块管理分权','37',0);
delete from SystemRightToGroup where rightid =2727
;
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2727,8,'Decentralization of module management','Decentralization of module management');
delete from SystemRightType where id =37
;
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2727,9,'模塊管理分權','模塊管理分權');
delete from SystemRightGroups where id =-23
;
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2727,7,'模块管理分权','模块管理分权');
insert into SystemRights (id,rightdesc,righttype,detachable) values (2727,'模块管理分权','37',0)
;
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (44005,'模块管理分权权限','MangerDeatch:All',2727);
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2727,8,'Decentralization of module management','Decentralization of module management')
;
/
insert into SystemRightToGroup(rightid,groupid) values (2727,-23);
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2727,9,'模塊管理分權','模塊管理分權')
;
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2727,7,'模块管理分权','模块管理分权')
;
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (44005,'模块管理分权权限','MangerDeatch:All',2727)
;
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理');
insert into SystemRightToGroup(rightid,groupid) values (2727,-23)
;
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理')
;
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理')
;
/
CREATE TABLE JCL_ORG_DETACH (
ID NUMBER NOT NULL,
MANAGER_TYPE NUMBER NULL,
EC_MANAGER NUMBER NOT NULL,
JCL_MANAGER NUMBER NOT NULL,
ID SERIAL NOT NULL,
MANAGER_TYPE INT NULL,
EC_MANAGER INT NOT NULL,
JCL_MANAGER INT NOT NULL,
EC_ROLELEVEL VARCHAR(4000) NOT NULL,
JCL_ROLELEVEL VARCHAR(4000) NOT NULL,
MANAGE_MODULE VARCHAR(4000) NOT NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_DETACH_PK PRIMARY KEY (ID)
CREATOR INT NULL,
DELETE_TYPE INT NULL,
CREATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
UPDATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_DETACH_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_DETACH_ID_TIGGER BEFORE INSERT ON JCL_ORG_DETACH FOR EACH ROW
BEGIN
SELECT
JCL_ORG_DETACH_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -1,116 +1,95 @@
delete from HtmlLabelIndex where id = 539986 and ( trim(indexdesc) is null );
delete from HtmlLabelIndex where id = 539986 and ( indexdesc is null or indexdesc = '' )
;
/
insert into HtmlLabelIndex(id,indexdesc) select 539986,'人员卡片栏目设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539986 and ( trim(indexdesc) is not null )) and rownum = 1;
insert into HtmlLabelIndex(id,indexdesc) select 539986,'人员卡片栏目设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539986 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
/
delete from HtmlLabelInfo where indexid = 539986 and languageid=7 and ( trim(labelname) is null );
delete from HtmlLabelInfo where indexid = 539986 and languageid=7 and ( labelname is null or labelname = '' )
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539986 as indexid ,'人员卡片栏目设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539986 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539986 as indexid ,'人员卡片栏目设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539986 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
/
delete from HtmlLabelInfo where indexid = 539986 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) );
delete from HtmlLabelInfo where indexid = 539986 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539986 as indexid ,'Personnel Card Column Settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539986 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539986 as indexid ,'Personnel Card Column Settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539986 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
/
delete from HtmlLabelInfo where indexid = 539986 and languageid=9 and ( trim(labelname) is null );
delete from HtmlLabelInfo where indexid = 539986 and languageid=9 and ( labelname is null or labelname = '' )
;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539986 as indexid ,'人員卡片欄目設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539986 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539986 as indexid ,'人員卡片欄目設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539986 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
/
Delete from LeftMenuInfo where id=100173;
Delete from LeftMenuInfo where id=100173
;
/
Delete from LeftMenuConfig where infoid=100173;
Delete from LeftMenuConfig where infoid=100173
;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
select LMConfig_U_ByInfoInsert (2,100167,3)
;
/
call LMInfo_Insert (100173,539986,'','',2,100167,3,2);
select LMInfo_Insert (100173,539986,'','',2,100167,3,2)
;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/columnSetting' where id = 100173;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/columnSetting' where id = 100173
;
/
CREATE TABLE JCL_ORG_CARDACCESS (
ID NUMBER NOT NULL,
TYPE_ID NUMBER NOT NULL,
TYPE_NAME NVARCHAR2(50) NOT NULL,
STATUS NUMBER NULL,
ALL_PEOPLE NUMBER NULL,
SUPERIOR NUMBER NULL,
ALL_SUPERIOR NUMBER NULL,
CUSTOM NVARCHAR2(2000) NULL ,
DELETE_TYPE NUMBER NULL,
CREATOR NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_CARDACCESS_PK PRIMARY KEY (ID)
ID SERIAL NOT NULL,
TYPE_ID INT NOT NULL,
TYPE_NAME VARCHAR(50) NOT NULL,
STATUS INT NULL,
ALL_PEOPLE INT NULL,
SUPERIOR INT NULL,
ALL_SUPERIOR INT NULL,
CUSTOM VARCHAR(2000) NULL ,
DELETE_TYPE INT NULL,
CREATOR INT NULL,
CREATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
UPDATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_CARDACCESS_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_CARDACCESS_ID_TIGGER BEFORE INSERT ON JCL_ORG_CARDACCESS FOR EACH ROW
BEGIN
SELECT
JCL_ORG_CARDACCESS_ID.nextval INTO:new.ID
FROM
dual;
END;
/
CREATE TABLE JCL_ORG_CARDBUTTON (
ID NUMBER NOT NULL,
NAME NVARCHAR2(255) NOT NULL,
STATUS NUMBER NULL,
URL NVARCHAR2(255) NULL,
ROLES NVARCHAR2(2000) NULL,
SYS_DEFAULT NUMBER NOT NULL,
SHOW_ORDER NUMBER NULL,
OPEN_TYPE NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_CARDBUTTON_PK PRIMARY KEY (ID)
ID SERIAL NOT NULL,
NAME VARCHAR(255) NOT NULL,
STATUS INT NULL,
URL VARCHAR(255) NULL,
ROLES VARCHAR(2000) NULL,
SYS_DEFAULT INT NOT NULL,
SHOW_ORDER INT NULL,
OPEN_TYPE INT NULL,
CREATOR INT NULL,
DELETE_TYPE INT NULL,
CREATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
UPDATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_CARDBUTTON_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_CARDBUTTON_ID_TIGGER BEFORE INSERT ON JCL_ORG_CARDBUTTON FOR EACH ROW
BEGIN
SELECT
JCL_ORG_CARDBUTTON_ID.nextval INTO:new.ID
FROM
dual;
END;
/
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('编辑人员', 1, '/spa/organization/static/index.html#/main/organization/resourceExtend/${id}', 0, 1, 0, SYSDATE, SYSDATE);
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('编辑人员', 1, '/spa/organization/static/index.html#/main/organization/resourceExtend/${id}', 0, 1, 0, NOW(), NOW());
/
ALTER TABLE JCL_FIELD_EXTENDINFO ADD ISMODIFY NUMBER;
ALTER TABLE JCL_FIELD_EXTENDINFO ADD ISMODIFY INT;
/
ALTER TABLE JCL_FIELD_EXTENDINFO ADD MODIFY_PROPS NUMBER;
ALTER TABLE JCL_FIELD_EXTENDINFO ADD MODIFY_PROPS INT;
/
ALTER TABLE JCL_FIELD_EXTENDINFO ADD CHECK_PROPS NUMBER;
ALTER TABLE JCL_FIELD_EXTENDINFO ADD CHECK_PROPS INT;
/
update jcl_field_extendinfo set check_props = 2, modify_props = 2 where is_system_default = 1 and delete_type = 0;
/
ALTER TABLE JCL_ORG_JOBEXT_DT1 ADD GROUP_ID NUMBER;
ALTER TABLE JCL_ORG_JOBEXT_DT1 ADD GROUP_ID INT;
/

@ -1,65 +1,53 @@
CREATE TABLE JCL_ORG_FIELD (
ID NUMBER NOT NULL,
FIELDID NUMBER NULL,
FIELDLABEL NVARCHAR2(100) NULL,
FIELDNAME NVARCHAR2(100) NULL,
CONSTRAINT JCL_ORG_FIELD_PK PRIMARY KEY (ID)
ID SERIAL NOT NULL,
FIELDID INT NULL,
FIELDLABEL VARCHAR(100) NULL,
FIELDNAME VARCHAR(100) NULL,
PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_FIELD_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_FIELD_ID_TIGGER BEFORE INSERT ON JCL_ORG_FIELD FOR EACH ROW
BEGIN
SELECT
JCL_ORG_FIELD_ID.nextval INTO:new.ID
FROM
dual;
END;
/
create view v_jcl_zdzjs as
select 'A'||xl.id fid,xl.sequence_name fname,'0' fparentid,xl.sequence_no fno,xl.id fobjid,'1' as ftype,0 xlid,0 zjid,0 zdid
from jcl_org_sequence xl
inner join JCL_ORG_GRADE zj on zj.scheme_id=xl.scheme_id and nvl(zj.forbidden_tag,0)<>1 and nvl(zj.delete_type,0)<>1
inner join JCL_ORG_LEVEL zd on zd.scheme_id=xl.scheme_id and nvl(zd.forbidden_tag,0)<>1 and nvl(zd.delete_type,0)<>1
where nvl(xl.forbidden_tag,0)<>1 and nvl(xl.delete_type,0)<>1
inner join JCL_ORG_GRADE zj on zj.scheme_id=xl.scheme_id and COALESCE(zj.forbidden_tag,0)<>1 and COALESCE(zj.delete_type,0)<>1
inner join JCL_ORG_LEVEL zd on zd.scheme_id=xl.scheme_id and COALESCE(zd.forbidden_tag,0)<>1 and COALESCE(zd.delete_type,0)<>1
where COALESCE(xl.forbidden_tag,0)<>1 and COALESCE(xl.delete_type,0)<>1
union
select 'A'||xl.id||'A'||zj.id,zj.grade_name,'A'||xl.id,zj.grade_no,zj.id,'2' as ftype,0,0,0
from JCL_ORG_GRADE zj
inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id
inner join JCL_ORG_LEVEL zd on ','||zj.level_id||',' like '%,'||zd.id||',%' and nvl(zd.forbidden_tag,0)<>1 and nvl(zd.delete_type,0)<>1
where nvl(zj.forbidden_tag,0)<>1 and nvl(zj.delete_type,0)<>1
inner join JCL_ORG_LEVEL zd on ','||zj.level_id||',' like '%,'||zd.id||',%' and COALESCE(zd.forbidden_tag,0)<>1 and COALESCE(zd.delete_type,0)<>1
where COALESCE(zj.forbidden_tag,0)<>1 and COALESCE(zj.delete_type,0)<>1
union
select 'A'||xl.id||'A'||zj.id||'A'||zd.id,zd.level_name,'A'||xl.id||'A'||zj.id,zd.level_no,zd.id,'3' as ftype,xl.id,zj.id,zd.id
from JCL_ORG_LEVEL zd
inner join JCL_ORG_GRADE zj on ','||zj.level_id||',' like '%,'||zd.id||',%'
inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id
where nvl(zd.forbidden_tag,0)<>1 and nvl(zd.delete_type,0)<>1;
where COALESCE(zd.forbidden_tag,0)<>1 and COALESCE(zd.delete_type,0)<>1;
/
declare
DO $$
DECLARE
orgid int;
cubeuuid1 varchar2(100);
cubeuuid1 varchar(100);
appid1 int;
modename varchar2(100);
uuid varchar2(100);
modename varchar(100);
uuid varchar(100);
treeid int;
t1 int;
t2 int;
t3 int;
cnt int;
lableid int;
fieldname varchar2(100);
fieldname varchar(100);
fieldid1 int;
field varchar2(100);
sql1 varchar2(2000);
field varchar(100);
sql1 varchar(2000);
begin
select min(id) into orgid from hrmresource;
cubeuuid1:=TO_CHAR(sys_guid());
cubeuuid1:=uuid();
modename :='聚才林人事模块';
select count(*) into cnt from modetreefield where treeFieldName=modename;
@ -74,7 +62,7 @@ else
select max(id) into appid1 from modetreefield;
end if;
uuid :=TO_CHAR(sys_guid());
uuid :=uuid();
insert into mode_customtree(treename,creater, createdate, createtime, rootname, defaultaddress,
showtype, isselsub, isonlyleaf, appid, treecode, isRefreshTree, isshowsearchtab,
searchbrowserid, isQuickSearch, treeremark, combintree, combintreeway, defaulthideleft,
@ -85,10 +73,11 @@ insert into mode_customtreedetail(mainid, nodename, nodedesc, sourcefrom, source
hreftype, hrefid, hreftarget, hrefrelatefield, nodeicon, supnode, supnodefield, nodefield, showorder,
iconField, dataorder, datacondition, hrefField, rootids, isshowrootnode, isContainsSub)
values(treeid,'职等职级','',2,0,'v_jcl_zdzjs','fid','fparentid','fname',2,0,'#','','',0,'','',1,'','fno','','','',1,0);
end;
end $$;
/
DECLARE
DO $$
DECLARE
fieldname varchar(100);
fieldid int;
field varchar(100);
@ -98,7 +87,7 @@ DECLARE
cnt int;
BEGIN
fieldname:='职等职级';
select nvl(max(id),0)+1 INTO fieldid from cus_formdict;
select COALESCE(max(id),0)+1 INTO fieldid from cus_formdict;
field:='field'||fieldid;
select max(mainid) INTO dmltype from mode_customtreedetail where tablename='v_jcl_zdzjs';
@ -117,7 +106,7 @@ DECLARE
insert into cus_formfield(scope, scopeid, fieldlable, fieldid, fieldorder, ismand, isuse, groupid, hrm_fieldlable, dmlUrl, ismodify) values('HrmCustomFieldByInfoType',3,lableid,fieldid,1,0,1,5,fieldname,dmltype,0);
sqlstr:='alter table cus_fielddata add '||field||' varchar(1000)';
execute immediate sqlstr;
execute sqlstr;
insert into jcl_org_field(fieldid,fieldlabel,fieldname) values (fieldid,fieldname,field);
fieldname:='等级方案';
@ -139,7 +128,7 @@ DECLARE
insert into cus_formdict(id, fielddbtype, fieldhtmltype, type, fieldname, fieldlabel, scope) values (fieldid,'varchar(1000)',3,161,field,field,'');
insert into cus_formfield(scope, scopeid, fieldlable, fieldid, fieldorder, ismand, isuse, groupid, hrm_fieldlable, dmlUrl, ismodify)values('HrmCustomFieldByInfoType',3,lableid,fieldid,1,0,1,5,fieldname,dmltype,0);
sqlstr:='alter table cus_fielddata add '||field||' varchar(1000)';
execute immediate sqlstr;
execute sqlstr;
insert into jcl_org_field(fieldid,fieldlabel,fieldname) values (fieldid,fieldname,field);
fieldname:='职等';
@ -161,7 +150,7 @@ DECLARE
insert into cus_formdict(id, fielddbtype, fieldhtmltype, type, fieldname, fieldlabel, scope) values (fieldid,'varchar(1000)',3,161,field,field,'');
insert into cus_formfield(scope, scopeid, fieldlable, fieldid, fieldorder, ismand, isuse, groupid, hrm_fieldlable, dmlUrl, ismodify)values('HrmCustomFieldByInfoType',3,lableid,fieldid,1,0,1,5,fieldname,dmltype,0);
sqlstr:='alter table cus_fielddata add '||field||' varchar(1000)';
execute immediate sqlstr;
execute sqlstr;
insert into jcl_org_field(fieldid,fieldlabel,fieldname) values (fieldid,fieldname,field);
fieldname:='职级';
@ -183,7 +172,7 @@ DECLARE
insert into cus_formdict(id, fielddbtype, fieldhtmltype, type, fieldname, fieldlabel, scope) values (fieldid,'varchar(1000)',3,161,field,field,'');
insert into cus_formfield(scope, scopeid, fieldlable, fieldid, fieldorder, ismand, isuse, groupid, hrm_fieldlable, dmlUrl, ismodify)values('HrmCustomFieldByInfoType',3,lableid,fieldid,1,0,1,5,fieldname,dmltype,0);
sqlstr:='alter table cus_fielddata add '||field||' varchar(1000)';
execute immediate sqlstr;
execute sqlstr;
insert into jcl_org_field(fieldid,fieldlabel,fieldname) values (fieldid,fieldname,field);
fieldname:='岗位序列';
@ -205,8 +194,8 @@ DECLARE
insert into cus_formdict(id, fielddbtype, fieldhtmltype, type, fieldname, fieldlabel, scope) values (fieldid,'varchar(1000)',3,161,field,field,'');
insert into cus_formfield(scope, scopeid, fieldlable, fieldid, fieldorder, ismand, isuse, groupid, hrm_fieldlable, dmlUrl, ismodify)values('HrmCustomFieldByInfoType',3,lableid,fieldid,1,0,1,5,fieldname,dmltype,0);
sqlstr:='alter table cus_fielddata add '||field||' varchar(1000)';
execute immediate sqlstr;
execute sqlstr;
insert into jcl_org_field(fieldid,fieldlabel,fieldname) values (fieldid,fieldname,field);
END;
end $$;
/

@ -8,73 +8,4 @@ SYSDATE from cus_treeform where scope='HrmCustomFieldByInfoType'
/
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1
/
delete from jcl_org_map
/
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a
where nvl(a.canceled,0) <>1
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from
HrmDepartment a
left join hrmresource b on a.BMFZR=b.ID
left join hrmjobtitles c on b.JOBTITLE=c.id
where nvl(a.canceled,0) <>1
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename,
ec_department+100000000,
ec_department,
nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from JCL_ORG_job a
left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd')) and delete_type=0
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.ec_jobTitle
left join HrmJobTitles g on a.ec_jobTitle = g.id
where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
c.id,c.jobtitlename,null,null, nvl( b.id, '' ) +200000000,b.id,
0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
left join HrmJobTitles c on b.ec_jobTitle = c.id
where a.status<4
/

@ -1,157 +1,118 @@
CREATE TABLE HRMSUBCOMPANY_VERSION (
ID NUMBER NOT NULL,
SUBCOMID NUMBER NULL,
SUBCOMPANYDESC NVARCHAR2 ( 255 ) NULL,
SUBCOMPANYCODE NVARCHAR2 ( 255 ) NULL,
SUBCOMPANYNAME NVARCHAR2 ( 255 ) NULL,
SUPSUBCOMID NUMBER NULL,
SHOWORDER NUMBER NULL,
CANCELED NUMBER NULL,
DESCRIPTION NVARCHAR2 ( 2000 ) NULL,
OPERATOR NVARCHAR2 ( 255 ) NULL,
VERSION NUMBER ( 9,1 ) NULL,
OPERATE_TIME DATE NULL,
CONSTRAINT HRMSUBCOMPANY_VERSION_PK PRIMARY KEY ( ID )
ID SERIAL NOT NULL,
SUBCOMID INT NULL,
SUBCOMPANYDESC VARCHAR ( 255 ) NULL,
SUBCOMPANYCODE VARCHAR ( 255 ) NULL,
SUBCOMPANYNAME VARCHAR ( 255 ) NULL,
SUPSUBCOMID INT NULL,
SHOWORDER INT NULL,
CANCELED INT NULL,
DESCRIPTION VARCHAR ( 2000 ) NULL,
OPERATOR VARCHAR ( 255 ) NULL,
VERSION DECIMAL ( 9,1 ) NULL,
OPERATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY ( ID )
);
/
CREATE SEQUENCE HRMSUBCOMPANY_VERSION_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER HRMCOMP_VERSION_ID_TIGGER BEFORE INSERT ON HRMSUBCOMPANY_VERSION FOR EACH ROW
BEGIN
SELECT
HRMSUBCOMPANY_VERSION_ID.nextval INTO :new.ID
FROM
dual;
END;
/
CREATE TABLE HRMDEPARTMENT_VERSION (
ID NUMBER NOT NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENTMARK NVARCHAR2 ( 255 ) NULL,
DEPARTMENTCODE NVARCHAR2 ( 255 ) NULL,
DEPARTMENTNAME NVARCHAR2 ( 255 ) NULL,
SUBCOMPANYID1 NUMBER NULL,
SUPDEPID NUMBER NULL,
BMFZR NVARCHAR2 ( 2000 ) NULL,
SHOWORDER NUMBER NULL,
CANCELED NUMBER NULL,
DESCRIPTION NVARCHAR2 ( 2000 ) NULL,
OPERATOR NVARCHAR2 ( 255 ) NULL,
VERSION NUMBER ( 9,1 ) NULL,
OPERATE_TIME DATE NULL,
CONSTRAINT HRMDEPARTMENT_VERSION_PK PRIMARY KEY ( ID )
ID SERIAL NOT NULL,
DEPARTMENTID INT NULL,
DEPARTMENTMARK VARCHAR ( 255 ) NULL,
DEPARTMENTCODE VARCHAR ( 255 ) NULL,
DEPARTMENTNAME VARCHAR ( 255 ) NULL,
SUBCOMPANYID1 INT NULL,
SUPDEPID INT NULL,
BMFZR VARCHAR ( 2000 ) NULL,
SHOWORDER INT NULL,
CANCELED INT NULL,
DESCRIPTION VARCHAR ( 2000 ) NULL,
OPERATOR VARCHAR ( 255 ) NULL,
VERSION DECIMAL ( 9,1 ) NULL,
OPERATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY ( ID )
);
/
CREATE SEQUENCE HRMDEPARTMENT_VERSION_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER HRMDEPT_VERSION_ID_TIGGER BEFORE INSERT ON HRMDEPARTMENT_VERSION FOR EACH ROW
BEGIN
SELECT
HRMDEPARTMENT_VERSION_ID.nextval INTO :new.ID
FROM
dual;
END;
/
CREATE TABLE "HRMRESOURCE_VERSION" (
"ID" NUMBER NOT NULL,
"RESOURCEID" NUMBER,
"COMPANYSTARTDATE" DATE NULL,
"COMPANYWORKYEAR" NUMBER,
"WORKSTARTDATE" DATE NULL,
"WORKYEAR" NUMBER,
"USEKIND" NUMBER,
"JOBCALL" NUMBER,
"ACCUMFUNDACCOUNT" NVARCHAR2 (100) NULL,
"BIRTHPLACE" NVARCHAR2 (255) NULL,
"FOLK" NVARCHAR2 (255) NULL,
"RESIDENTPHONE" NVARCHAR2 (255) NULL,
"RESIDENTPOSTCODE" NVARCHAR2 (1000) NULL,
"EXTPHONE" NVARCHAR2 (255) NULL,
"MANAGERSTR" NVARCHAR2 (255) NULL,
"STATUS" NUMBER,
"FAX" NVARCHAR2 (255) NULL,
"ISLABOUUNION" CHAR(10),
"WEIGHT" NUMBER,
"TEMPRESIDENTNUMBER" VARCHAR2(1000),
"PROBATIONENDDATE" DATE NULL,
"COUNTRYID" NUMBER DEFAULT 1,
"PASSWDCHGDATE" DATE NULL,
"LLOGINID" VARCHAR2(1000),
"DSPORDER" FLOAT(53),
"PASSWORDSTATE" NUMBER,
"ACCOUNTTYPE" NUMBER,
"BELONGTO" NUMBER,
"MESSAGERURL" VARCHAR2(1000),
"ACCOUNTNAME" VARCHAR2(1000),
"LOGINID" VARCHAR2(1000),
"PASSWORD" VARCHAR2(1000),
"LASTNAME" VARCHAR2(1000),
"SEX" CHAR(1),
"BIRTHDAY" CHAR(10),
"NATIONALITY" NUMBER,
"MARITALSTATUS" CHAR(1),
"TELEPHONE" VARCHAR2(1000),
"MOBILE" VARCHAR2(1000),
"MOBILECALL" VARCHAR2(1000),
"EMAIL" VARCHAR2(1000),
"LOCATIONID" NUMBER,
"WORKROOM" VARCHAR2(1000),
"HOMEADDRESS" VARCHAR2(1000),
"RESOURCETYPE" CHAR(1),
"STARTDATE" DATE NULL,
"ENDDATE" DATE NULL,
"JOBTITLE" NUMBER,
"JOBACTIVITYDESC" VARCHAR2(1000),
"JOBLEVEL" NUMBER,
"SECLEVEL" NUMBER,
"DEPARTMENTID" NUMBER,
"SUBCOMPANYID1" NUMBER,
"COSTCENTERID" NUMBER,
"MANAGERID" NUMBER,
"ASSISTANTID" NUMBER,
"BANKID1" NUMBER,
"ACCOUNTID1" VARCHAR2(1000),
"RESOURCEIMAGEID" NUMBER,
"CERTIFICATENUM" VARCHAR2(1000),
"NATIVEPLACE" VARCHAR2(1000),
"EDUCATIONLEVEL" NUMBER,
"BEMEMBERDATE" DATE NULL,
"BEPARTYDATE" DATE NULL,
"WORKCODE" VARCHAR2(1000),
"REGRESIDENTPLACE" VARCHAR2(1000),
"HEALTHINFO" CHAR(1),
"RESIDENTPLACE" VARCHAR2(1000),
"POLICY" VARCHAR2(1000),
"DEGREE" VARCHAR2(1000),
"HEIGHT" VARCHAR2(640),
"CLASSIFICATION" CHAR(1) DEFAULT 3,
"DESCRIPTION" VARCHAR2 ( 2000 ) NULL,
"OPERATOR" VARCHAR2 ( 255 ) NULL,
"VERSION" NUMBER ( 9, 1 ) NULL,
"OPERATE_TIME" DATE NULL,
CONSTRAINT HRMRESOURCE_VERSION_PK PRIMARY KEY ( ID )
create table HRMRESOURCE_VERSION (
ID SERIAL NOT NULL,
RESOURCEID INT,
COMPANYSTARTDATE TIMESTAMP WITHOUT TIME ZONE null,
COMPANYWORKYEAR INT,
WORKSTARTDATE TIMESTAMP WITHOUT TIME ZONE null,
WORKYEAR INT,
USEKIND INT,
JOBCALL INT,
ACCUMFUNDACCOUNT VARCHAR (100) null,
BIRTHPLACE VARCHAR (255) null,
FOLK VARCHAR (255) null,
RESIDENTPHONE VARCHAR (255) null,
RESIDENTPOSTCODE VARCHAR (1000) null,
EXTPHONE VARCHAR (255) null,
MANAGERSTR VARCHAR (255) null,
STATUS INT,
FAX VARCHAR (255) null,
ISLABOUUNION CHAR(10),
WEIGHT INT,
TEMPRESIDENTNUMBER VARCHAR(1000),
PROBATIONENDDATE TIMESTAMP WITHOUT TIME ZONE null,
COUNTRYID INT default 1,
PASSWDCHGDATE TIMESTAMP WITHOUT TIME ZONE null,
LLOGINID VARCHAR(1000),
DSPORDER FLOAT(53),
PASSWORDSTATE INT,
ACCOUNTTYPE INT,
BELONGTO INT,
MESSAGERURL VARCHAR(1000),
ACCOUNTNAME VARCHAR(1000),
LOGINID VARCHAR(1000),
PASSWORD VARCHAR(1000),
LASTNAME VARCHAR(1000),
SEX CHAR(1),
BIRTHDAY CHAR(10),
NATIONALITY INT,
MARITALSTATUS CHAR(1),
TELEPHONE VARCHAR(1000),
MOBILE VARCHAR(1000),
MOBILECALL VARCHAR(1000),
EMAIL VARCHAR(1000),
LOCATIONID INT,
WORKROOM VARCHAR(1000),
HOMEADDRESS VARCHAR(1000),
RESOURCETYPE CHAR(1),
STARTDATE TIMESTAMP WITHOUT TIME ZONE null,
ENDDATE TIMESTAMP WITHOUT TIME ZONE null,
JOBTITLE INT,
JOBACTIVITYDESC VARCHAR(1000),
JOBLEVEL INT,
SECLEVEL INT,
DEPARTMENTID INT,
SUBCOMPANYID1 INT,
COSTCENTERID INT,
MANAGERID INT,
ASSISTANTID INT,
BANKID1 INT,
ACCOUNTID1 VARCHAR(1000),
RESOURCEIMAGEID INT,
CERTIFICATENUM VARCHAR(1000),
NATIVEPLACE VARCHAR(1000),
EDUCATIONLEVEL INT,
BEMEMBERDATE TIMESTAMP WITHOUT TIME ZONE null,
BEPARTYDATE TIMESTAMP WITHOUT TIME ZONE null,
WORKCODE VARCHAR(1000),
REGRESIDENTPLACE VARCHAR(1000),
HEALTHINFO CHAR(1),
RESIDENTPLACE VARCHAR(1000),
POLICY VARCHAR(1000),
DEGREE VARCHAR(1000),
HEIGHT VARCHAR(640),
CLASSIFICATION CHAR(1) default 3,
DESCRIPTION VARCHAR (2000) null,
OPERATOR VARCHAR (255) null,
VERSION DECIMAL ( 9,1 ) null,
OPERATE_TIME TIMESTAMP WITHOUT TIME ZONE null,
primary key (ID)
);
/
CREATE SEQUENCE HRMRESOURCE_VERSION_ID INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER HRMRES_VERSION_ID_TIGGER BEFORE INSERT ON HRMRESOURCE_VERSION FOR EACH ROW
BEGIN
SELECT
HRMRESOURCE_VERSION_ID.nextval INTO :new.ID
FROM
dual;
END;
/

@ -1,64 +1,40 @@
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('ÈËÔ±¼òÀú', 1, 'spa/organization/static/index.html#/main/organization/personnelResume/${id}', 0, 1, 0, SYSDATE, SYSDATE)
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('ÈËÔ±¼òÀú', 1, '/spa/organization/static/index.html#/main/organization/personnelResume/${id}', 0, 1, 0, NOW(), NOW())
/
CREATE TABLE JCL_ORG_SEARCH_TEMPLATE (
ID NUMBER NOT NULL,
NAME NVARCHAR2(255) NOT NULL,
BASIC_FIELDS VARCHAR2(4000) NULL,
PERSONAL_FIELDS VARCHAR2(4000) NULL,
WORK_FIELDS VARCHAR2(4000) NULL,
ISUSED NUMBER NULL,
CREATOR NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_SEARCH_TEMPLATE_PK PRIMARY KEY (ID)
ID SERIAL NOT NULL,
NAME VARCHAR(255) NOT NULL,
BASIC_FIELDS VARCHAR(4000) NULL,
PERSONAL_FIELDS VARCHAR(4000) NULL,
WORK_FIELDS VARCHAR(4000) NULL,
ISUSED INT NULL,
CREATOR INT NULL,
CREATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
UPDATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY (ID)
)
/
CREATE SEQUENCE JCL_ORG_SEARCH_TEMPLATE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE
/
CREATE OR REPLACE TRIGGER JCL_ORG_SEARCH_ID_TIGGER BEFORE INSERT ON JCL_ORG_SEARCH_TEMPLATE FOR EACH ROW
BEGIN
SELECT
JCL_ORG_SEARCH_TEMPLATE_ID.nextval INTO :new.ID
FROM
dual;
END;
/
CREATE TABLE JCL_ORG_CUSTOM_TEMPLATE (
ID NUMBER NOT NULL,
NAME NVARCHAR2(255) NOT NULL,
BASIC_FIELDS VARCHAR2(4000) NULL,
PERSONAL_FIELDS VARCHAR2(4000) NULL,
WORK_FIELDS VARCHAR2(4000) NULL,
ISUSED NUMBER NULL,
CREATOR NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_CUSTOM_TEMPLATE_PK PRIMARY KEY (ID)
ID SERIAL NOT NULL,
NAME VARCHAR(255) NOT NULL,
BASIC_FIELDS VARCHAR(4000) NULL,
PERSONAL_FIELDS VARCHAR(4000) NULL,
WORK_FIELDS VARCHAR(4000) NULL,
ISUSED INT NULL,
CREATOR INT NULL,
CREATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
UPDATE_TIME TIMESTAMP WITHOUT TIME ZONE NULL,
PRIMARY KEY (ID)
)
/
CREATE SEQUENCE JCL_ORG_CUSTOM_TEMPLATE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE
/
CREATE OR REPLACE TRIGGER JCL_ORG_CUSTOM_ID_TIGGER BEFORE INSERT ON JCL_ORG_CUSTOM_TEMPLATE FOR EACH ROW
BEGIN
SELECT
JCL_ORG_CUSTOM_TEMPLATE_ID.nextval INTO :new.ID
FROM
dual;
END;
/
ALTER TABLE JCL_ORG_CARDACCESS RENAME COLUMN TYPE_NAME TO TYPE_NAME_BAK
/
ALTER TABLE JCL_ORG_CARDACCESS ADD TYPE_NAME VARCHAR2(1000)
ALTER TABLE JCL_ORG_CARDACCESS ADD TYPE_NAME VARCHAR(1000)
/
UPDATE JCL_ORG_CARDACCESS SET TYPE_NAME = TYPE_NAME_BAK
/

@ -0,0 +1,2 @@
ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER;
/

@ -0,0 +1,44 @@
delete from HtmlLabelIndex where id = 544789 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789) ;
/
Delete from LeftMenuInfo where id=100190;
/
Delete from LeftMenuConfig where infoid=100190;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190;
/
CREATE TABLE JCL_ORG_QTXCONFIG (
ID SERIAL NOT NULL,
APP_SECRET VARCHAR(255) NULL,
URL VARCHAR(255) NULL,
PC_ADDRESS VARCHAR(255) NULL,
MOBILE_ADDRESS VARCHAR(255) NULL,
SECOND_URL VARCHAR(255) NULL,
CREATOR INT NULL,
CREATEDATE VARCHAR(10) NULL,
PRIMARY KEY (ID)
);
/

@ -8,75 +8,4 @@ GETDATE() from cus_treeform where scope='HrmCustomFieldByInfoType'
GO
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1
GO
delete from jcl_org_map
GO
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, convert(varchar(100),getDate(),23), '2099-12-31' FROM hrmcompany
GO
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',isnull(a.supsubcomid,0),isnull(a.supsubcomid,0),
0,0,0,convert(varchar(100),getDate(),23),'2099-12-31' from hrmsubcompany as a
where isnull(a.canceled,0) <>1
GO
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,cast(a.BMFZR as varchar(10)),b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case isnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case isnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,convert(varchar(100),getDate(),23),'2099-12-31'
from
HrmDepartment as a
left join hrmresource as b on cast(a.BMFZR as varchar(10))=cast(b.ID as varchar(10))
left join hrmjobtitles as c on b.JOBTITLE=c.id
where isnull(a.canceled,0) <>1
GO
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename,
ec_department+100000000,
ec_department,
isnull(e.fcnt,0),isnull(f.fcnt,0),0,convert(varchar(100),getDate(),23),'2099-12-31'
from JCL_ORG_job as a
left join (select job_id,sum(isnull(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=convert(varchar(100),getDate(),23) and time_end>convert(varchar(100),getDate(),23)) and delete_type=0
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.ec_jobTitle
left join HrmJobTitles g on a.ec_jobTitle = g.id
where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1
GO
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
c.id,c.jobtitlename,null,null, isnull( b.id, '' ) +200000000,b.id,
0,convert(varchar(100),getDate(),23),'2099-12-31'
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
left join HrmJobTitles c on b.ec_jobTitle = c.id
where a.status<4
GO

@ -0,0 +1,2 @@
alter table jcl_org_scheme add subcompanyid int
GO

@ -0,0 +1,43 @@
delete from HtmlLabelIndex where id = 544789 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789)
GO
Delete from LeftMenuInfo where id=100190
GO
Delete from LeftMenuConfig where infoid=100190
GO
EXECUTE LMConfig_U_ByInfoInsert 2,100167,3
GO
EXECUTE LMInfo_Insert 100190,544789,'','',2,100167,3,2
GO
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190
GO
CREATE TABLE [JCL_ORG_QTXCONFIG] (
[ID] int IDENTITY(1,1) NOT NULL,
[APP_SECRET] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
[URL] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
[PC_ADDRESS] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
[MOBILE_ADDRESS] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
[SECOND_URL] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
[CREATOR] int NULL,
[CREATEDATE] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
)
GO

File diff suppressed because it is too large Load Diff

@ -37,7 +37,7 @@ Delete from LeftMenuConfig where infoid=100152;
call LMConfig_U_ByInfoInsert (2,100147,3);
/
call LMInfo_Insert (100152,538740,'','',2,100147,3,2);
call LMInfo_Insert (100152,512838,'','',2,100147,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrm/index_mobx.html#/main/hrm/addressBook' where id = 100152;
@ -70,7 +70,7 @@ call LMConfig_U_ByInfoInsert (2,100167,2);
call LMInfo_Insert (100171,538767,'','',2,100167,2,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/fieldDef/resource' where id = 100171;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrm/static4engine/engine.html#/hrmengine/fieldDef/resource' where id = 100171;
/
Delete from LeftMenuInfo where id=100156;
@ -100,7 +100,7 @@ call LMConfig_U_ByInfoInsert (2,100158,1);
call LMInfo_Insert (100161,538753,'','',2,100158,1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100161;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/staffWorkflowSet' where id = 100161;
/
Delete from LeftMenuInfo where id=100158;
@ -118,6 +118,21 @@ call LMInfo_Insert (100158,538750,'','',2,100139,2,2);
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100158;
/
Delete from LeftMenuInfo where id=100172;
/
Delete from LeftMenuConfig where infoid=100172;
/
call LMConfig_U_ByInfoInsert (2,100147,4);
/
call LMInfo_Insert (100172,538838,'','',2,100147,4,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/newImport' where id = 100172;
/
Delete from LeftMenuInfo where id=100167;
/
@ -313,6 +328,36 @@ call LMInfo_Insert (100153,538741,'','',2,100139,1,2);
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100153;
/
Delete from LeftMenuInfo where id=100126;
/
Delete from LeftMenuConfig where infoid=100126;
/
call LMConfig_U_ByInfoInsert (2,100118,3);
/
call LMInfo_Insert (100126,538005,'','',2,100118,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100126;
/
Delete from LeftMenuInfo where id=100127;
/
Delete from LeftMenuConfig where infoid=100127;
/
call LMConfig_U_ByInfoInsert (2,100126,-1);
/
call LMInfo_Insert (100127,538006,'','',2,100126,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/cumDeduct' where id = 100127;
/
Delete from LeftMenuInfo where id=100144;
/
@ -373,21 +418,6 @@ call LMInfo_Insert (100165,538763,'','',2,100162,1,2);
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/postNumberSet' where id = 100165;
/
Delete from LeftMenuInfo where id=100140;
/
Delete from LeftMenuConfig where infoid=100140;
/
call LMConfig_U_ByInfoInsert (2,100139,-1);
/
call LMInfo_Insert (100140,538727,'','',2,100139,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/cube/static4scene/index.html#/scene/preview/427dbf8a58cb4d8c8ccca70438184f15' where id = 100140;
/
Delete from LeftMenuInfo where id=100162;
/
@ -418,6 +448,21 @@ call LMInfo_Insert (100164,530289,'','',2,100162,0,2);
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/deptNumberSet' where id = 100164;
/
Delete from LeftMenuInfo where id=100154;
/
Delete from LeftMenuConfig where infoid=100154;
/
call LMConfig_U_ByInfoInsert (2,100153,-1);
/
call LMInfo_Insert (100154,538742,'','',2,100153,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrm/engine.html#/hrmengine/orgChart' where id = 100154;
/
Delete from LeftMenuInfo where id=100169;
/
@ -478,17 +523,17 @@ call LMInfo_Insert (100166,538764,'','',2,100162,2,2);
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/resourceNumberSet' where id = 100166;
/
Delete from LeftMenuInfo where id=100154;
Delete from LeftMenuInfo where id=100173;
/
Delete from LeftMenuConfig where infoid=100154;
Delete from LeftMenuConfig where infoid=100173;
/
call LMConfig_U_ByInfoInsert (2,100153,-1);
call LMConfig_U_ByInfoInsert (2,100167,2);
/
call LMInfo_Insert (100154,538742,'','',2,100153,-1,2);
call LMInfo_Insert (100173,538880,'','',2,100167,2,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100154;
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrm/static4engine/engine.html#/hrmengine/carditemset' where id = 100173;
/

@ -904,4 +904,58 @@ SELECT
FROM
dual;
END;
/
insert INTO jcl_field_extendgroup (id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default) VALUES (1, 1, '基本信息', 1, 0, SYSDATE, NULL, NULL, '1', 1, 0);
/
insert INTO jcl_field_extendgroup (id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default) VALUES (2, 2, '基本信息', 1, 0, SYSDATE, NULL, NULL, '1', 1, 0);
/
insert INTO jcl_field_extendgroup (id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default) VALUES (3, 3, '基础信息', 1, 0, SYSDATE, NULL, NULL, '1', 1, 0);
/
insert INTO jcl_field_extendtitle (group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) VALUES (3, '基本信息', 1, 0, SYSDATE, NULL, 1, 1, 0);
/
insert INTO jcl_field_extendtitle (group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) VALUES (3, '职责信息', 1, 0, SYSDATE, NULL, 3, 1, 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'job_no', '编号', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, SYSDATE, NULL, '1', '["input","text","100"]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'description', '工作概述', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, SYSDATE, NULL, NULL, '["textarea","",""]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'job_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, SYSDATE, NULL, '1', '["input","text","100"]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'work_duty', '任职职责', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 2, 1, 0, SYSDATE, NULL, NULL, '["textarea","",""]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'ec_department', '所属部门', 'int', 3, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, SYSDATE, NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 3, 1, 0, SYSDATE, NULL, NULL, '["textarea","",""]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 1, 1, 1, 1, 0, 0, 0, 1, 4, 1, 0, SYSDATE, NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, SYSDATE, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'workplace', '工作地点', 'varchar(100)', 1, 1, 1, 0, 1, 1, 1, 0, 1, 7, 1, 0, SYSDATE, NULL, '1', '["input","text","100"]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'forbidden_tag', '禁用标记', 'int', 5, 1, 1, 0, 1, 1, 0, 0, 1, 8, 1, 0, SYSDATE, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'show_order', '显示顺序', 'int', 1, 1, 1, 0, 1, NULL, 1, 1, 1, 9, 1, 0, SYSDATE, NULL, '2', '["input","int"]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'parent_comp', '所属分部', 'int', 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, SYSDATE, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 0);
/
INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(3, 'JCL_ORG_JOB', 'parent_dept', '上级部门', 'int', 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, SYSDATE, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 0);
/

@ -3,7 +3,7 @@ datashowset_id NUMBER;
hrmjobgroups_id NUMBER;
begin
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('schemeBrowser', '1', '1', '', 'select id,scheme_no ,scheme_name ,scheme_description from jcl_org_scheme where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '等级方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0',SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('schemeBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '编号', 'scheme_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '方案名称', 'scheme_name', '', 1, 2, SYS_GUID(), NULL);
@ -11,8 +11,8 @@ INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, ds
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '编号', 'scheme_no', '2', '', 1, SYS_GUID(), '');
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '方案名称', 'scheme_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('LevelBrowser', '1', '1', '', 'select id,level_no ,level_name ,description ,scheme_id from jcl_org_level where delete_type = 0 and forbidden_tag = 0 and (scheme_id =$scheme_id$ or id in ($level_id$))', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职等浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('LevelBrowser', '1', '1', '', 'select id,level_no ,level_name ,description ,scheme_id from jcl_org_level where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职等浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('LevelBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'level_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'level_name', '', 1, 2, SYS_GUID(), NULL);
@ -21,21 +21,30 @@ INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFI
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'level_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('postBrowser', '1', '1', '', 'select id,post_name ,description from jcl_org_post jop where delete_type =0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务分类浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('postBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'post_name', '', 1, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '说明', 'description', '', 0, 2, SYS_GUID(), NULL);
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'post_name', '2', '', 1, SYS_GUID(), '0');
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '说明', 'description', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('PostInfoBrowser', '1', '1', '', 'select * from jcl_org_post_info where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务信息浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'post_info_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'post_info_name', '', 1, 2, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '职务分类', 'post_id', 'select post_name from jcl_org_post where id = {?currentvalue}', 0, 3, SYS_GUID(), NULL);
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '编号', 'post_info_no', '2', '', 1, SYS_GUID(), '');
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'post_info_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('compBrowser', '1', '1', '', 'select * from jcl_org_comp where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '2', 'id', 'parent_company', 'comp_name', '', '', '', '', 2, '公司分部浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '2', 0, 1);
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('compBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('deptBrowser', '1', '1', '', 'select * from jcl_org_dept where delete_type = 0 and forbidden_tag = 0 ', '', '', '', '', '2', 'id', 'parent_dept', 'dept_name', '', '', '', '', 2, '部门浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '2', 0, 1);
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('deptBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('sequenceBrowser', '1', '1', '', 'select *,scheme_id as scheme_value from jcl_org_sequence where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '岗位序列', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('sequenceBrowser', '1', '1', '', 'select id,sequence_no,sequence_name, scheme_id,scheme_id as scheme_value from jcl_org_sequence where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '岗位序列', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('sequenceBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'sequence_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'sequence_name', '', 1, 2, SYS_GUID(), NULL);
@ -44,8 +53,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '编号', 'sequence_no', '2', '', 1, SYS_GUID(), '');
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'sequence_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('staffPlanBrowser', '1', '1', '', 'select id,plan_no ,plan_name ,plan_year ,case control_dimension when ''1'' then ''分部'' when ''2'' then ''部门'' when ''3'' then ''岗位'' end as control_dimension from jcl_org_staffplan where forbidden_tag=0 and delete_type =0 ', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '编制方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('staffPlanBrowser', '1', '1', '', 'SELECT id, plan_no , plan_name , plan_year , CASE WHEN control_dimension = ''1'' THEN ''分部'' WHEN control_dimension = ''2'' THEN ''部门'' WHEN control_dimension = ''3'' THEN ''岗位'' END AS control_dimension FROM jcl_org_staffplan WHERE forbidden_tag = 0 AND delete_type = 0 ', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '编制方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE, 'yyyy-MM-dd'), TO_CHAR(SYSDATE, 'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('staffPlanBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'plan_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'plan_name', '', 1, 2, SYS_GUID(), NULL);
@ -58,13 +67,13 @@ INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WS
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('deptBrowserPrepare', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('gradeBrowser', '1', '1', '', 'select * from jcl_org_grade where delete_type = 0 and forbidden_tag = 0 and scheme_id = $scheme_id$', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职级浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('gradeBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'grade_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'grade_name', '', 1, 2, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '描述方案', 'description', '', 0, 3, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 4, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '职等', 'level_id', 'select group_concat(level_name) from jcl_org_level where id in ( {?currentvalue})', 0, 5, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '职等', 'level_id', 'select wm_concat(to_char(level_name)) from jcl_org_level where id in ( {?currentvalue})', 0, 5, SYS_GUID(), NULL);
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '编号', 'grade_no', '2', '', 1, SYS_GUID(), '');
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'grade_name', '2', '', 2, SYS_GUID(), '');

@ -214,6 +214,9 @@ insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (271
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,7,'组织数据导入','组织数据导入');
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43998,'组织数据导入权限','DataImport:All',2714);
/
insert into SystemRightToGroup(rightid,groupid) values (2714,-23);
/
@ -622,25 +625,25 @@ delete from SystemRightType where id =37;
delete from SystemRightGroups where id =-23;
/
insert into SystemRights (id,rightdesc,righttype,detachable) values (2721,'岗位字段定义','37',0) ;
insert into SystemRights (id,rightdesc,righttype,detachable) values (2721,'岗位字段定义','37',0);
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2721,8,'Position field definition','Position field definition') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2721,8,'Position field definition','Position field definition');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2721,9,'崗位字段定義','崗位字段定義') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2721,9,'崗位字段定義','崗位字段定義');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2721,7,'岗位字段定义','岗位字段定义') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2721,7,'岗位字段定义','岗位字段定义');
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43997,'岗位字段定义权限','PostField:All',2721) ;
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43997,'岗位字段定义权限','PostField:All',2721);
/
insert into SystemRightToGroup(rightid,groupid) values (2721,-23) ;
insert into SystemRightToGroup(rightid,groupid) values (2721,-23);
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理') ;
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理');
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理');
@ -664,25 +667,25 @@ delete from SystemRightType where id =37;
delete from SystemRightGroups where id =-23;
/
insert into SystemRights (id,rightdesc,righttype,detachable) values (2720,'部门字段定义','37',0) ;
insert into SystemRights (id,rightdesc,righttype,detachable) values (2720,'部门字段定义','37',0);
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2720,8,'Department field definition','Department field definition') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2720,8,'Department field definition','Department field definition');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2720,9,'部門字段定義','部門字段定義') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2720,9,'部門字段定義','部門字段定義');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2720,7,'部门字段定义','部门字段定义') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2720,7,'部门字段定义','部门字段定义');
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43996,'部门字段定义权限','DepartmentField:All',2720) ;
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43996,'部门字段定义权限','DepartmentField:All',2720);
/
insert into SystemRightToGroup(rightid,groupid) values (2720,-23) ;
insert into SystemRightToGroup(rightid,groupid) values (2720,-23);
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理') ;
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理');
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理');
@ -706,25 +709,67 @@ delete from SystemRightType where id =37;
delete from SystemRightGroups where id =-23;
/
insert into SystemRights (id,rightdesc,righttype,detachable) values (2719,'分部字段定义','37',0) ;
insert into SystemRights (id,rightdesc,righttype,detachable) values (2719,'分部字段定义','37',0);
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2719,8,'Partial field definition','Partial field definition');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2719,8,'Partial field definition','Partial field definition') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2719,9,'分部字段定義','分部字段定義');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2719,9,'分部字段定義','分部字段定義') ;
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2719,7,'分部字段定义','分部字段定义');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2719,7,'分部字段定义','分部字段定义') ;
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43995,'分部字段定义权限','CompanyField:All',2719);
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43995,'分部字段定义权限','CompanyField:All',2719) ;
insert into SystemRightToGroup(rightid,groupid) values (2719,-23);
/
insert into SystemRightToGroup(rightid,groupid) values (2719,-23) ;
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理');
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理');
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理') ;
delete from SystemRightDetail where rightid =2722;
/
delete from SystemRightsLanguage where id =2722;
/
delete from SystemRights where id =2722;
/
delete from SystemRightToGroup where rightid =2722;
/
delete from SystemRightType where id =37;
/
delete from SystemRightGroups where id =-23;
/
insert into SystemRights (id,rightdesc,righttype,detachable) values (2722,'人员信息','37',0);
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2722,8,'Personnel information','Personnel information');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2722,9,'人員信息','人員信息');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2722,7,'人员信息','人员信息');
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43999,'人员信息权限','ResourceBasicInfo:All',2722);
/
insert into SystemRightToGroup(rightid,groupid) values (2722,-23);
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理');
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理');

@ -98,4 +98,19 @@ END;
/
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('编辑人员', 1, '/spa/organization/static/index.html#/main/organization/resourceExtend/${id}', 0, 1, 0, SYSDATE, SYSDATE);
/
ALTER TABLE JCL_FIELD_EXTENDINFO ADD ISMODIFY NUMBER;
/
ALTER TABLE JCL_FIELD_EXTENDINFO ADD MODIFY_PROPS NUMBER;
/
ALTER TABLE JCL_FIELD_EXTENDINFO ADD CHECK_PROPS NUMBER;
/
update jcl_field_extendinfo set check_props = 2, modify_props = 2 where is_system_default = 1 and delete_type = 0;
/
ALTER TABLE JCL_ORG_JOBEXT_DT1 ADD GROUP_ID NUMBER;
/

@ -64,11 +64,17 @@ update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/
alter table jcl_org_job add ec_jobTitle int;
/
INSERT into jcl_org_job(ec_company,ec_department,ec_jobTitle,delete_type) select DISTINCT subcompanyid1 ,departmentid ,jobtitle ,0 from HrmResource;
ALTER table jcl_org_map modify(fleader varchar(1000));
/
INSERT into jcl_org_job(ec_company,ec_department,ec_jobTitle,delete_type,forbidden_tag) select DISTINCT subcompanyid1 ,departmentid ,jobtitle ,0,0 from HrmResource;
/
update jcl_field_extendinfo set delete_type = 1 where extend_type =3 and field_name in('sequence_id','scheme_id','level_id','grade_id');
/
update jcl_field_extendgroup set delete_type = 1 where extend_type =3 and group_name ='Ö°Îñ';
/
UPDATE JCL_FIELD_EXTENDINFO SET FIELD_NAME='ec_jobTitle', FIELD_NAME_DESC='名称', FIELD_TYPE='int', CONTROL_TYPE=3, CUSTOM_VALUE='["browser",{"valueSpan":"岗位","replaceDatas":[{"itemorderid":"24","name":"岗位","id":"24","parenttitle":"人事","title":"人事-岗位"}],"value":"24"}]', BROWSER_TYPE='24', ISENABLE=1, ISREQUIRED=0, LIST_SHOW=1, SEARCH_SHOW=1, EDIT_SHOW=1, ADD_SHOW=1, BROWSER_SHOW=1, SHOW_ORDER=1, IS_SYSTEM_DEFAULT=0, CREATOR=1, DELETE_TYPE=0, CREATE_TIME=SYSDATE, UPDATE_TIME=NULL, ISMODIFY=0, MODIFY_PROPS=NULL, CHECK_PROPS=NULL WHERE TABLE_NAME ='JCL_ORG_JOB' AND FIELD_NAME ='job_name';
/

@ -68,10 +68,10 @@ if cnt >0 then
select id into appid1 from modetreefield where treeFieldName=modename;
else
insert into modetreefield(treeFieldName, superFieldid, allSuperFieldId, treelevel, showOrder, treeFieldDesc,
isdelete, subcompanyid, icon, iconColor, iconBg,cubeuuid)
isdelete, subcompanyid, icon, iconColor, iconBg)
values('聚才林人事模块',1,',0,1',1,-999,'聚才林专项应用(谨慎调整)',0,orgid,
'icon-cube-app-team','#fff','#4da0f8',cubeuuid1);
select id into appid1 from modetreefield where cubeuuid=cubeuuid1;
'icon-cube-app-team','#fff','#4da0f8');
select max(id) into appid1 from modetreefield;
end if;
uuid :=RAWTOHEX(sys_guid());

@ -8,71 +8,4 @@ SYSDATE from cus_treeform where scope='HrmCustomFieldByInfoType';
/
update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1;
/
delete from jcl_org_map;
/
INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid,
fplan, fonjob, fisvitual, fdatebegin, fdateend)
SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
0, NULL, NULL, 0, NULL, -1, 0,
0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'',
'',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
b.lastname,b.jobtitle,c.jobtitlemark,null,null,
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
(case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from
HrmDepartment a
left join hrmresource b on a.BMFZR=b.ID
left join hrmjobtitles c on b.JOBTITLE=c.id
where nvl(a.canceled,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,fclass,fclassname,fnumber,fname,
fparentid,fobjparentid,
fplan,fonjob,fisvitual,fdatebegin,fdateend)
select a.id+200000000,3,a.id,0,'行政维度',a.job_no,a.job_name,
(case nvl(parent_job,0) when 0 then parent_dept+100000000 else parent_job+200000000 end),
(case nvl(parent_job,0) when 0 then parent_dept else parent_job end),
nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from JCL_ORG_job a
left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF
where plan_id in (select id from JCL_ORG_STAFFPLAN
where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'))
group by job_id) e on a.id=e.job_id
left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
on f.JOBTITLE=a.id
where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
/
insert into jcl_org_map
(id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg,
fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
fisvitual,fdatebegin,fdateend)
select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
b.id,b.job_name,null,null, nvl( b.id, '' ) +200000000,b.id,
0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
from hrmresource a
left join jcl_org_job b ON a.JOBTITLE = b.id
where a.status<4;
/

@ -22,7 +22,7 @@ CREATE
OR REPLACE TRIGGER HRMCOMP_VERSION_ID_TIGGER BEFORE INSERT ON HRMSUBCOMPANY_VERSION FOR EACH ROW
BEGIN
SELECT
HRMSUBCOMPANY_VERSION_ID.nextval INTO : new.ID
HRMSUBCOMPANY_VERSION_ID.nextval INTO :new.ID
FROM
dual;
@ -51,14 +51,13 @@ CREATE TABLE HRMDEPARTMENT_VERSION (
CREATE SEQUENCE HRMDEPARTMENT_VERSION_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
CREATE
CREATE
OR REPLACE TRIGGER HRMDEPT_VERSION_ID_TIGGER BEFORE INSERT ON HRMDEPARTMENT_VERSION FOR EACH ROW
BEGIN
SELECT
HRMDEPARTMENT_VERSION_ID.nextval INTO : new.ID
FROM
dual;
SELECT
HRMDEPARTMENT_VERSION_ID.nextval INTO :new.ID
FROM
dual;
END;
/
@ -87,7 +86,7 @@ CREATE TABLE "HRMRESOURCE_VERSION" (
"COUNTRYID" NUMBER DEFAULT 1,
"PASSWDCHGDATE" DATE NULL,
"LLOGINID" VARCHAR2(1000),
"DSPORDER" FLOAT(126),
"DSPORDER" FLOAT(53),
"PASSWORDSTATE" NUMBER,
"ACCOUNTTYPE" NUMBER,
"BELONGTO" NUMBER,
@ -150,7 +149,7 @@ CREATE
OR REPLACE TRIGGER HRMRES_VERSION_ID_TIGGER BEFORE INSERT ON HRMRESOURCE_VERSION FOR EACH ROW
BEGIN
SELECT
HRMRESOURCE_VERSION_ID.nextval INTO : new.ID
HRMRESOURCE_VERSION_ID.nextval INTO :new.ID
FROM
dual;

@ -1,4 +1,4 @@
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('人员简历', 1, 'spa/organization/static/index.html#/main/organization/personnelResume/${id}', 0, 1, 0, SYSDATE, SYSDATE);
insert into jcl_org_cardbutton (name, status, url, sys_default, creator, delete_type, create_time, update_time) values ('ÈËÔ±¼òÀú', 1, '/spa/organization/static/index.html#/main/organization/personnelResume/${id}', 0, 1, 0, SYSDATE, SYSDATE);
/
CREATE TABLE JCL_ORG_SEARCH_TEMPLATE (
@ -66,4 +66,7 @@ ALTER TABLE JCL_ORG_CARDACCESS DROP COLUMN TYPE_NAME_BAK;
/
UPDATE datashowset SET SQLTEXT ='select * from jcl_org_grade where delete_type = 0 and forbidden_tag = 0 ' WHERE SHOWNAME ='gradeBrowser';
/
update WORKFLOW_BROWSERURL set tablename ='JCL_ORG_JOB a inner join HrmJobTitles b on a.ec_jobTitle = b.id',columname ='jobtitlename',keycolumname ='a.id' where id = 666;
/

@ -1,77 +1,319 @@
delete from HtmlLabelIndex where id = 544635 and ( trim(indexdesc) is null ) ;
Delete from LeftMenuInfo where id=100156;
/
insert into HtmlLabelIndex(id,indexdesc) select 544635,'¿ì½ÝËÑË÷×Ô¶¨Òå' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544635 and ( trim(indexdesc) is not null )) and rownum = 1 ;
Delete from LeftMenuConfig where infoid=100156;
/
delete from HtmlLabelInfo where indexid = 544635 and languageid=7 and ( trim(labelname) is null ) ;
CREATE TABLE JCL_ORG_CHARTVERSION (
ID NUMBER NOT NULL,
RECORDDATE NVARCHAR2(100) NULL,
DESCRIPTION NVARCHAR2(255) NULL,
CREATOR NUMBER NULL,
DELETETYPE NUMBER NULL,
CREATETIME NVARCHAR2(100) NULL,
FCLASS NUMBER NULL,
CONSTRAINT JCL_ORG_CHARTVERSION_PK PRIMARY KEY (ID)
);
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544635 as indexid ,'¿ì½ÝËÑË÷×Ô¶¨Òå' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544635 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE SEQUENCE JCL_ORG_CHARTVERSION_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
delete from HtmlLabelInfo where indexid = 544635 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
CREATE
OR REPLACE TRIGGER JCL_ORG_CHARTVERSION_ID_TIGGER BEFORE INSERT ON JCL_ORG_CHARTVERSION FOR EACH ROW
BEGIN
SELECT
JCL_ORG_CHARTVERSION_ID.nextval INTO:new.ID
FROM
dual;
END;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544635 as indexid ,'Quick Search Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544635 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
CREATE TABLE JCL_CHART_COMPANYVIRTUAL (
ID NUMBER NOT NULL,
COMPANYVIRTUALID NUMBER NULL,
CREATER NVARCHAR2(50) NULL,
COMPANYNAME NVARCHAR2(255) NULL,
COMPANYCODE NVARCHAR2(255) NULL,
COMPANYDESC NVARCHAR2(255) NULL,
SHOWORDER NUMBER NULL,
CANCELED NUMBER NULL,
VIRTUALTYPE NVARCHAR2(255) NULL,
VIRTUALTYPEDESC NVARCHAR2(1000) NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
CONSTRAINT JCL_CHART_COMPANYVIRTUAL_PK PRIMARY KEY (ID)
);
/
delete from HtmlLabelInfo where indexid = 544635 and languageid=9 and ( trim(labelname) is null ) ;
CREATE SEQUENCE JCL_CHART_COMPANYVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544635 as indexid ,'¿ì½ÝËÑË÷×Ô¶¨Áx' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544635 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE
OR REPLACE TRIGGER JCL_CHART_COMPVIRTUAL_TIGGER BEFORE INSERT ON JCL_CHART_COMPANYVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_COMPANYVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/
delete from HtmlLabelIndex where id = 544634 and ( trim(indexdesc) is null ) ;
CREATE TABLE JCL_CHART_DEPARTMENT (
ID NUMBER NOT NULL,
CREATER NVARCHAR2(50) NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENTMARK NVARCHAR2(100) NULL,
DEPARTMENTNAME NVARCHAR2(255) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
SUPDEPARTMENTID NUMBER NULL,
SUPDEPARTMENT NVARCHAR2(100) NULL,
CANCELED NUMBER NULL,
DEPARTMENTCODE NVARCHAR2(255) NULL,
COADJUTANT NVARCHAR2(100) NULL,
TLEVEL NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
ISVIRTUAL NUMBER NULL,
FLEADER NVARCHAR2(500) NULL,
CONSTRAINT JCL_CHART_DEPARTMENT_PK PRIMARY KEY (ID)
);
/
insert into HtmlLabelIndex(id,indexdesc) select 544634,'×éÖ¯¿ìËÙµ÷Õû' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544634 and ( trim(indexdesc) is not null )) and rownum = 1 ;
CREATE SEQUENCE JCL_CHART_DEPARTMENT_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
delete from HtmlLabelInfo where indexid = 544634 and languageid=7 and ( trim(labelname) is null ) ;
CREATE
OR REPLACE TRIGGER JCL_CHART_DEPARTMENT_ID_TIGGER BEFORE INSERT ON JCL_CHART_DEPARTMENT FOR EACH ROW
BEGIN
SELECT
JCL_CHART_DEPARTMENT_ID.nextval INTO:new.ID
FROM
dual;
END;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544634 as indexid ,'×éÖ¯¿ìËÙµ÷Õû' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544634 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE TABLE JCL_CHART_DEPARTMENTVIRTUAL (
ID NUMBER NOT NULL,
DEPARTMENTVIRTUALID INT NULL,
CREATER NVARCHAR2(50) NULL,
DEPARTMENTNAME NVARCHAR2(255) NULL,
DEPARTMENTCODE NVARCHAR2(255) NULL,
DEPARTMENTMARK NVARCHAR2(255) NULL,
SUPDEPTMENT NVARCHAR2(100) NULL,
SUPDEPID INT NULL,
ALLSUPDEPID NVARCHAR2(1000) NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
SUBCOMPANYID INT NULL,
CANCELED INT NULL,
VIRTUALTYPE NVARCHAR2(255) NULL,
TLEVEL NVARCHAR2(255) NULL,
SHOWORDER INT NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB INT NULL,
CONSTRAINT JCL_CHART_DEPARTMENTVIRTUAL_PK PRIMARY KEY (ID)
);
/
delete from HtmlLabelInfo where indexid = 544634 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
CREATE SEQUENCE JCL_CHART_DEPARTMENTVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544634 as indexid ,'Quick Organizational Adjustment' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544634 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
CREATE
OR REPLACE TRIGGER JCL_CHART_DEPT_TIGGER BEFORE INSERT ON JCL_CHART_DEPARTMENTVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_DEPARTMENTVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/
delete from HtmlLabelInfo where indexid = 544634 and languageid=9 and ( trim(labelname) is null ) ;
CREATE TABLE JCL_CHART_JOB (
ID NUMBER NOT NULL,
JOBID NUMBER NULL,
CREATER NVARCHAR2(50) NULL,
JOBNAME NVARCHAR2(100) NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENT NVARCHAR2(100) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
JOBRESPONSIBILITY NVARCHAR2(1000) NULL,
CANCELED NUMBER NULL,
JOBCODE NVARCHAR2(255) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
CONSTRAINT JCL_CHART_JOB_PK PRIMARY KEY (ID)
);
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544634 as indexid ,'½M¿—¿ìËÙÕ{Õû' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544634 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
CREATE SEQUENCE JCL_CHART_JOB_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
Delete from LeftMenuInfo where id=100188;
CREATE
OR REPLACE TRIGGER JCL_CHART_JOB_ID_TIGGER BEFORE INSERT ON JCL_CHART_JOB FOR EACH ROW
BEGIN
SELECT
JCL_CHART_JOB_ID.nextval INTO:new.ID
FROM
dual;
END;
/
Delete from LeftMenuConfig where infoid=100188;
CREATE TABLE JCL_CHART_RESOURCE (
ID NUMBER NOT NULL,
RESOURCEID NUMBER NULL,
LASTNAME NVARCHAR2(100) NULL,
CREATER NVARCHAR2(50) NULL,
WORKYEAR NUMBER NULL,
COMPANYWORKYEAR NUMBER NULL,
USEKIND NVARCHAR2(50) NULL,
MANAGERSTR NVARCHAR2(500) NULL,
STATUS NUMBER NULL,
SEX CHAR(1) NULL ,
ACCOUNTTYPE NUMBER NULL,
BELONGTO NUMBER NULL,
LOGINID NVARCHAR2(100) NULL,
MARITALSTATUS NVARCHAR2(100) NULL,
TELEPHONE NVARCHAR2(100) NULL,
MOBILE NVARCHAR2(100) NULL,
MOBILECALL NVARCHAR2(100) NULL,
EMAIL NVARCHAR2(100) NULL,
LOCATIONNAME NVARCHAR2(100) NULL,
RESOURCETYPE NVARCHAR2(10) NULL,
STARTDATE NVARCHAR2(100) NULL,
ENDDATE NVARCHAR2(100) NULL,
JOBTITLEID NUMBER NULL,
JOBTITLE NVARCHAR2(100) NULL,
JOBLEVEL NUMBER NULL,
SECLEVEL NUMBER NULL,
DEPARTMENTID NUMBER NULL,
DEPARTMENT NVARCHAR2(100) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANY NVARCHAR2(100) NULL,
COSTCENTER NVARCHAR2(100) NULL,
MANAGER NUMBER NULL,
ASSISTANT NUMBER NULL,
WORKCODE NVARCHAR2(100) NULL,
CLASSIFICATION NVARCHAR2(10) NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
POLICY NVARCHAR2(255) NULL,
DEGREE NVARCHAR2(255) NULL,
CONSTRAINT JCL_CHART_RESOURCE_PK PRIMARY KEY (ID)
);
/
call LMConfig_U_ByInfoInsert (2,100147,5);
CREATE SEQUENCE JCL_CHART_RESOURCE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
call LMInfo_Insert (100188,544634,'','',2,100147,5,2);
CREATE
OR REPLACE TRIGGER JCL_CHART_RESOURCE_ID_TIGGER BEFORE INSERT ON JCL_CHART_RESOURCE FOR EACH ROW
BEGIN
SELECT
JCL_CHART_RESOURCE_ID.nextval INTO:new.ID
FROM
dual;
END;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/orgChart/index.html#/dragtree' where id = 100188;
CREATE TABLE JCL_CHART_RESOURCEVIRTUAL (
ID NUMBER NOT NULL,
RESOURCEID NUMBER NULL,
MANAGERID NUMBER NULL,
SUBCOMPANYID NUMBER NULL,
DEPARTMENTID NUMBER NULL,
MANAGERSTR NVARCHAR2(1000) NULL,
VIRTUALTYPE NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
CONSTRAINT JCL_CHART_RESOURCEVIRTUAL_PK PRIMARY KEY (ID)
);
/
Delete from LeftMenuInfo where id=100189;
CREATE SEQUENCE JCL_CHART_RESOURCEVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
Delete from LeftMenuConfig where infoid=100189;
CREATE
OR REPLACE TRIGGER JCL_CHART_RES_ID_TIGGER BEFORE INSERT ON JCL_CHART_RESOURCEVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_RESOURCEVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/
call LMConfig_U_ByInfoInsert (2,100167,2);
CREATE TABLE JCL_CHART_SUBCOMPANY (
ID NUMBER NOT NULL,
CREATER NVARCHAR2(50) NULL,
SUBCOMPANYID NUMBER NULL,
SUBCOMPANYNAME NVARCHAR2(100) NULL,
SUBCOMPANYDESC NVARCHAR2(255) NULL,
COMPANY NVARCHAR2(100) NULL,
SUPSUBCOMPANYID NUMBER NULL,
SUPSUBCOMPANY NVARCHAR2(100) NULL,
CANCELED NUMBER NULL,
SUBCOMPANYCODE NVARCHAR2(255) NULL,
LIMITUSERS NUMBER NULL,
TLEVEL NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
ISVIRTUAL NUMBER NULL,
CONSTRAINT JCL_CHART_SUBCOMPANY_PK PRIMARY KEY (ID)
);
/
call LMInfo_Insert (100189,544635,'','',2,100167,2,2);
CREATE SEQUENCE JCL_CHART_SUBCOMPANY_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/quickSearch' where id = 100189;
CREATE
OR REPLACE TRIGGER JCL_CHART_SUBCOMPANY_ID_TIGGER BEFORE INSERT ON JCL_CHART_SUBCOMPANY FOR EACH ROW
BEGIN
SELECT
JCL_CHART_SUBCOMPANY_ID.nextval INTO:new.ID
FROM
dual;
END;
/
CREATE TABLE JCL_CHART_SUBCOMPANYVIRTUAL (
ID NUMBER NOT NULL,
SUBCOMPANYVIRTUALID NUMBER NULL,
CREATER NVARCHAR2(50) NULL,
SUBCOMPANYNAME NVARCHAR2(100) NULL,
SUBCOMPANYCODE NVARCHAR2(255) NULL,
SUBCOMPANYDESC NVARCHAR2(255) NULL,
SUPSUBCOMPANY NVARCHAR2(100) NULL,
SUPSUBCOMPANYID NUMBER NULL,
COMPANY NVARCHAR2(100) NULL,
COMPANYID NUMBER NULL,
CANCELED NUMBER NULL,
VIRTUALTYPE NVARCHAR2(255) NULL,
TLEVEL NVARCHAR2(255) NULL,
SHOWORDER NUMBER NULL,
VERSIONID NUMBER NULL,
VERSIONDATE NVARCHAR2(255) NULL,
FONJOB NUMBER NULL,
CONSTRAINT JCL_CHART_SUBCOMPANYVIRTUAL_PK PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_CHART_SUBCOMPANYVIRTUAL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_CHART_SUBCOMP_TIGGER BEFORE INSERT ON JCL_CHART_SUBCOMPANYVIRTUAL FOR EACH ROW
BEGIN
SELECT
JCL_CHART_SUBCOMPANYVIRTUAL_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -0,0 +1,3 @@
ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER;
/

@ -0,0 +1,71 @@
delete from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is null );
/
insert into HtmlLabelIndex(id,indexdesc) select 544789,'企通学配置自定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544789 and ( trim(indexdesc) is not null )) and rownum = 1;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is null );
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通学配置自定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) );
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'Enterprise Communication Configuration Customization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1;
/
delete from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is null );
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 544789 as indexid ,'企通學配置自定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544789 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1;
/
delete from HtmlModuleLabel where indexId = 544789 and moduleCode = 'HRM' and type = 'label';
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',544789);
/
Delete from LeftMenuInfo where id=100190;
/
Delete from LeftMenuConfig where infoid=100190;
/
call LMConfig_U_ByInfoInsert (2,100167,3);
/
call LMInfo_Insert (100190,544789,'','',2,100167,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/organization/static/index.html#/main/organization/qtxConfig' where id = 100190;
/
CREATE TABLE JCL_ORG_QTXCONFIG (
ID NUMBER NOT NULL,
APP_SECRET NVARCHAR2(255) NULL,
URL NVARCHAR2(255) NULL,
PC_ADDRESS NVARCHAR2(255) NULL,
MOBILE_ADDRESS NVARCHAR2(255) NULL,
SECOND_URL NVARCHAR2(255) NULL,
CREATOR NUMBER NULL,
CREATEDATE NVARCHAR2(10) NULL,
CONSTRAINT JCL_ORG_QTXCONFIG_PK PRIMARY KEY (ID)
);
/
CREATE SEQUENCE JCL_ORG_QTXCONFIG_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE;
/
CREATE
OR REPLACE TRIGGER JCL_ORG_QTXCONFIG_ID_TIGGER BEFORE INSERT ON JCL_ORG_QTXCONFIG FOR EACH ROW
BEGIN
SELECT
JCL_ORG_QTXCONFIG_ID.nextval INTO:new.ID
FROM
dual;
END;
/

@ -0,0 +1,13 @@
package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @Author liang.cheng
* @Date 2023/9/1 10:21 AM
* @Description: TODO
* @Version 1.0
*/
@Path("/bs/hrmorganization/staff/out")
public class StaffOutController extends com.engine.organization.web.StaffOutController {
}

@ -47,6 +47,11 @@ public class ChartPO {
// 部门层级
private int departmentDepth;
// 在编数
private int onJobNum;
// 编制数
private int staffNum;
public String getId() {
if (StringUtils.isNotBlank(ftype)) {
switch (ftype) {

@ -0,0 +1,40 @@
package com.engine.organization.entity.chart;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author liang.cheng
* @Date 2023/9/11 4:59 PM
* @Description:
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class StatisticsPO {
private Integer id;
private Integer dataId;
private Integer superId;
private Integer type;
private Integer onJobNum;
private Integer staffNum;
private Integer creator;
private String createTime;
private String updateTime;
}

@ -0,0 +1,41 @@
package com.engine.organization.entity.chart;
import com.icbc.api.internal.apache.http.impl.cookie.S;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author liang.cheng
* @Date 2023/9/11 4:59 PM
* @Description:
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class StatisticsVO {
private Integer key;
private String dataIdName;
private String superIdName;
private Integer type;
private Integer onJobNum;
private Integer staffNum;
private String creator;
private String createTime;
private String updateTime;
}

@ -0,0 +1,33 @@
package com.engine.organization.entity.chart.params;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author liang.cheng
* @Date 2023/9/13 1:38 PM
* @Description: TODO
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class RecursionParam {
private Integer id;
/**
*
*/
private List<RecursionParam> subRecursionParam;
private Integer employeeCount;
private Integer staffCount;
}

@ -0,0 +1,22 @@
package com.engine.organization.entity.chart.params;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author liang.cheng
* @Date 2023/9/12 3:46 PM
* @Description:
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class StatisticsParam {
private Integer companyId;
}

@ -75,7 +75,7 @@ public class CompBO {
.build();
}
public static List<CompListDTO> buildCompDTOList(Collection<CompPO> list, List<CompPO> filterList) {
public static List<CompListDTO> buildCompDTOList(Collection<CompPO> list, List<CompPO> filterList, String orderType) {
// 搜索结果为空,直接返回空
if (CollectionUtils.isEmpty(filterList)) {
return Collections.emptyList();
@ -87,10 +87,10 @@ public class CompBO {
dealParentData(addedList, po, poMaps);
}
return buildCompDTOList(addedList);
return buildCompDTOList(addedList, orderType);
}
public static List<CompListDTO> buildCompDTOList(List<CompPO> list) {
public static List<CompListDTO> buildCompDTOList(List<CompPO> list, String orderType) {
Map<Integer, CompPO> poMaps = list.stream().collect(Collectors.toMap(CompPO::getId, item -> item));
@ -105,6 +105,7 @@ public class CompBO {
.supSubComName(null == poMaps.get(e.getSupSubComId()) ? "" : poMaps.get(e.getSupSubComId()).getSubCompanyName())
.showOrder(e.getShowOrder())
.canceled(null == e.getCanceled() ? 0 : e.getCanceled())
.orderType(orderType)
.build()).collect(Collectors.toList());
Map<Integer, List<CompListDTO>> collects = dtoList.stream().filter(item -> 0 != item.getSupSubComId()).collect(Collectors.groupingBy(CompListDTO::getSupSubComId));
// 处理被引用数据

@ -2,12 +2,16 @@ package com.engine.organization.entity.company.dto;
import com.engine.organization.annotation.OrganizationTable;
import com.engine.organization.annotation.TableTitle;
import com.engine.organization.entity.department.dto.DepartmentListDTO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.collections.CollectionUtils;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author:dxfeng
@ -74,4 +78,21 @@ public class CompListDTO {
*
*/
private List<CompListDTO> children;
public Integer getShowOrder() {
return null == showOrder ? 0 : showOrder;
}
private String orderType;
public List<CompListDTO> getChildren() {
if (CollectionUtils.isEmpty(children)) {
return children;
}
if ("asc".equalsIgnoreCase(orderType)) {
return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
} else {
return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
}
}
}

@ -27,6 +27,7 @@ public class DepartmentBO {
/**
*
*
* @param list
* @return
*/
@ -41,7 +42,7 @@ public class DepartmentBO {
).collect(Collectors.toList());
}
public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list) {
public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {
// 递归添加父级数据
List<DepartmentListDTO> dtoList = list.stream().map(e ->
DepartmentListDTO
@ -54,6 +55,7 @@ public class DepartmentBO {
.supDepId(e.getSupDepId())
.showOrder(null == e.getShowOrder() ? 0 : e.getShowOrder())
.canceled(null == e.getCanceled() ? 0 : e.getCanceled())
.orderType(orderType)
.build()).collect(Collectors.toList());
Map<Integer, List<DepartmentListDTO>> collects = dtoList.stream().filter(item -> null != item.getSupDepId() && 0 != item.getSupDepId()).collect(Collectors.groupingBy(DepartmentListDTO::getSupDepId));
// 处理被引用数据
@ -74,7 +76,7 @@ public class DepartmentBO {
}).filter(item -> null == item.getSupDepId() || 0 == item.getSupDepId()).collect(Collectors.toList());
}
public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, List<DepartmentPO> filterList) {
public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, List<DepartmentPO> filterList, String orderType) {
// 搜索结果为空,直接返回空
if (CollectionUtils.isEmpty(filterList)) {
return Collections.emptyList();
@ -85,7 +87,7 @@ public class DepartmentBO {
for (DepartmentPO po : filterList) {
dealParentData(addedList, po, poMaps);
}
return buildDeptDTOList(addedList);
return buildDeptDTOList(addedList, orderType);
}
public static DepartmentPO convertParamsToPO(DeptSearchParam param, Integer employeeId) {

@ -7,8 +7,11 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.collections.CollectionUtils;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author weaver_cl
@ -90,4 +93,21 @@ public class DepartmentListDTO {
*
*/
private List<DepartmentListDTO> children;
private String orderType;
public Double getShowOrder() {
return null == showOrder ? 0 : showOrder;
}
public List<DepartmentListDTO> getChildren() {
if (CollectionUtils.isEmpty(children)) {
return children;
}
if ("asc".equalsIgnoreCase(orderType)) {
return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
} else {
return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
}
}
}

@ -26,7 +26,13 @@ import lombok.NoArgsConstructor;
"t.telephone," +
"t.managerid, " +
"t.dsporder ",
fromSql = "FROM hrmresource t left join cus_fielddata t0 on t.id = t0.id and t0.scopeid ='-1' left join cus_fielddata t1 on t.id = t1.id and t1.scopeid ='1' left join cus_fielddata t2 on t.id = t2.id and t2.scopeid ='3' left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ",
fromSql = "FROM hrmresource t" +
" left join cus_fielddata t0 on t.id = t0.id and t0.scopeid ='-1' and t0.scope = 'HrmCustomFieldByInfoType'" +
" left join cus_fielddata t1 on t.id = t1.id and t1.scopeid ='1' and t1.scope = 'HrmCustomFieldByInfoType'" +
" left join cus_fielddata t2 on t.id = t2.id and t2.scopeid ='3' and t2.scope = 'HrmCustomFieldByInfoType'" +
" left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id" +
" left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID" +
" left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ",
orderby = " t.dsporder ",
sortway = " asc",
primarykey = "id",

@ -98,4 +98,8 @@ public class JobListDTO {
*
*/
private List<JobListDTO> children;
public Integer getShowOrder() {
return null == showOrder ? 0 : showOrder;
}
}

@ -1,11 +1,11 @@
package com.engine.organization.entity.staff.bo;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.param.StaffParams;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.transmethod.StaffTransMethod;
import weaver.general.Util;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author:dxfeng
@ -13,7 +13,7 @@ import java.util.Date;
* @version: 1.0
*/
public class StaffBO {
public static StaffPO convertParamToPO(StaffSearchParam param, Long employeeId) {
public static StaffPO convertParamToPO(StaffParams param, Long employeeId) {
if (param == null) {
return null;
}
@ -42,12 +42,16 @@ public class StaffBO {
}
public static void buildStaffDesc(StaffPO staffPO) {
staffPO.setLackStatus(parseLackStatus(null == staffPO.getStaffNum() ? 0 : staffPO.getStaffNum(), null == staffPO.getPermanentNum() ? 0 : staffPO.getPermanentNum()));
String sb = "编制数:" + parseNull(staffPO.getStaffNum()) +
",在编数:" + parseNull(staffPO.getPermanentNum()) +
",冻结数:" + parseNull(staffPO.getFreezeNum()) +
",缺编状态:" + StaffTransMethod.getLackSpan(Util.null2String(staffPO.getLackStatus()));
staffPO.setStaffDesc(sb);
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),staffPO.getPermanentNum());
int sum = numberF.stream()
.mapToInt(Integer::intValue)
.sum();
staffPO.setLackStatus(parseLackStatus(null == staffPO.getStaffNum() ? 0 : staffPO.getStaffNum(),sum));
// String sb = "编制数:" + parseNull(staffPO.getStaffNum()) +
// ",在编数:" + parseNull(staffPO.getPermanentNum()) +
// ",冻结数:" + parseNull(staffPO.getFreezeNum()) +
// ",缺编状态:" + StaffTransMethod.getLackSpan(Util.null2String(staffPO.getLackStatus()));
// staffPO.setStaffDesc(sb);
}
@ -67,15 +71,15 @@ public class StaffBO {
*
*
* @param staffNum
* @param permanentNum
* @param sums
* @return
*/
private static int parseLackStatus(int staffNum, int permanentNum) {
if (staffNum == permanentNum) {
private static int parseLackStatus(int staffNum, int sums) {
if (staffNum == sums) {
// 满员
return 2;
}
if (staffNum > permanentNum) {
if (staffNum > sums) {
// 缺编
return 1;
}

@ -0,0 +1,47 @@
package com.engine.organization.entity.staff.param;
import com.engine.organization.enums.StaffChangeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author liang.cheng
* @Date 2023/9/1 11:02 AM
* @Description:
* @Version 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class StaffOutParam {
private StaffChangeEnum type;
private Integer planId;
private Integer company;
private Integer department;
private Integer job;
/**
* 1 2 3
*/
private Integer dimension;
/**
* 1. 2.
*/
private Integer changeMode;
/**
*
*/
private Integer num;
}

@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class StaffSearchParam {
public class StaffParams {
/**
*
*/
@ -23,7 +23,7 @@ public class StaffSearchParam {
/**
* id
*/
private Long planId;
private Integer planId;
/**
*
*/
@ -37,7 +37,7 @@ public class StaffSearchParam {
/**
*
*/
private Long jobId;
private Integer jobId;
/**
*
*/

@ -0,0 +1,85 @@
package com.engine.organization.entity.staff.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class StaffSerachParam {
/**
*
*/
private Long id;
/**
* id
*/
private String planId;
/**
*
*/
private Integer compId;
private Integer ecCompany;
/**
*
*/
private Integer deptId;
private Integer ecDepartment;
/**
*
*/
private Integer jobId;
/**
*
*/
private Integer staffNum;
/**
*
*/
private Integer controlPolicy;
/**
*
*/
private Integer permanentNum;
/**
*
*/
private Integer freezeNum;
/**
*
*/
private Integer lackStatus;
/**
*
*/
private String staffDesc;
/**
*
*/
private String description;
/**
*
*/
private String staffName;
/**
*
*/
private Integer changeNum;
/**
*
*/
private String changeDescription;
}

@ -25,7 +25,7 @@ public class StaffPO {
/**
* id
*/
private Long planId;
private Integer planId;
/**
*
*/
@ -39,7 +39,7 @@ public class StaffPO {
/**
*
*/
private Long jobId;
private Integer jobId;
/**
*
*/

@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@OrganizationTable(pageId = "e04abd72-dbd6-11ec-b69e-00ffcbed7508",
fields = "t.id,t.is_used, t.plan_no, t.plan_name, t.plan_year, t.time_start, t.time_end, t.forbidden_tag",
fields = "t.id,t.is_used, t.plan_no, t.plan_name,t.control_dimension, t.plan_year, t.time_start, t.time_end, t.forbidden_tag",
fromSql = "FROM jcl_org_staffplan t ",
orderby = "plan_no",
sortway = "asc",
@ -53,6 +53,11 @@ public class StaffPlanTableVO {
*/
@OrganizationTableColumn(text = "名称", width = "16%", column = "plan_name")
private String planName;
/**
* w
*/
@OrganizationTableColumn(text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
private String controlDimension;
/**
*
*/

@ -18,8 +18,8 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@OrganizationTable(pageId = "0cdfd5bb-dc09-11ec-b69e-00ffcbed7508",
fields = "id,is_used,plan_id,comp_id,dept_id,job_id,staff_num,permanent_num,freeze_num,lack_status,staff_desc",
fromSql = "FROM jcl_org_staff t ",
fields = "t.id,t.is_used,s.control_dimension,t.plan_id,t.comp_id,t.dept_id,t.job_id,t.staff_num,t.permanent_num,t.freeze_num,t.lack_status,t.staff_desc",
fromSql = "FROM jcl_org_staff t inner join jcl_org_staffplan s on t.plan_id = s.id",
orderby = "id desc",
primarykey = "id",
operates = {
@ -45,6 +45,11 @@ public class StaffTableVO {
*/
@OrganizationTableColumn(text = "方案", width = "10%", column = "plan_id", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getSpanById")
private String planId;
/**
*
*/
@OrganizationTableColumn(text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
private String controlDimension;
/**
*
*/

@ -0,0 +1,34 @@
package com.engine.organization.enums;
/**
* @Author liang.cheng
* @Date 2023/9/1 1:50 PM
* @Description:
* @Version 1.0
*/
public enum StaffChangeEnum {
ADD(0, "增加"),
REDUCE(1, "减少"),
FROZEN(2, "冻结"),
ENTRY(3, "入职"),
DIMISSION(4, "离职"),
TRANSFER(5, "转移");
private Integer value;
private String desc;
StaffChangeEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return value;
}
public String getDesc() {
return desc;
}
}

@ -510,12 +510,13 @@
from jcl_org_job t
inner join hrmresource h on t.ec_jobtitle = h.jobtitle and t.ec_company = h.subcompanyid1 and
t.ec_department = h.departmentid
where h.status &lt; 4
</select>
<select id="isAllowDelete" resultType="java.lang.String">
select t.id
from jcl_org_job t
inner join hrmresource h on t.ec_jobtitle = h.jobtitle and t.ec_company = h.subcompanyid1 and
t.ec_department = h.departmentid and t.id = #{jobId}
t.ec_department = h.departmentid and t.id = #{jobId} and h.status &lt; 4
</select>
<select id="getJobByResource" resultType="com.engine.organization.entity.job.po.JobPO">
select

@ -33,6 +33,16 @@ public interface StaffMapper {
*/
List<StaffPO> getStaffByFilter(@Param("companyId") Long companyId, @Param("departmentId") Long departmentId, @Param("jobId") Long jobId);
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/4 11:26 AM
* @param: [planId, companyId, departmentId, jobId]
* @return: com.engine.organization.entity.staff.po.StaffPO
*/
List<StaffPO> customSelect(@Param("planId") Integer planId,@Param("companyId") Integer companyId, @Param("departmentId") Integer departmentId, @Param("jobId") Integer jobId);
/**
*
*
@ -71,4 +81,10 @@ public interface StaffMapper {
* @return
*/
StaffPO getStaffsByParamId(@Param("ftype") Integer ftype,@Param("compId") String compId,@Param("deptId") String deptId,@Param("jobId") String jobId);
List<StaffPO> selectByEcCompany(@Param("companyIds") Collection<Integer> companyIds);
List<StaffPO> selectByEcDepartment(@Param("departmentIds") Collection<Integer> departmentIds);
}

@ -67,6 +67,27 @@
</if>
order by update_time desc
</select>
<select id="customSelect" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_staff t
where delete_type = 0
<if test="planId != null">
and plan_id = #{planId}
</if>
<if test="companyId != null">
and ec_company = #{companyId}
</if>
<if test="departmentId != null">
and ec_department = #{departmentId}
</if>
<if test="jobId != null">
and job_id = #{jobId}
</if>
</select>
<select id="getStaffsByIds" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
@ -350,4 +371,27 @@
and a.job_id = #{jobId}
</if>
</select>
<select id="selectByEcCompany" resultMap="BaseResultMap">
SELECT <include refid="baseColumns"/>
FROM jcl_org_staff t
where t.delete_type = 0
AND t.ec_company IN
<foreach collection="companyIds" open="(" item="companyId" separator="," close=")">
#{companyId}
</foreach>
AND t.plan_id IN (SELECT id from jcl_org_staffplan s where s.control_dimension = 1)
</select>
<select id="selectByEcDepartment" resultMap="BaseResultMap">
SELECT <include refid="baseColumns"/>
FROM jcl_org_staff t
where t.delete_type = 0
AND t.ec_department IN
<foreach collection="departmentIds" open="(" item="departmentId" separator="," close=")">
#{departmentId}
</foreach>
AND t.plan_id IN (SELECT id from jcl_org_staffplan s where s.control_dimension = 2)
</select>
</mapper>

@ -74,4 +74,14 @@ public interface StaffPlanMapper {
List<String> listUsedId();
List<StaffPlanPO> getStaffPlansByIds(@Param("ids") Collection<Long> ids);
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/5 4:02 PM
* @param: [timeStart, timeEnd, ecCompany, controlDimension]
* @return: com.engine.organization.entity.staff.po.StaffPlanPO
*/
List<StaffPlanPO> customSelect(@Param("timeStart") String timeStart,@Param("timeEnd") String timeEnd,@Param("ecCompany") String ecCompany,@Param("controlDimension") String controlDimension);
}

@ -296,4 +296,34 @@
</foreach>
</update>
<select id="customSelect" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_staffplan t where ((time_start &lt;= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE})
OR (time_start &lt;= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE}))
AND ec_company = #{ecCompany}
AND control_dimension = #{controlDimension}
AND delete_type = 0
</select>
<select id="customSelect" resultMap="BaseResultMap" databaseId="oracle">
select
<include refid="baseColumns"/>
from jcl_org_staffplan t where ((time_start &lt;= TO_DATE(#{timeStart,jdbcType=DATE},'yyyy-MM-dd') AND time_end >= TO_DATE(#{timeStart,jdbcType=DATE},'yyyy-MM-dd'))
OR (time_start &lt;= TO_DATE(#{timeEnd,jdbcType=DATE},'yyyy-MM-dd') AND time_end >= TO_DATE(#{timeEnd,jdbcType=DATE},'yyyy-MM-dd')))
AND ec_company = #{ecCompany}
AND control_dimension = #{controlDimension}
AND delete_type = 0
</select>
<select id="customSelect" resultMap="BaseResultMap" databaseId="postgresql">
select
<include refid="baseColumns"/>
from jcl_org_staffplan t where ((time_start &lt;= #{timeStart,jdbcType=DATE}::TIMESTAMP AND time_end >= #{timeStart,jdbcType=DATE}::TIMESTAMP)
OR (time_start &lt;= #{timeEnd,jdbcType=DATE}::TIMESTAMP AND time_end >= #{timeEnd,jdbcType=DATE}::TIMESTAMP))
AND ec_company = #{ecCompany}
AND control_dimension = #{controlDimension}
AND delete_type = 0
</select>
</mapper>

@ -1,5 +1,6 @@
package com.engine.organization.service;
import com.engine.organization.entity.chart.params.StatisticsParam;
import weaver.hrm.User;
import java.util.Map;
@ -72,4 +73,22 @@ public interface ChartService {
* @return
*/
Map<String, Object> getFullSelectTree(Map<String, Object> params);
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/11 4:51 PM
* @param: [request2Map]
* @return: java.util.Map<java.lang.String,java.lang.Object>
*/
Map<String, Object> selectStatistics(Map<String, Object> params);
/**
* @Description: 线
* @Author: liang.cheng
* @Date: 2023/9/12 11:42 AM
* @param: [request2Map]
* @return: java.util.Map<java.lang.String,java.lang.Object>
*/
Map<String, Object> recordStatistics(StatisticsParam param);
}

@ -31,4 +31,14 @@ public interface ExportCommonService {
* @return
*/
XSSFWorkbook resourceExport(HttpServletRequest request, HttpServletResponse response, String ids);
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/21 3:43 PM
* @param: []
* @return: org.apache.poi.xssf.usermodel.XSSFWorkbook
*/
XSSFWorkbook departmentExport();
}

@ -0,0 +1,33 @@
package com.engine.organization.service;
import com.engine.organization.entity.staff.param.StaffOutParam;
/**
* @Author liang.cheng
* @Date 2023/9/1 10:26 AM
* @Description:
* @Version 1.0
*/
public interface StaffOutService {
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/1 1:37 PM
* @param: [staffOutParam]
* @return: java.lang.Integer
*/
Integer changeStaff(StaffOutParam staffOutParam);
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/1 2:06 PM
* @param: [staffOutParam]
* @return: java.lang.Integer
*/
Integer transactionOnJob(StaffOutParam staffOutParam);
}

@ -1,6 +1,7 @@
package com.engine.organization.service;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.param.StaffParams;
import com.engine.organization.entity.staff.param.StaffSerachParam;
import java.util.Collection;
import java.util.Map;
@ -18,14 +19,14 @@ public interface StaffService {
* @param params
* @return
*/
Map<String, Object> listPage(StaffSearchParam params);
Map<String, Object> listPage(StaffSerachParam params);
/**
*
* @param param
* @return
*/
int saveStaff(StaffSearchParam param);
int saveStaff(StaffParams param);
/**
*
@ -33,7 +34,7 @@ public interface StaffService {
* @param param
* @return
*/
int updateStaff(StaffSearchParam param);
int updateStaff(StaffParams param);
/**
* ID

@ -1,22 +1,27 @@
package com.engine.organization.service.impl;
import cn.hutool.core.thread.ThreadUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.entity.chart.ChartPO;
import com.engine.organization.entity.chart.CompanyTreePO;
import com.engine.organization.entity.chart.TreeSelect;
import com.engine.organization.entity.chart.*;
import com.engine.organization.entity.chart.params.StatisticsParam;
import com.engine.organization.enums.ModuleTypeEnum;
import com.engine.organization.mapper.hrmresource.SystemDataMapper;
import com.engine.organization.service.ChartService;
import com.engine.organization.service.OrgChartService;
import com.engine.organization.util.HasRightUtil;
import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.OrganizationCommonUtil;
import com.engine.organization.util.OrganizationDateUtil;
import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.detach.DetachUtil;
import lombok.SneakyThrows;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.conn.RecordSetTrans;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.company.DepartmentComInfo;
@ -24,7 +29,10 @@ import weaver.hrm.company.SubCompanyComInfo;
import weaver.hrm.resource.ResourceComInfo;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
/**
@ -119,6 +127,8 @@ public class ChartServiceImpl extends Service implements ChartService {
topChartPO.setFtype(rs.getString("type"));
topChartPO.setFobjid(rs.getString("id"));
topChartPO.setFname(rs.getString("name"));
topChartPO.setOnJobNum(isRealTime ? Util.getIntValue(rs.getString("on_job_num"),0) : Util.getIntValue(rs.getString("job_num"),0));
topChartPO.setStaffNum(Util.getIntValue(rs.getString("staff_num"),0));
topChartPO.setParentId(null);
topChartPO.setExpand("1");
topChartPO.setFisvitual(rs.getString("isvitual"));
@ -132,7 +142,6 @@ public class ChartServiceImpl extends Service implements ChartService {
findChildData(topChartPO, dataList, Integer.parseInt(depth), id, hideDepartment);
}
result.put("api_status", true);
result.put("data", dataList);
return result;
@ -189,6 +198,7 @@ public class ChartServiceImpl extends Service implements ChartService {
chartPO.setFisvitual(rs.getString("isvitual"));
chartPO.setHasChildren(getHasChildren(chartPO.getFtype(), chartPO.getFobjid()).toString());
filterAndAddData(dataList, chartPO, hideDepartment);
//dataList.add(chartPO);
}
}
@ -266,7 +276,7 @@ public class ChartServiceImpl extends Service implements ChartService {
if (showJob) {
// 查询部门下的岗位
if (isRealTime) {
sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle where b.ec_department = '" + departmentId + "'";
sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "'";
} else {
sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and versionid = " + versionId;
}
@ -395,12 +405,12 @@ public class ChartServiceImpl extends Service implements ChartService {
} else {
if (hasVirtualFields) {
if (showVirtual) {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual from " + SUB_COMPANY_TABLE + " where versionid = " + versionId + " and subcompanyid = " + root;
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and subcompanyid = " + root;
} else {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual from " + SUB_COMPANY_TABLE + " where versionid = " + versionId + " and subcompanyid = " + root + " and (isvirtual is null or isvirtual != '1')";
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and subcompanyid = " + root + " and (isvirtual is null or isvirtual != '1')";
}
} else {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type from " + SUB_COMPANY_TABLE + " where versionid = " + versionId + " and subcompanyid = " + root;
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and subcompanyid = " + root;
}
}
}
@ -515,6 +525,242 @@ public class ChartServiceImpl extends Service implements ChartService {
return result;
}
@SneakyThrows
@Override
public Map<String, Object> selectStatistics(Map<String, Object> params) {
RecordSet rs = new RecordSet();
Map<String, Object> result = new HashMap<>(4);
DepartmentComInfo departmentComInfo = new DepartmentComInfo();
ResourceComInfo resourceComInfo = new ResourceComInfo();
SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
List<StatisticsVO> statisticsVOS = new ArrayList<>();
rs.executeQuery("select id,data_id,super_id,type,on_job_num,staff_num,creator,create_time,update_time from jcl_org_onjob");
while (rs.next()) {
Integer type = Util.getIntValue(rs.getString("type"));
String dataIdName;
String superIdName;
if (ModuleTypeEnum.subcompanyfielddefined.getValue().equals(type)) {
dataIdName = subCompanyComInfo.getSubCompanyname(Util.null2String((rs.getString("data_id"))));
superIdName = subCompanyComInfo.getSubCompanyname(Util.null2String((rs.getString("super_id"))));
}else {
dataIdName = departmentComInfo.getDepartmentname(Util.null2String((rs.getString("data_id"))));
superIdName = departmentComInfo.getDepartmentname(Util.null2String((rs.getString("super_id"))));
}
StatisticsVO statisticsVO = StatisticsVO.builder()
.key(Util.getIntValue(rs.getString("id")))
.dataIdName(dataIdName)
.superIdName(superIdName)
.type(type)
.onJobNum(Util.getIntValue(rs.getString("on_job_num")))
.staffNum(Util.getIntValue(rs.getString("staff_num")))
.creator(resourceComInfo.getLastname(Util.null2String(rs.getString("creator"))))
.createTime(Util.null2String(rs.getString("create_time")))
.updateTime(Util.null2String(rs.getString("update_time")))
.build();
statisticsVOS.add(statisticsVO);
}
result.put("result",statisticsVOS);
return result;
}
@Override
public Map<String, Object> recordStatistics(StatisticsParam statisticsParam) {
Map<String, Object> result = new HashMap<>(2);
long startTime = System.currentTimeMillis();
//需要更新的数据List
List<StatisticsPO> list = filterIds(statisticsParam.getCompanyId());
RecordSetTrans rst = new RecordSetTrans();
// 核心线程数
int corePoolSize = 5;
// 最大线程数
int maxPoolSize = 10;
// 设置每个子列表的大小
int batchSize = 100;
List<List<StatisticsPO>> splittedLists = OrganizationCommonUtil.splitList(list, batchSize);
// 创建线程池
ExecutorService executorService = ThreadUtil.newExecutor(corePoolSize, maxPoolSize);
// 遍历每个子列表,并提交给线程池执行
for (List<StatisticsPO> subList : splittedLists) {
executorService.submit(() -> {
// 在此处编写处理子列表的逻辑
for (StatisticsPO statisticsPO : subList) {
// 处理逻辑
StatisticsPO po = buildCount(statisticsPO);
statisticsPO.setOnJobNum(po.getOnJobNum());
statisticsPO.setStaffNum(po.getStaffNum());
statisticsPO.setUpdateTime(OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now()));
}
});
}
// 关闭线程池
executorService.shutdown();
// 等待线程池关闭
while (!executorService.isTerminated()) {
// 空循环等待线程池终止
}
try {
rst.setAutoCommit(false);
for (StatisticsPO item : list) {
rst.executeUpdate("update jcl_org_onjob set on_job_num = ?,staff_num = ? where data_id = ? and type = ?",item.getOnJobNum(),
item.getStaffNum(),item.getDataId(),item.getType());
}
rst.commit();
}catch (Exception e) {
result.put("errorMsg",e.getMessage());
rst.rollback();
}
long endTime = System.currentTimeMillis();
long executionTime = endTime - startTime;
result.put("time",executionTime);
return result;
}
/**
*
* @param stp
* @return
*/
private StatisticsPO buildCount(StatisticsPO stp) {
RecordSet rs = new RecordSet();
DepartmentComInfo dept = new DepartmentComInfo();
SubCompanyComInfo subCompany = new SubCompanyComInfo();
ArrayList<Integer> list = new ArrayList<>();
list.add(stp.getDataId());
StringBuilder jobSql = new StringBuilder();
StringBuilder staffSql = new StringBuilder();
if (ModuleTypeEnum.subcompanyfielddefined.getValue().equals(stp.getType())) {
subCompany.getSubCompanyLists(String.valueOf(stp.getDataId()), list);
String value = StringUtils.join(list,",");
jobSql.append("select count(1) as count from hrmresource where status < 4 and subcompanyid1 in (").append(value).append(")");
staffSql.append("select a.staff_num from jcl_org_staff a inner join jcl_org_staffplan b\n" +
" on a.plan_id = b.id\n" +
" and a.ec_company = ? and a.ec_department is null and a.delete_type = 0\n" +
" and b.plan_year = ?");
}else {
dept.getAllChildDeptByDepId(list,String.valueOf(stp.getDataId()));
String value = StringUtils.join(list,",");
jobSql.append("select count(1) as count from hrmresource where status < 4 and departmentid in (").append(value).append(")");
staffSql.append("select a.staff_num from jcl_org_staff a inner join jcl_org_staffplan b\n" +
" on a.plan_id = b.id\n" +
" and a.ec_department = ? and a.job_id is null and a.delete_type = 0\n" +
" and b.plan_year = ?");
}
if ("false".equals(new BaseBean().getPropValue("hrmOrganization","accountType"))) {
jobSql.append(" and accounttype != 1");
}
rs.executeQuery(jobSql.toString());
rs.next();
stp.setOnJobNum(Util.getIntValue(rs.getString("count")));
rs.executeQuery(staffSql.toString(),stp.getDataId(),OrganizationDateUtil.getFormatYear(new Date()));
if (rs.next()) {
stp.setStaffNum(Util.getIntValue(rs.getString("staff_num")));
}else {
stp.setStaffNum(0);
}
return stp;
}
/**
*
* @param companyId
* @return
*/
private List<StatisticsPO> filterIds (Integer companyId) {
RecordSet rs = new RecordSet();
RecordSet iRs = new RecordSet();
List<Integer> hisCompanyList = new ArrayList<>();
List<Integer> hisDepartmentList = new ArrayList<>();
rs.executeQuery("select data_id from jcl_org_onjob where type = 1");
while (rs.next()) {
hisCompanyList.add(Util.getIntValue(rs.getString("data_id")));
}
rs.executeQuery("select data_id from jcl_org_onjob where type = 2");
while (rs.next()) {
hisDepartmentList.add(Util.getIntValue(rs.getString("data_id")));
}
List<StatisticsPO> companyList = new ArrayList<>();
List<StatisticsPO> departmentList = new ArrayList<>();
StringBuilder sql = new StringBuilder();
StringBuilder sql1 = new StringBuilder();
sql.append("select id,supsubcomid from hrmsubcompany where 1=1");
sql1.append("select id,supdepid from hrmdepartment where 1=1");
if (companyId != null) {
sql.append(" and id = ").append(companyId);
sql1.append(" and subcompanyid1 = ").append(companyId);
}
rs.executeQuery(sql.toString());
while (rs.next()) {
StatisticsPO statisticsPO = StatisticsPO.builder()
.dataId(Util.getIntValue(rs.getString("id")))
.superId(Util.getIntValue(rs.getString("supsubcomid")))
.type(1)
.onJobNum(0)
.staffNum(0)
.creator(user.getUID())
.createTime(OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now()))
.updateTime(OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now()))
.build();
companyList.add(statisticsPO);
}
rs.executeQuery(sql1.toString());
while (rs.next()) {
StatisticsPO statisticsPO = StatisticsPO.builder()
.dataId(Util.getIntValue(rs.getString("id")))
.superId(Util.getIntValue(rs.getString("supdepid")))
.type(2)
.onJobNum(0)
.staffNum(0)
.creator(user.getUID())
.createTime(OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now()))
.updateTime(OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now()))
.build();
departmentList.add(statisticsPO);
}
List<StatisticsPO> addCompanyList = companyList.stream()
.filter(entity -> !hisCompanyList.contains(entity.getDataId()))
.collect(Collectors.toList());
List<StatisticsPO> addDeptList = departmentList.stream()
.filter(entity -> !hisDepartmentList.contains(entity.getDataId()))
.collect(Collectors.toList());
addCompanyList.addAll(addDeptList);
if (CollectionUtils.isNotEmpty(addCompanyList)) {
addCompanyList.forEach(item -> iRs.executeUpdate("insert into jcl_org_onjob(data_id,super_id,type,on_job_num,staff_num,creator,create_time,update_time)" +
" values(?,?,?,?,?,?,?,?)",item.getDataId(),item.getSuperId(),item.getType(),
item.getOnJobNum(),item.getStaffNum(),item.getCreator(),item.getCreateTime(),item.getUpdateTime()));
}
companyList.addAll(departmentList);
return companyList;
}
/**
*
*
@ -610,16 +856,18 @@ public class ChartServiceImpl extends Service implements ChartService {
" a.subcompanycode,\n" +
" a.limitusers,\n" +
" a.tlevel,\n" +
" c.fblx as isvirtual\n" +
" c.fblx as isvirtual,d.on_job_num,d.staff_num \n" +
" from hrmsubcompany a\n" +
" left join hrmsubcompany b on a.supsubcomid = b.id\n" +
" left join hrmsubcompanydefined c on a.id = c.subcomid ";
" left join hrmsubcompanydefined c on a.id = c.subcomid " +
" left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 ";
deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1 as subcompanyid, " +
"b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," +
"a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader " +
"a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " +
"from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " +
"left join hrmdepartment c on a.supdepid = c.id " +
"left join hrmdepartmentdefined d on a.id=d.deptid";
"left join hrmdepartmentdefined d on a.id=d.deptid " +
"left join JCL_ORG_ONJOB e on a.id=e.data_id and e.type=2 ";
} else {
subCompanyQuerySql = "select a.id as subcompanyid,\n" +
@ -631,9 +879,12 @@ public class ChartServiceImpl extends Service implements ChartService {
" a.canceled,\n" +
" a.subcompanycode,\n" +
" a.limitusers,\n" +
" a.tlevel\n" +
" a.tlevel,\n" +
" c.on_job_num,\n" +
" c.staff_num\n" +
" from hrmsubcompany a\n" +
" left join hrmsubcompany b on a.supsubcomid = b.id";
" left join hrmsubcompany b on a.supsubcomid = b.id\n" +
" left join JCL_ORG_ONJOB c on a.id=c.data_id and c.type=1 ";
deptQuerySql = "select a.id as departmentid,\n" +
" a.departmentmark,\n" +
" a.departmentname,\n" +
@ -645,10 +896,13 @@ public class ChartServiceImpl extends Service implements ChartService {
" a.departmentcode,\n" +
" a.coadjutant,\n" +
" a.tlevel,\n" +
" a.bmfzr as fleader\n" +
" a.bmfzr as fleader,\n" +
" d.on_job_num,\n" +
" d.staff_num" +
" from hrmdepartment a\n" +
" left join hrmsubcompany b on a.subcompanyid1 = b.id\n" +
" left join hrmdepartment c on a.supdepid = c.id";
" left join hrmdepartment c on a.supdepid = c.id\n" +
" left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=2 ";
}
@ -672,12 +926,14 @@ public class ChartServiceImpl extends Service implements ChartService {
insertList.add(currentDate);
insertList.add(virtualFlag ? Util.getIntValue(rs.getString("isvirtual"), 0) : 0);
insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId));
insertList.add(Util.getIntValue(rs.getString("on_job_num"),0));
insertList.add(Util.getIntValue(rs.getString("staff_num"),0));
insertParamList.add(insertList);
}
String insertSubSql = "insert into jcl_chart_subcompany(creater, subcompanyid, subcompanyname, subcompanydesc, company,\n" +
" supsubcompanyid, supsubcompany, canceled, subcompanycode, limitusers,\n" +
" tlevel, versiondate, isvirtual,versionId) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
" tlevel, versiondate, isvirtual,versionId,job_num,staff_num) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
insertData(recordSetTrans, insertSubSql, insertParamList);
//当前部门版本存储
@ -701,11 +957,13 @@ public class ChartServiceImpl extends Service implements ChartService {
insertList.add(currentDate);
insertList.add(virtualFlag ? Util.getIntValue(rs.getString("isvirtual"), 0) : 0);
insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId));
insertList.add(Util.getIntValue(rs.getString("on_job_num"),0));
insertList.add(Util.getIntValue(rs.getString("staff_num"),0));
insertParamList.add(insertList);
}
String insertDeptSql = "insert into jcl_chart_department(creater, departmentid, departmentmark, departmentname, subcompanyid,\n" +
" subcompany, supdepartmentid, supdepartment, canceled, departmentcode,\n" +
" coadjutant, fleader,versiondate, isvirtual,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
" coadjutant, fleader,versiondate, isvirtual,versionid,job_num,staff_num) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
insertData(recordSetTrans, insertDeptSql, insertParamList);
//当前岗位版本存储
@ -1014,13 +1272,13 @@ public class ChartServiceImpl extends Service implements ChartService {
} else {
if (hasVirtualFields) {
if (showVirtual) {
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where a.id = '" + root + "' order by showorder,id";
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '" + root + "' order by showorder,id";
} else {
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where a.id = '" + root + "' and (b.fblx is null or b.fblx!='1') order by showorder,id";
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '" + root + "' and (b.fblx is null or b.fblx!='1') order by showorder,id";
}
} else {
return "select id,subcompanyname as name,'1' as type from " + SUB_COMPANY_TABLE + " where id = '" + root + "' order by showorder,id";
return "select a.id,a.subcompanyname as name,'1' as type,b.on_job_num,b.staff_num from " + SUB_COMPANY_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=1 where a.id = '" + root + "' order by a.showorder,a.id";
}
}
}
@ -1039,37 +1297,44 @@ public class ChartServiceImpl extends Service implements ChartService {
case "0":
if (hasVirtualFields) {
if (showVirtual) {
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and (a.supsubcomid is null or a.supsubcomid = '0') and a.companyid = '" + fObjId + "'";
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where (a.canceled is null or a.canceled != '1') and (a.supsubcomid is null or a.supsubcomid = '0') and a.companyid = '" + fObjId + "'";
} else {
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and (a.supsubcomid is null or a.supsubcomid = '0') and (b.fblx is null or b.fblx != '1') and a.companyid = '" + fObjId + "'";
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where (a.canceled is null or a.canceled != '1') and (a.supsubcomid is null or a.supsubcomid = '0') and (b.fblx is null or b.fblx != '1') and a.companyid = '" + fObjId + "'";
}
} else {
sql = "select a.id,a.subcompanyname as name,'1' as type from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcomid is null or a.supsubcomid = '0') and a.companyid = '" + fObjId + "'";
sql = "select a.id,a.subcompanyname as name,'1' as type,b.on_job_num,b.staff_num from " + SUB_COMPANY_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=1 where (a.canceled is null or a.canceled != '1') and (a.supsubcomid is null or a.supsubcomid = '0') and a.companyid = '" + fObjId + "'";
}
// 一级分部数据分权处理
if (isRealTime && user.getUID() != 1 && isRealDimension) {
DetachUtil detachUtil = new DetachUtil(user);
String ids = detachUtil.getJclRoleLevels();
sql = sql + " and a.id in ("+ids+")";
}
break;
case "1":
if (hasVirtualFields) {
if (showVirtual) {
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,showorder from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and a.supsubcomid = '" + fObjId + "'" +
" union select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,showorder from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and subcompanyid1 = '" + fObjId + "'";
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,showorder,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where (a.canceled is null or a.canceled != '1') and a.supsubcomid = '" + fObjId + "'" +
" union select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,showorder,c.on_job_num,c.staff_num from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and subcompanyid1 = '" + fObjId + "'";
} else {
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,showorder from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and (b.fblx is null or b.fblx != '1') and a.supsubcomid = '" + fObjId + "'" +
" union select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,showorder from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and (b.bmlx is null or b.bmlx != '1') and subcompanyid1 = '" + fObjId + "'";
sql = "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,showorder,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where (a.canceled is null or a.canceled != '1') and (b.fblx is null or b.fblx != '1') and a.supsubcomid = '" + fObjId + "'" +
" union select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,showorder,c.on_job_num,c.staff_num from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and (b.bmlx is null or b.bmlx != '1') and subcompanyid1 = '" + fObjId + "'";
}
} else {
sql = "select a.id,a.subcompanyname as name,'1' as type,showorder from " + SUB_COMPANY_TABLE + " a where (canceled is null or canceled != '1') and supsubcomid = '" + fObjId + "'" +
" union select a.id,a.departmentname as name,'2' as type,showorder from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid1 = '" + fObjId + "'";
sql = "select a.id,a.subcompanyname as name,'1' as type,showorder,b.on_job_num,b.staff_num from " + SUB_COMPANY_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=1 where (canceled is null or canceled != '1') and supsubcomid = '" + fObjId + "'" +
" union select a.id,a.departmentname as name,'2' as type,showorder,b.on_job_num,b.staff_num from " + DEPARTMENT_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=2 where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid1 = '" + fObjId + "'";
}
break;
case "2":
if (hasVirtualFields) {
if (showVirtual) {
sql = "select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and supdepid = '" + fObjId + "'";
sql = "select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,c.on_job_num,c.staff_num from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (a.canceled is null or a.canceled != '1') and supdepid = '" + fObjId + "'";
} else {
sql = "select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual from " + DEPARTMENT_TABLE + " a left join hrmdepartmentdefined b on a.id = b.deptid where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.supdepid = '" + fObjId + "'";
sql = "select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,c.on_job_num,c.staff_num from " + DEPARTMENT_TABLE + " a left join hrmdepartmentdefined b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.supdepid = '" + fObjId + "'";
}
} else {
sql = "select a.id,a.departmentname as name,'2' as type from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "'";
sql = "select a.id,a.departmentname as name,'2' as type,b.on_job_num,b.staff_num from " + DEPARTMENT_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=2 where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "'";
}
break;
default:
@ -1094,12 +1359,12 @@ public class ChartServiceImpl extends Service implements ChartService {
case "0":
if (hasVirtualFields) {
if (showVirtual) {
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = " + versionId;
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = " + versionId;
} else {
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and (isvirtual is null or isvirtual != '1') and versionid = " + versionId;
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and (isvirtual is null or isvirtual != '1') and versionid = " + versionId;
}
} else {
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = " + versionId;
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = " + versionId;
}
if (!isRealDimension) {
sql += " and companyid = " + fObjId;
@ -1108,26 +1373,26 @@ public class ChartServiceImpl extends Service implements ChartService {
case "1":
if (hasVirtualFields) {
if (showVirtual) {
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and a.supsubcompanyid = '" + fObjId + "' and versionid = " + versionId +
" union select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and subcompanyid = '" + fObjId + "' and versionid = " + versionId;
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and a.supsubcompanyid = '" + fObjId + "' and versionid = " + versionId +
" union select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and subcompanyid = '" + fObjId + "' and versionid = " + versionId;
} else {
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supsubcompanyid = '" + fObjId + "' and versionid = " + versionId +
" union select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and (isvirtual is null or isvirtual != '1') and subcompanyid = '" + fObjId + "' and versionid = " + versionId;
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where (a.canceled is null or a.canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supsubcompanyid = '" + fObjId + "' and versionid = " + versionId +
" union select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and (isvirtual is null or isvirtual != '1') and subcompanyid = '" + fObjId + "' and versionid = " + versionId;
}
} else {
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type from " + SUB_COMPANY_TABLE + " a where (canceled is null or canceled != '1') and supsubcompanyid = '" + fObjId + "' and versionid = " + versionId +
" union select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid = '" + fObjId + "' and versionid = " + versionId;
sql = "select " + SUB_COMPANY_ID + " as id,a.subcompanyname as name,'1' as type,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where (canceled is null or canceled != '1') and supsubcompanyid = '" + fObjId + "' and versionid = " + versionId +
" union select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type,a.job_num,a.staff_num from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid = '" + fObjId + "' and versionid = " + versionId;
}
break;
case "2":
if (hasVirtualFields) {
if (showVirtual) {
sql = "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and supdepartmentid = '" + fObjId + "' and versionid = " + versionId;
sql = "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and supdepartmentid = '" + fObjId + "' and versionid = " + versionId;
} else {
sql = "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supdepartmentid = '" + fObjId + "' and versionid = " + versionId;
sql = "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supdepartmentid = '" + fObjId + "' and versionid = " + versionId;
}
} else {
sql = "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "' and versionid = " + versionId;
sql = "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type,a.job_num,a.staff_num from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "' and versionid = " + versionId;
}
break;
default:
@ -1164,6 +1429,8 @@ public class ChartServiceImpl extends Service implements ChartService {
chartPO.setFtype(recordSet.getString("type"));
chartPO.setFobjid(recordSet.getString("id"));
chartPO.setFname(recordSet.getString("name"));
chartPO.setOnJobNum(isRealTime ? Util.getIntValue(recordSet.getString("on_job_num"),0) : Util.getIntValue(recordSet.getString("job_num"),0));
chartPO.setStaffNum(Util.getIntValue(recordSet.getString("staff_num"),0));
chartPO.setParentId(topChartPO.getId());
chartPO.setFisvitual(recordSet.getString("isvitual"));
chartPO.setHasChildren(getHasChildren(chartPO.getFtype(), chartPO.getFobjid()).toString());
@ -1173,11 +1440,14 @@ public class ChartServiceImpl extends Service implements ChartService {
filterAndAddData(currentList, chartPO, hideDepartment);
//currentList.add(chartPO);
}
for (ChartPO chartPO : currentList) {
if (inDepth(selectDepth, chartPO.getDepartmentDepth())) {
findChildData(chartPO, dataList, selectDepth, versionId, hideDepartment);
}
}
dataList.addAll(currentList);
}
@ -1417,12 +1687,13 @@ public class ChartServiceImpl extends Service implements ChartService {
* @param hideDepartment
*/
private void filterAndAddData(List<ChartPO> currentList, ChartPO chartPO, boolean hideDepartment) {
if (hideDepartment) {
if ("2".equals(chartPO.getFtype())) {
return;
}
}
currentList.add(chartPO);
}
}

@ -70,7 +70,8 @@ public class CompServiceImpl extends Service implements CompService {
CompPO companyPO = CompBO.convertParamToPO(params, user.getUID());
boolean filter = isFilter(companyPO);
PageInfo<CompListDTO> pageInfos;
String orderSql = PageInfoSortUtil.getSortSql(params.getSortParams(), " showorder ");
StringBuilder orderType = new StringBuilder("asc");
String orderSql = PageInfoSortUtil.getSortSql(orderType, params.getSortParams(), " showorder ");
List<CompPO> allList = getCompMapper().listAll(orderSql);
new DetachUtil(user).filterCompanyList(allList);
@ -82,13 +83,19 @@ public class CompServiceImpl extends Service implements CompService {
new DetachUtil(user).filterCompanyList(filterCompPOs);
// 添加父级元素
List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs);
List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs, orderType.toString());
if ("asc".equalsIgnoreCase(orderType.toString())) {
compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
} else {
compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
}
List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
pageInfos = new PageInfo<>(subList, CompListDTO.class);
pageInfos.setTotal(compListDTOS.size());
} else {
// 组合list
List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList);
List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, orderType.toString());
List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
pageInfos = new PageInfo<>(subList, CompListDTO.class);
pageInfos.setTotal(compListDTOS.size());

@ -131,7 +131,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID());
boolean filter = isFilter(departmentPO);
PageInfo<DepartmentListDTO> pageInfos;
String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams(), " showorder ");
StringBuilder orderType = new StringBuilder("asc");
String orderSql = PageInfoSortUtil.getSortSql(orderType, param.getSortParams(), " showorder ");
List<DepartmentPO> allList = getDepartmentMapper().listAll(orderSql);
new DetachUtil(user).filterDepartmentList(allList);
// 通过子级遍历父级元素
@ -140,13 +142,19 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
List<DepartmentPO> filterDeptPOs = getDepartmentMapper().listByFilter(departmentPO, orderSql);
new DetachUtil(user).filterDepartmentList(filterDeptPOs);
// 添加父级元素
List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs);
List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs, orderType.toString());
if ("asc".equalsIgnoreCase(orderType.toString())) {
compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
} else {
compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
}
List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
pageInfos.setTotal(compListDTOS.size());
} else {
// 组合list
List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList);
List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, orderType.toString());
List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
pageInfos.setTotal(compListDTOS.size());
@ -243,7 +251,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
@Override
public Map<String, List<MenuBtn>> getHasRight() {
return MenuBtn.getDatasNoBtnColum();
MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
Map<String, List<MenuBtn>> datasNoBtnColum = MenuBtn.getDatasNoBtnColum();
datasNoBtnColum.get("topMenu").add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
datasNoBtnColum.get("rightMenu").add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
return datasNoBtnColum;
}
@Override
@ -704,15 +716,15 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
OrganizationAssert.isFalse("d".equals(targetType), "分部不能拖拽至部门下");
if ("c".equals(targetType)) {// 集团下上级分部为0
params.put("supsubcomid", "0");
}else if ("s".equals(targetType)){
} else if ("s".equals(targetType)) {
params.put("supsubcomid", targetId);//上下级关系
}
}else{//外部
if("s".equals(targetType)){// 分部外(平级)
params.put("supsubcomid",supId);
}else{// 部门外(找上级)
} else {//外部
if ("s".equals(targetType)) {// 分部外(平级)
params.put("supsubcomid", supId);
} else {// 部门外(找上级)
OrganizationAssert.isFalse("d".equals(ftype), "分部不能拖拽至部门下");
params.put("supsubcomid",supId);
params.put("supsubcomid", supId);
}
}
new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync();
@ -721,10 +733,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
Set<Integer> disableIds = new HashSet<>();
if ("0".equals(dragPostion)) {//内部
OrganizationAssert.isFalse("c".equals(targetType), "部门不能拖拽至集团下");
if("s".equals(targetType)){
if ("s".equals(targetType)) {
deptById.setSubCompanyId1(Util.getIntValue(targetId));
deptById.setSupDepId(null);
}else{
} else {
deptListByPId = getDepartmentMapper().getDeptListByPId(Util.getIntValue(targetId));
disableIds.add(Util.getIntValue(sourceKey.substring(1)));
if (CollectionUtils.isNotEmpty(deptListByPId)) {
@ -735,12 +747,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(Util.getIntValue(targetId));
deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());
}
}else{//外部
if("s".equals(targetType)){
} else {//外部
if ("s".equals(targetType)) {
OrganizationAssert.isFalse("0".equals(supId), "部门不能拖拽至集团下");
deptById.setSubCompanyId1(Util.getIntValue(supId));
deptById.setSupDepId(null);
}else{
} else {
// 转移到部门外
deptListByPId = getDepartmentMapper().getDeptListByPId(Util.getIntValue(supId));
disableIds.add(Util.getIntValue(sourceKey.substring(1)));

@ -10,12 +10,18 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.cloudstore.eccom.result.WeaResultMsg;
import com.engine.core.impl.Service;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.department.bo.DepartmentBO;
import com.engine.organization.entity.department.dto.DepartmentListDTO;
import com.engine.organization.entity.department.po.DepartmentPO;
import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.mapper.department.DepartmentMapper;
import com.engine.organization.mapper.resource.HrmResourceMapper;
import com.engine.organization.mapper.resource.ResourceMapper;
import com.engine.organization.service.ExportCommonService;
import com.engine.organization.util.HrmI18nUtil;
import com.engine.organization.util.PageInfoSortUtil;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.detach.DetachUtil;
import com.engine.organization.util.excel.ExcelUtil;
@ -38,6 +44,12 @@ import java.util.stream.Collectors;
**/
public class ExportCommonServiceImpl extends Service implements ExportCommonService {
private static DepartmentMapper getDepartmentMapper() {
return MapperProxyFactory.getProxy(DepartmentMapper.class);
}
@Override
public XSSFWorkbook resourceExport(List<Long> ids) {
@ -201,5 +213,57 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
return ExcelUtil.genWorkbookV2(excelSheetData, sheetName);
}
@Override
public XSSFWorkbook departmentExport() {
String orderSql = PageInfoSortUtil.getSortSql("", " showorder ");
List<DepartmentPO> allList = getDepartmentMapper().listAll(orderSql);
new DetachUtil(user).filterDepartmentList(allList);
Map<Integer, DepartmentPO> poMaps = allList.stream().collect(Collectors.toMap(DepartmentPO::getId, item -> item));
List<DepartmentListDTO> dtoList = allList.stream().map(e ->
DepartmentListDTO
.builder()
.id(e.getId())
.departmentMark(e.getDepartmentMark())
.departmentName(e.getDepartmentName())
.departmentCode(e.getDepartmentCode())
.subCompanyName(0 == e.getSubCompanyId1() ? "" : MapperProxyFactory.getProxy(CompMapper.class).listById(e.getSubCompanyId1()).getSubCompanyName())
.supDepName(null == poMaps.get(e.getSupDepId()) ? "" : poMaps.get(e.getSupDepId()).getDepartmentName())
.bmfzr(DepartmentBO.getEmployeeNameById(e.getId()))
.canceled(null == e.getCanceled() ? 0 : e.getCanceled())
.build()).collect(Collectors.toList());
// 1.工作簿名称
String sheetName = HrmI18nUtil.getI18nLabel(85368, "部门档案数据");
// 2.表头(后面动态获取)
List<List<Object>> excelSheetData = new ArrayList<>();
String[] header = {
HrmI18nUtil.getI18nLabel( -93270, "部门名称"),
HrmI18nUtil.getI18nLabel( -93272, "编号"),
HrmI18nUtil.getI18nLabel( -93274, "部门简称"),
HrmI18nUtil.getI18nLabel( -93275, "所属分部"),
HrmI18nUtil.getI18nLabel( -93278, "上级部门"),
HrmI18nUtil.getI18nLabel( -93279, "部门负责人"),
HrmI18nUtil.getI18nLabel( -93280, "启用状态")
};
excelSheetData.add(Arrays.asList(header));
//数据
List<List<Object>> rows = new LinkedList<>();
for (DepartmentListDTO vo : dtoList) {
List<Object> row = new LinkedList<>();
row.add(vo.getDepartmentName());
row.add(vo.getDepartmentCode());
row.add(vo.getDepartmentMark());
row.add(vo.getSubCompanyName());
row.add(vo.getSupDepName());
row.add(vo.getBmfzr());
row.add(vo.getCanceled() == 0 ? "启用" : "未启用");
rows.add(row);
}
excelSheetData.addAll(rows);
return ExcelUtil.genWorkbookV2(excelSheetData, sheetName);
}
}

@ -0,0 +1,238 @@
package com.engine.organization.service.impl;
import com.engine.organization.entity.staff.param.StaffOutParam;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.enums.ModuleTypeEnum;
import com.engine.organization.enums.StaffChangeEnum;
import com.engine.organization.exception.OrganizationRunTimeException;
import com.engine.organization.mapper.staff.StaffMapper;
import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.db.MapperProxyFactory;
import lombok.SneakyThrows;
import org.apache.commons.collections.CollectionUtils;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @Author liang.cheng
* @Date 2023/9/4 10:44 AM
* @Description: function interface
* @Version 1.0
*/
public class FunctionOutStaffServiceImpl {
private static final Integer HARDCONTROLLER = 2;
private static Map<StaffChangeEnum, Function<StaffOutParam, Integer>> affairFunctionS = new HashMap<>();
private StaffMapper staffMapper() {
return MapperProxyFactory.getProxy(StaffMapper.class);
}
FunctionOutStaffServiceImpl(){
affairFunctionS.put(StaffChangeEnum.ADD, this::addStaffNums);
affairFunctionS.put(StaffChangeEnum.REDUCE, this::reduceStaffNums);
affairFunctionS.put(StaffChangeEnum.FROZEN, this::frozenStaffNums);
affairFunctionS.put(StaffChangeEnum.ENTRY, this::entryAdd);
affairFunctionS.put(StaffChangeEnum.DIMISSION, this::dimissionReduce);
affairFunctionS.put(StaffChangeEnum.TRANSFER, this::transfer);
}
private Integer addStaffNums(StaffOutParam param) {
StaffPO staffPO = select(param);
List<Integer> numbers = Arrays.asList(staffPO.getStaffNum(),param.getNum());
int sum = numbers.stream()
.mapToInt(Integer::intValue)
.sum();
staffPO.setStaffNum(sum);
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
private Integer reduceStaffNums(StaffOutParam param) {
StaffPO staffPO = select(param);
List<Integer> numbers = Arrays.asList(staffPO.getStaffNum(),param.getNum());
Integer difference = numbers.stream()
.reduce((a, b) -> a - b)
.orElse(0);
Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum();
if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
OrganizationAssert.isFalse(difference.compareTo(sums) < 0,"存在编制超编风险,请先修改控制策略");
}
staffPO.setStaffNum(difference < 0 ? 0 :difference);
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
private Integer frozenStaffNums(StaffOutParam param) {
StaffPO staffPO = select(param);
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
//1.增加冻结数
Integer sum = numberF.stream()
.mapToInt(Integer::intValue)
.sum();
if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, "冻结数不能大于剩余编制数!");
}
staffPO.setFreezeNum(sum);
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
private Integer entryAdd(StaffOutParam param) {
StaffPO staffPO = select(param);
List<Integer> numbers = Arrays.asList(staffPO.getPermanentNum(),param.getNum());
//1.增加在编数
int sum = numbers.stream()
.mapToInt(Integer::intValue)
.sum();
staffPO.setPermanentNum(sum);
Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum();
//强控策略下不容许超编
if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0,"强控策略下不容许超编");
}
//向上部门 分部在编数调整
upwardReviewSums(param);
//2.调整方式为流程时释放冻结数
if (param.getChangeMode() == 1) {
List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
int difference = numbersF.stream()
.reduce((a, b) -> a - b)
.orElse(0);
staffPO.setFreezeNum(difference);
}
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
private Integer dimissionReduce(StaffOutParam param) {
StaffPO staffPO = select(param);
OrganizationAssert.isFalse(param.getNum().compareTo(staffPO.getPermanentNum()) > 0,"调整数量不可大于在编数");
List<Integer> numbers = Arrays.asList(staffPO.getPermanentNum(),param.getNum());
Integer difference = numbers.stream()
.reduce((a, b) -> a - b)
.orElse(0);
staffPO.setPermanentNum(difference);
//向上部门 分部在编数调整
upwardReviewSums(param);
//2.调整方式为流程时释放冻结数
if (param.getChangeMode() == 1) {
List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
int differenceF = numbersF.stream()
.reduce((a, b) -> a - b)
.orElse(0);
staffPO.setFreezeNum(differenceF);
}
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
private Integer transfer(StaffOutParam param) {
return null;
}
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/6 3:38 PM
* @param: [param]
* @return: void
*/
@SneakyThrows
private void upwardReviewSums(StaffOutParam param){
DepartmentComInfo departmentComInfo = new DepartmentComInfo();
SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
//1.分部
if (param.getCompany() != null) {
String allSupCompany = subCompanyComInfo.getAllSupCompany(String.valueOf(param.getCompany()));
Collection<Integer> subCompanys = new ArrayList<>();
if (param.getDimension().equals(ModuleTypeEnum.departmentfielddefined.getValue()) || param.getDimension().equals(ModuleTypeEnum.jobfielddefined.getValue())){
subCompanys.add(param.getCompany());
}
if (!"".equals(allSupCompany)) {
Collection<Integer> sub = Arrays.stream(allSupCompany.split(","))
.map(Integer::parseInt)
.collect(Collectors.toList());
subCompanys.addAll(sub);
}
List<StaffPO> staffPOS = new ArrayList<>();
if (CollectionUtils.isNotEmpty(subCompanys)) {
staffPOS = staffMapper().selectByEcCompany(subCompanys);
}
if (!CollectionUtils.isEmpty(staffPOS)) {
staffPOS.forEach(item -> {
if (param.getType().getValue() == 3){
item.setPermanentNum(item.getPermanentNum() + param.getNum());
}else {
item.setPermanentNum(item.getPermanentNum() - param.getNum());
}
buildStaffPO(item);
staffMapper().updateStaff(item);
});
}
}
//2.部门
if (param.getDepartment() != null) {
String allSupDepartment = departmentComInfo.getAllSupDepartment(String.valueOf(param.getDepartment()));
Collection<Integer> subDepartments = new ArrayList<>();
if (param.getDimension().equals(ModuleTypeEnum.jobfielddefined.getValue())) {
subDepartments.add(param.getDepartment());
}
if (!"".equals(allSupDepartment)) {
Collection<Integer> sub = Arrays.stream(allSupDepartment.split(","))
.map(Integer::parseInt)
.collect(Collectors.toList());
subDepartments.addAll(sub);
}
List<StaffPO> staffPOS = new ArrayList<>();
if (CollectionUtils.isNotEmpty(subDepartments)) {
staffPOS = staffMapper().selectByEcDepartment(subDepartments);
}
if (!CollectionUtils.isEmpty(staffPOS)) {
staffPOS.forEach(item -> {
if (param.getType().getValue() == 3){
item.setPermanentNum(item.getPermanentNum() + param.getNum());
}else {
item.setPermanentNum(item.getPermanentNum() - param.getNum());
}
buildStaffPO(item);
staffMapper().updateStaff(item);
});
}
}
}
private StaffPO select(StaffOutParam param) {
List<StaffPO> staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob());
OrganizationAssert.notEmpty(staffPO,"未查询到对应编制方案下的组织编制信息!");
return staffPO.get(0);
}
private static void buildStaffPO(StaffPO staffPO) {
List<Integer> number = Arrays.asList(staffPO.getPermanentNum(),staffPO.getFreezeNum());
Integer sums = number.stream()
.mapToInt(Integer::intValue)
.sum();
Integer a = staffPO.getStaffNum();
staffPO.setLackStatus((a.compareTo(sums) < 0) ? 3 : ((a.compareTo(sums) == 0) ? 2 : 1));
}
public Integer actuator(StaffChangeEnum functionEnum,StaffOutParam staffOutParam) {
Function<StaffOutParam, Integer> function = affairFunctionS.get(functionEnum);
return function.apply(staffOutParam);
}
}

@ -69,6 +69,7 @@ import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static weaver.general.Util.getIntValue;
@ -169,25 +170,29 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
List<String> columnList = Arrays.asList(columns.split(","));
BigDecimal decimal = new BigDecimal(100 / columnList.size());
List<SearchConditionItem> all = new ArrayList<>();
for (SearchConditionGroup allCondition : allConditions) {
List<SearchConditionItem> items = allCondition.getItems();
for (SearchConditionItem item : items) {
String columnName = item.getDomkey()[0];
fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
String scopeId = columnName.split("_")[0];
String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
WeaTableColumn weaTableColumn = new WeaTableColumn();
weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId));
weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
weaTableColumn.setOtherpara(columnName);
weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
weaTableColumnList.add(weaTableColumn);
}
all.addAll(allCondition.getItems());
}
List<SearchConditionItem> items = filterByDomkey(all, columnList);
for (SearchConditionItem item : items) {
String columnName = item.getDomkey()[0];
fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
String scopeId = columnName.split("_")[0];
String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
WeaTableColumn weaTableColumn = new WeaTableColumn();
weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId));
weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
weaTableColumn.setOtherpara(columnName);
weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
weaTableColumnList.add(weaTableColumn);
}
// 增加id字段,跳转人员卡片
WeaTableColumn weaTableColumn = new WeaTableColumn();
weaTableColumn.setColumn("id");
@ -211,6 +216,28 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
return apiDatas;
}
private List<SearchConditionItem> filterByDomkey(List<SearchConditionItem> items, List<String> domkeys) {
List<SearchConditionItem> tempResult = items.stream()
.filter(item -> domkeys.contains(item.getDomkey()[0]))
.collect(Collectors.toList());
Map<String, SearchConditionItem> hashMap = new HashMap<>();
for (SearchConditionItem item : tempResult) {
String domkeyElement = item.getDomkey()[0];
hashMap.put(domkeyElement, item);
}
List<SearchConditionItem> resultList = new ArrayList<>();
for (String domkeyElement : domkeys) {
SearchConditionItem item = hashMap.get(domkeyElement);
if (item != null) {
resultList.add(item);
}
}
return resultList;
}
@Override
public Long saveBaseForm(Map<String, Object> params) {
return 0L;

@ -149,7 +149,9 @@ public class JobServiceImpl extends Service implements JobService {
JobPO jobPO = JobBO.convertParamsToPO(param, user.getUID());
boolean filter = isFilter(jobPO);
PageInfo<JobListDTO> pageInfos;
String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams(), " show_order ");
StringBuilder orderType = new StringBuilder("asc");
String orderSql = PageInfoSortUtil.getSortSql(orderType, param.getSortParams(), " show_order ");
orderSql = orderSql.replace("showOrder", "show_order");
List<JobListDTO> allList = getJobMapper().listNoFilter(orderSql);
new DetachUtil(user).filterJobDTOList(allList);
// 通过子级遍历父级元素
@ -159,6 +161,12 @@ public class JobServiceImpl extends Service implements JobService {
new DetachUtil(user).filterJobDTOList(allList);
// 添加父级元素
List<JobListDTO> jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs);
if ("asc".equalsIgnoreCase(orderType.toString())) {
jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList());
} else {
jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
}
List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
pageInfos = new PageInfo<>(subList, JobListDTO.class);
pageInfos.setTotal(jobListDTOS.size());
@ -637,7 +645,7 @@ public class JobServiceImpl extends Service implements JobService {
* @param departmentPO
* @param builderDeparts
*/
private void buildParentDepts(DepartmentPO departmentPO, Set<DepartmentPO> builderDeparts,Map<Integer, DepartmentPO> departmentPOMap) {
private void buildParentDepts(DepartmentPO departmentPO, Set<DepartmentPO> builderDeparts, Map<Integer, DepartmentPO> departmentPOMap) {
builderDeparts.add(departmentPO);
if (SearchTreeUtil.isTop(departmentPO.getSupDepId())) {
return;
@ -710,7 +718,7 @@ public class JobServiceImpl extends Service implements JobService {
new DetachUtil(user).filterCompanyList(filterComps);
Set<DepartmentPO> builderDeparts = new HashSet<>();
for (DepartmentPO departmentPO : filterDeparts) {
buildParentDepts(departmentPO, builderDeparts,departmentPOMap);
buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
}
List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts));
// 添加部门的上级分部

@ -58,39 +58,27 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("companyname", rs.getString("companyname"));
fclasslist.add(item);
}
String sql = "select id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) ";
// 分部分权过滤
DetachUtil detachUtil = new DetachUtil(user);
if (detachUtil.isDETACH()) {
String jclRoleLevels = detachUtil.getJclRoleLevels();
if (StringUtils.isNotBlank(jclRoleLevels)) {
sql = "select id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid in(" + jclRoleLevels + "))) ";
} else {
sql = "select id, fnumber, fname, ftype from jcl_org_map where ftype = 0 ";
}
}
rs.executeQuery(sql + " and fdateend > " + DBType.get(new RecordSet().getDBType()).currentDate() + " order by ftype , id,fdateend desc ");
Set<OrgSelectItem> companySet = new HashSet<>();
int ckey = 0;
while (rs.next()) {
OrgSelectItem item = new OrgSelectItem();
item.setKey(ckey++);
item.setId(rs.getString("id"));
item.setFnumber(rs.getString("fnumber"));
item.setFname(rs.getString("fname"));
companySet.add(item);
List<CompanyTreePO> companyTree = new ArrayList<>();
String sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = '0'";
// 一级分部数据分权处理
String dimension = Util.null2String(request2Map.get("fclass"));
//版本id
String id = Util.null2String(request2Map.get("id"));
boolean isRealDimension = StringUtils.isBlank(dimension) || "0".equals(dimension);
boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id);
if (isRealTime && user.getUID() != 1 && isRealDimension) {
DetachUtil detachUtil = new DetachUtil(user);
String ids = detachUtil.getJclRoleLevels();
sql = sql + " and id in ("+ids+")";
}
List<CompanyTreePO> companyTree = new ArrayList<>();
sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = '0'";
rs.executeQuery(sql);
while (rs.next()) {
companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf("select id from hrmsubcompany where (canceled is null or canceled != '1') and supsubcomid = ?", rs.getString("id"))).build());
}
result.put("api_status", true);
result.put("fclasslist", fclasslist);
result.put("companylist", companySet);
result.put("companyTree", companyTree);
return result;
}
@ -112,6 +100,13 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
String sql;
if (isSearchCurrent) {
sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = ? ";
boolean isRealDimension = StringUtils.isBlank(fclass) || "0".equals(fclass);
boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id);
if (isRealTime && user.getUID() != 1 && isRealDimension) {
DetachUtil detachUtil = new DetachUtil(user);
String ids = detachUtil.getJclRoleLevels();
sql = sql + " and id in ("+ids+")";
}
if (StringUtils.isNotBlank(fclass) && !"0".equals(fclass)) {
sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompanyvirtual where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = ? and companyid = '" + fclass + "'";
}

@ -0,0 +1,43 @@
package com.engine.organization.service.impl;
import com.engine.core.impl.Service;
import com.engine.organization.entity.staff.param.StaffOutParam;
import com.engine.organization.service.StaffOutService;
import com.engine.organization.util.OrganizationAssert;
/**
* @Author liang.cheng
* @Date 2023/9/1 10:27 AM
* @Description:
* @Version 1.0
*/
public class StaffOutServiceImpl extends Service implements StaffOutService {
@Override
public Integer changeStaff(StaffOutParam staffOutParam) {
OrganizationAssert.notNull(staffOutParam.getNum(),"调整数量不能为空!");
OrganizationAssert.notNull(staffOutParam.getPlanId(),"未指定所属编制方案!");
FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl();
buildStaffOutParam(staffOutParam);
return functionFactory.actuator(staffOutParam.getType(), staffOutParam);
}
@Override
public Integer transactionOnJob(StaffOutParam staffOutParam) {
FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl();
buildStaffOutParam(staffOutParam);
return functionFactory.actuator(staffOutParam.getType(), staffOutParam);
}
private void buildStaffOutParam(StaffOutParam param) {
if (param.getCompany() != null && param.getDepartment() != null && param.getJob() != null) {
param.setDimension(3);
}else if(param.getCompany() != null && param.getDepartment() != null) {
param.setDimension(2);
}else if (param.getCompany() != null) {
param.setDimension(1);
}
}
}

@ -10,6 +10,7 @@ import com.engine.organization.entity.staff.bo.StaffPlanBO;
import com.engine.organization.entity.staff.param.StaffPlanSearchParam;
import com.engine.organization.entity.staff.po.StaffPlanPO;
import com.engine.organization.entity.staff.vo.StaffPlanTableVO;
import com.engine.organization.exception.OrganizationRunTimeException;
import com.engine.organization.mapper.staff.StaffPlanMapper;
import com.engine.organization.service.StaffPlanService;
import com.engine.organization.util.*;
@ -73,6 +74,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
Date startDate = DateUtil.parseToDate(timeStart);
Date endDate = DateUtil.parseToDate(timeEnd);
OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后");
List<StaffPlanPO> staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
OrganizationAssert.isEmpty(staffPlanPO1,"同一维度下,相同适用公司编制方案的时间段不允许出现交叉");
return getStaffPlanMapper().insertIgnoreNull(staffPlanPO);
}
@ -92,6 +95,10 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
Date startDate = DateUtil.parseToDate(timeStart);
Date endDate = DateUtil.parseToDate(timeEnd);
OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后");
List<StaffPlanPO> staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
if (staffPlanPO1.size() > 1) {
throw new OrganizationRunTimeException("同一维度下,相同适用公司编制方案已存在");
}
// 多选赋值
staffPlanPO.setCompanyId(staffPlanPO.getEcCompany());
return getStaffPlanMapper().updateStaffPlan(staffPlanPO);

@ -13,11 +13,13 @@ import com.engine.organization.entity.browser.po.CustomBrowserBean;
import com.engine.organization.entity.department.po.DepartmentPO;
import com.engine.organization.entity.job.po.JobPO;
import com.engine.organization.entity.staff.bo.StaffBO;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.param.StaffParams;
import com.engine.organization.entity.staff.param.StaffSerachParam;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.entity.staff.po.StaffPlanPO;
import com.engine.organization.entity.staff.po.StaffsPO;
import com.engine.organization.entity.staff.vo.StaffTableVO;
import com.engine.organization.exception.OrganizationRunTimeException;
import com.engine.organization.mapper.department.DepartmentMapper;
import com.engine.organization.mapper.job.JobMapper;
import com.engine.organization.mapper.staff.StaffMapper;
@ -29,6 +31,7 @@ import com.engine.organization.util.browser.OrganizationBrowserUtil;
import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.excel.ExcelUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import weaver.conn.RecordSet;
@ -36,6 +39,8 @@ import weaver.general.BaseBean;
import weaver.general.GCONST;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
import java.io.File;
import java.io.FileOutputStream;
@ -52,6 +57,8 @@ public class StaffServiceImpl extends Service implements StaffService {
private static final String RIGHT_NAME = "Staff:All";
private static final Integer HARDCONTROLLER = 2;
private StaffMapper getStaffMapper() {
return MapperProxyFactory.getProxy(StaffMapper.class);
}
@ -104,7 +111,7 @@ public class StaffServiceImpl extends Service implements StaffService {
@Override
public Map<String, Object> listPage(StaffSearchParam params) {
public Map<String, Object> listPage(StaffSerachParam params) {
Map<String, Object> resultMap = new HashMap<>();
boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
resultMap.put("hasRight", hasRight);
@ -124,13 +131,15 @@ public class StaffServiceImpl extends Service implements StaffService {
}
@Override
public int saveStaff(StaffSearchParam param) {
public int saveStaff(StaffParams param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
OrganizationAssert.isFalse(staffPO.getStaffNum() < 0, "编制数不可小于0请更正");
List<StaffPO> verify = getStaffMapper().customSelect(param.getPlanId(), param.getEcCompany(), param.getEcDepartment(), param.getJobId());
if (!verify.isEmpty()) {
throw new OrganizationRunTimeException("同一编制方案下,同一维度的编制信息不可重复创建!");
}
checkRequired(staffPO);
int ignoreNull = getStaffMapper().insertIgnoreNull(staffPO);
// 初始化编制在编数
initStaffInfo(staffPO);
@ -138,13 +147,16 @@ public class StaffServiceImpl extends Service implements StaffService {
}
@Override
public int updateStaff(StaffSearchParam param) {
public int updateStaff(StaffParams param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
List<StaffPO> verify = getStaffMapper().customSelect(param.getPlanId(), param.getEcCompany(), param.getEcDepartment(), param.getJobId());
if (verify.size() > 1) {
throw new OrganizationRunTimeException("同一编制方案下,同一维度的编制信息已存在!");
}
StaffPO staffByID = getStaffMapper().getStaffByID(param.getId());
StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
staffPO.setPermanentNum(staffByID.getPermanentNum());
staffPO.setFreezeNum(staffByID.getFreezeNum());
checkRequired(staffPO);
Integer changeNum = param.getChangeNum();
@ -162,6 +174,9 @@ public class StaffServiceImpl extends Service implements StaffService {
}
OrganizationAssert.isFalse(staffPO.getStaffNum() < 0, "调整后编制数小于0请更正");
StaffBO.buildStaffDesc(staffPO);
if (staffPO.getControlPolicy().equals(HARDCONTROLLER) && staffPO.getStaffNum() < (staffPO.getPermanentNum() + staffPO.getFreezeNum())){
throw new OrganizationRunTimeException("存在编制超编风险,请先修改控制策略");
}
// 更新主表
int updateStaff = getStaffMapper().updateStaff(staffPO);
// 同步组织架构图编制信息
@ -240,6 +255,8 @@ public class StaffServiceImpl extends Service implements StaffService {
// 方案
SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "方案", "161", "planId", "staffPlanBrowser");
planIdItem.setRules("required|string");
planIdItem.setIsQuickSearch(false);
planIdItem.setEntSearch(false);
// 分部
SearchConditionItem ecCompanyItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "164", "ecCompany", "compBrowser");
// 部门
@ -271,12 +288,13 @@ public class StaffServiceImpl extends Service implements StaffService {
controlPolicyItem.setRules("required|string");
SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "描述说明", "description");
StaffPlanPO staffPlanPO = new StaffPlanPO();
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
StaffPO staffPO = getStaffMapper().getStaffByID(Integer.parseInt(id));
OrganizationAssert.notNull(staffPO, "选择的数据不存在,或数据已删除");
staffPlanPO = getStaffPlanMapper().getStaffPlanByID(staffPO.getPlanId());
BrowserBean planIdItemBean = planIdItem.getBrowserConditionParam();
List<Map<String, Object>> planIdMaps = getStaffPlanMapper().listPlansByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds());
@ -303,9 +321,16 @@ public class StaffServiceImpl extends Service implements StaffService {
descriptionItem.setValue(staffPO.getDescription());
}
selectItems.add(planIdItem);
selectItems.add(ecCompanyItem);
selectItems.add(ecDepartmentItem);
selectItems.add(jobIdItem);
if (StringUtil.isEmpty(id) || "1".equals(staffPlanPO.getControlDimension())) {
selectItems.add(ecCompanyItem);
}
if (StringUtil.isEmpty(id) || "2".equals(staffPlanPO.getControlDimension())) {
selectItems.add(ecDepartmentItem);
}
if (StringUtil.isEmpty(id) || "3".equals(staffPlanPO.getControlDimension())) {
selectItems.add(jobIdItem);
}
selectItems.add(staffNumItem);
selectItems.add(controlPolicyItem);
selectItems.add(descriptionItem);
@ -338,7 +363,7 @@ public class StaffServiceImpl extends Service implements StaffService {
List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
// 方案
SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, "编制方案", "161", "planId", "staffPlanBrowser");
SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, "编制方案", "162", "planId", "staffPlanBrowser");
planIdItem.setRules("required|string");
planIdItem.setHelpfulTip("请选择编制方案后查看数据");
planIdItem.setLabelcol(2);
@ -355,13 +380,13 @@ public class StaffServiceImpl extends Service implements StaffService {
* @param param
* @return
*/
private String buildSqlWhere(StaffSearchParam param) {
private String buildSqlWhere(StaffSerachParam param) {
DBType dbType = DBType.get(new RecordSet().getDBType());
String sqlWhere = " where t.delete_type ='0' ";
Long planId = param.getPlanId();
if (null != planId) {
sqlWhere += " AND t.plan_id = '" + planId + "'";
String planId = param.getPlanId();
if (!"".equals(planId)) {
sqlWhere += " AND t.plan_id in (" + planId + ")";
} else {
sqlWhere = " where 1 = 2 ";
}
@ -381,7 +406,7 @@ public class StaffServiceImpl extends Service implements StaffService {
if (null != ecDepartment) {
sqlWhere += " AND t.ec_department = '" + ecDepartment + "'";
}
Long jobId = param.getJobId();
Integer jobId = param.getJobId();
if (null != jobId) {
sqlWhere += " AND t.job_id = '" + jobId + "'";
}
@ -445,7 +470,7 @@ public class StaffServiceImpl extends Service implements StaffService {
break;
case "3": // 岗位
OrganizationAssert.notNull(staffPO.getJobId(), "编制维度选择岗位时,岗位必填!");
JobPO jobById = getJobMapper().getJobById(staffPO.getJobId());
JobPO jobById = getJobMapper().getJobById(Long.valueOf(staffPO.getJobId()));
if (null != jobById) {
staffPO.setDeptId(jobById.getEcDepartment());
staffPO.setEcDepartment(jobById.getEcDepartment());
@ -464,22 +489,39 @@ public class StaffServiceImpl extends Service implements StaffService {
* @param staffPO
*/
public static void initStaffInfo(StaffPO staffPO) {
boolean hasDepartment = null != staffPO.getEcDepartment() && 0 != staffPO.getEcDepartment();
boolean hasJob = null != staffPO.getJobId() && 0 != staffPO.getJobId();
RecordSet rs = new RecordSet();
String sql = "select count(1) as num from hrmresource where STATUS < 4";
if (null != staffPO.getEcCompany() && 0 != staffPO.getEcCompany()) {
sql += " and subcompanyid1 = " + staffPO.getEcCompany();
ArrayList<String> subCompanyList = new ArrayList<>();
subCompanyList.add(staffPO.getEcCompany().toString());
if (!hasJob && !hasDepartment) {
new SubCompanyComInfo().getSubCompanyLists(staffPO.getEcCompany().toString(), subCompanyList);
}
sql += " and subcompanyid1 in (" + StringUtils.join(subCompanyList, ",") + ")";
}
if (null != staffPO.getEcDepartment() && 0 != staffPO.getEcDepartment()) {
sql += " and departmentid = " + staffPO.getEcDepartment();
if (hasDepartment) {
ArrayList<String> departmentList = new ArrayList<>();
departmentList.add(staffPO.getEcDepartment().toString());
if (!hasJob) {
new DepartmentComInfo().getAllChildDeptByDepId(departmentList, staffPO.getEcDepartment().toString());
}
sql += " and departmentid in (" + StringUtils.join(departmentList, ",") + ")";
}
if (null != staffPO.getJobId() && 0 != staffPO.getJobId()) {
JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(staffPO.getJobId());
if (hasJob) {
JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(Long.valueOf(staffPO.getJobId()));
if (null == jobById) {
return;
}
Integer ecJobTitle = jobById.getEcJobTitle();
sql += " and jobtitle = " + ecJobTitle;
}
if ("false".equals(new BaseBean().getPropValue("hrmOrganization","accountType"))) {
sql += " and accounttype != 1";
}
rs.executeQuery(sql);
if (rs.next()) {
staffPO.setPermanentNum(-1 == rs.getInt("num") ? 0 : rs.getInt("num"));

@ -18,8 +18,11 @@ public class DepartmentTransMethod {
public static String getSpanById(String planId) {
DepartmentMapper departmentMapper = MapperProxyFactory.getProxy(DepartmentMapper.class);
List<Map<String, Object>> maps = departmentMapper.listDeptsByIds(DeleteParam.builder().ids(planId).build().getIds());
String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(","));
String names = "/";
if (!"".equals(planId)) {
List<Map<String, Object>> maps = departmentMapper.listDeptsByIds(DeleteParam.builder().ids(planId).build().getIds());
names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(","));
}
return names;
}
}

@ -23,10 +23,8 @@ public class HrmResourceTransMethod {
User user = new User();
user.setUid(1);
try {
if (hfm.isBaseField(fieldName)) {
if ("jobactivity".equals(fieldName)) {
hrmFieldConf.put("type", 282);
}
if (hfm.isBaseField(fieldName) && "jobactivity".equals(fieldName)) {
hrmFieldConf.put("type", 282);
}
return hfm.getFieldvalue(null, user, null, hrmFieldConf.getString("dmlurl"), hrmFieldConf.getInt("id"), hrmFieldConf.getInt("fieldhtmltype"), hrmFieldConf.getInt("type"), id, 0, fieldName);
} catch (Exception e) {

@ -23,8 +23,12 @@ public class JobTransMethod {
public static String getSpanById(String jobId) {
JobMapper jobMapper = MapperProxyFactory.getProxy(JobMapper.class);
List<JobPO> jobsByIds = jobMapper.getJobsByIds(DeleteParam.builder().ids(jobId).build().getIds());
return jobsByIds.stream().map(JobPO::getJobTitleName).collect(Collectors.joining(","));
String names = "/";
if (!"".equals(jobId)) {
List<JobPO> jobsByIds = jobMapper.getJobsByIds(DeleteParam.builder().ids(jobId).build().getIds());
names = jobsByIds.stream().map(JobPO::getJobTitleName).collect(Collectors.joining(","));
}
return names;
}
public static String getLevelName(String levelId) {

@ -1,6 +1,7 @@
package com.engine.organization.transmethod;
import com.engine.organization.entity.DeleteParam;
import com.engine.organization.enums.ModuleTypeEnum;
import com.engine.organization.mapper.staff.StaffPlanMapper;
import com.engine.organization.util.db.MapperProxyFactory;
import org.apache.commons.lang3.StringUtils;
@ -30,4 +31,16 @@ public class StaffPlanTransMethod {
}
return "";
}
public static String getControlDimension(String controlDimension) {
if (!"".equals(controlDimension)) {
for (ModuleTypeEnum myEnum : ModuleTypeEnum.values()) {
if (myEnum.getValue() == Integer.parseInt(controlDimension)) {
return myEnum.getDefaultLabel();
}
}
}
return "/";
}
}

@ -7,6 +7,7 @@ package com.engine.organization.transmethod;
* @version: 1.0
*/
public class StaffTransMethod {
public static String getLackSpan(String lackStatus) {
String lackSpan = "";
switch (lackStatus) {
@ -25,4 +26,5 @@ public class StaffTransMethod {
}
return lackSpan;
}
}

@ -0,0 +1,31 @@
package com.engine.organization.util;
import java.util.ArrayList;
import java.util.List;
/**
* @Author liang.cheng
* @Date 2023/9/13 2:46 PM
* @Description:
* @Version 1.0
*/
public class OrganizationCommonUtil {
/**
* @Description:
* @Author: liang.cheng
* @Date: 2023/9/13 2:46 PM
* @param: [list, batchSize]
* @return: java.util.List<java.util.List<T>>
*/
public static <T> List<List<T>> splitList(List<T> list, int batchSize) {
List<List<T>> splittedLists = new ArrayList<>();
for (int i = 0; i < list.size(); i += batchSize) {
int endIndex = Math.min(i + batchSize, list.size());
List<T> subList = list.subList(i, endIndex);
splittedLists.add(subList);
}
return splittedLists;
}
}

@ -32,6 +32,8 @@ public class OrganizationDateUtil {
public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
public static final String MONTH_FORMATTER_PATTERN = "yyyy-MM";
public static final String FORMYEAR_PATTERN = "yyyy";
public static final String DATE_FORMATTER_PATTERN = "yyyy-MM-dd";
public static final String DATE_TIME_FORMATTER_PATTERN = "yyyy-MM-dd HH:mm:ss";
/**
@ -80,6 +82,19 @@ public class OrganizationDateUtil {
}
}
public static String getFormatYear(Date localDate) {
if (localDate == null) {
return StringUtils.EMPTY;
}
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(FORMYEAR_PATTERN);
return simpleDateFormat.format(localDate);
} catch (Exception e) {
log.warn("格式化日期错误", e);
return StringUtils.EMPTY;
}
}
public static String getFormatYearMonth(Date localDate) {
if (localDate == null) {

@ -20,6 +20,18 @@ public class PageInfoSortUtil {
* @param sortParams
* @return
*/
public static String getSortSql(StringBuilder orderType, String sortParams, String defaultOrder) {
JSONArray jsonArray = JSONObject.parseArray(sortParams);
if (CollectionUtils.isNotEmpty(jsonArray)) {
JSONObject jsonObject = (JSONObject) jsonArray.get(0);
String orderKey = jsonObject.getString("orderkey");
String sortOrder = jsonObject.getString("sortOrder").replace("end", "");
orderType.replace(0, orderType.length(), sortOrder);
return "t." + orderKey + " " + sortOrder;
}
return defaultOrder;
}
public static String getSortSql(String sortParams, String defaultOrder) {
JSONArray jsonArray = JSONObject.parseArray(sortParams);
if (CollectionUtils.isNotEmpty(jsonArray)) {

@ -7,7 +7,7 @@ import com.engine.organization.entity.extend.po.ExtendInfoPO;
import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
import com.engine.organization.entity.job.po.JobPO;
import com.engine.organization.entity.staff.bo.StaffBO;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.param.StaffParams;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.entity.staff.po.StaffPlanPO;
import com.engine.organization.mapper.comp.CompMapper;
@ -239,7 +239,7 @@ public class StaffInfoImportUtil {
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue;
}
StaffSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), StaffSearchParam.class);
StaffParams param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), StaffParams.class);
String controlDimension = staffPlanPO.getControlDimension();
String checkMsg = "";
switch (controlDimension) {
@ -285,17 +285,21 @@ public class StaffInfoImportUtil {
checkMsg = "编制方案数据有误,请确认";
break;
}
StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
if (null == staffPO.getControlPolicy()) {
staffPO.setControlPolicy(1);
}
List<StaffPO> verify = MapperProxyFactory.getProxy(StaffMapper.class).customSelect(param.getPlanId(), param.getEcCompany(), param.getEcDepartment(), param.getJobId());
if (!verify.isEmpty()) {
checkMsg = "同一编制方案下,同一维度的编制信息不可重复创建!";
}
if (StringUtils.isNotBlank(checkMsg)) {
historyDetailPO.setOperateDetail(checkMsg);
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue;
}
StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
if (null == staffPO.getControlPolicy()) {
staffPO.setControlPolicy(1);
}
MapperProxyFactory.getProxy(StaffMapper.class).insertIgnoreNull(staffPO);
// 初始化编制信息
StaffServiceImpl.initStaffInfo(staffPO);
@ -312,11 +316,11 @@ public class StaffInfoImportUtil {
public static List<Map<String, Object>> importForm(User user) {
// 返回导入数据
List<Map<String, Object>> lsGroup = new ArrayList<>();
Map<String, Object> groupItem = new HashMap<>();
Map<String, Object> groupItem = new HashMap<>(3);
List<Object> itemList = new ArrayList<>();
groupItem.put("title", SystemEnv.getHtmlLabelName(33803, Util.getIntValue(user.getLanguage())));
groupItem.put("defaultshow", true);
List<Integer> lsPromptLabel = new ArrayList<>(); //提示信息
List<Integer> lsPromptLabel = new ArrayList<>();
lsPromptLabel.add(34275);
lsPromptLabel.add(125452);

@ -57,6 +57,31 @@ public class ExportCommonController {
}
@GET
@Path("/department/export")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response departmentExport(@Context HttpServletRequest request, @Context HttpServletResponse response) {
User user = HrmUserVarify.getUser(request, response);
XSSFWorkbook workbook = getExportCommonWrapper(user).departmentExport();
String time = LocalDate.now().toString();
String fileName = "部门导出" + time;
try {
fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
StreamingOutput output = outputStream -> {
workbook.write(outputStream);
outputStream.flush();
};
response.setContentType("application/octet-stream");
return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
}
private HrmResourceSearchParam buildResourceParam(HttpServletRequest request) {
HrmResourceSearchParam param = new HrmResourceSearchParam();

@ -3,14 +3,17 @@ package com.engine.organization.web;
import com.alibaba.fastjson.JSONObject;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.chart.params.StatisticsParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.OrgChartWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
@ -209,7 +212,7 @@ public class OrgChartController {
@Produces(MediaType.APPLICATION_JSON)
public String getUserData(@Context HttpServletRequest request, @Context HttpServletResponse
response) {
Map<String, Object> apidatas = new HashMap<String, Object>();
Map<String, Object> apidatas = new HashMap<>();
try {
User user = HrmUserVarify.getUser(request, response);
//实例化Service 并调用业务类处理
@ -232,7 +235,7 @@ public class OrgChartController {
@Produces(MediaType.APPLICATION_JSON)
public String asyncUserData(@Context HttpServletRequest request, @Context HttpServletResponse
response) {
Map<String, Object> apidatas = new HashMap<String, Object>();
Map<String, Object> apidatas = new HashMap<>();
try {
User user = HrmUserVarify.getUser(request, response);
//实例化Service 并调用业务类处理
@ -255,7 +258,7 @@ public class OrgChartController {
@Produces(MediaType.APPLICATION_JSON)
public String asyncCompanyData(@Context HttpServletRequest request, @Context HttpServletResponse
response) {
Map<String, Object> apidatas = new HashMap<String, Object>();
Map<String, Object> apidatas = new HashMap<>();
try {
User user = HrmUserVarify.getUser(request, response);
//实例化Service 并调用业务类处理
@ -287,4 +290,33 @@ public class OrgChartController {
}
}
@GET
@Path("/selectStatistics")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult selectStatistics(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> params = ParamUtil.request2Map(request);
return ReturnResult.successed(getOrgChartWrapper(user).selectStatistics(params));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
@POST
@Path("/recordStatistics")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult recordStatistics(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StatisticsParam statisticsParam) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getOrgChartWrapper(user).recordStatistics(statisticsParam));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
}

@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.DeleteParam;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.param.StaffParams;
import com.engine.organization.entity.staff.param.StaffSerachParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.StaffWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
@ -47,7 +48,7 @@ public class StaffController {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
StaffSearchParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffSearchParam.class);
StaffSerachParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffSerachParam.class);
return ReturnResult.successed(getStaffWrapper(user).listPage(param));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
@ -64,7 +65,7 @@ public class StaffController {
@POST
@Path("/saveStaff")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult saveStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffSearchParam param) {
public ReturnResult saveStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffParams param) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getStaffWrapper(user).saveStaff(param));
@ -84,7 +85,7 @@ public class StaffController {
@POST
@Path("/updateStaff")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult updateStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffSearchParam param) {
public ReturnResult updateStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffParams param) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getStaffWrapper(user).updateStaff(param));

@ -0,0 +1,57 @@
package com.engine.organization.web;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.staff.param.StaffOutParam;
import com.engine.organization.service.StaffOutService;
import com.engine.organization.service.impl.StaffOutServiceImpl;
import com.engine.organization.util.response.ReturnResult;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
/**
* @Author liang.cheng
* @Date 2023/9/1 10:19 AM
* @Description:
* @Version 1.0
*/
public class StaffOutController {
public StaffOutService staffOutService(User user) {
return ServiceUtil.getService(StaffOutServiceImpl.class, user);
}
@POST
@Path("/change")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(staffOutService(user).changeStaff(staffOutParam));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
@POST
@Path("/transaction")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(staffOutService(user).transactionOnJob(staffOutParam));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
}

@ -30,4 +30,8 @@ public class ExportCommonWrapper extends Service {
public XSSFWorkbook resourceExport(HttpServletRequest request, HttpServletResponse response, String ids) {
return getExportCommonService(user).resourceExport(request, response, ids);
}
public XSSFWorkbook departmentExport() {
return getExportCommonService(user).departmentExport();
}
}

@ -2,6 +2,7 @@ package com.engine.organization.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.entity.chart.params.StatisticsParam;
import com.engine.organization.service.ChartService;
import com.engine.organization.service.OrgChartService;
import com.engine.organization.service.impl.ChartServiceImpl;
@ -80,4 +81,12 @@ public class OrgChartWrapper extends Service {
public Map<String, Object> getFullSelectTree(Map<String, Object> request2Map, User user) {
return getChartService(user).getFullSelectTree(request2Map);
}
public Map<String, Object> selectStatistics(Map<String, Object> request2Map) {
return getChartService(user).selectStatistics(request2Map);
}
public Map<String, Object> recordStatistics(StatisticsParam param) {
return getChartService(user).recordStatistics(param);
}
}

@ -3,7 +3,8 @@ package com.engine.organization.wrapper;
import com.alibaba.fastjson.JSON;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.annotation.Log;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.param.StaffSerachParam;
import com.engine.organization.entity.staff.param.StaffParams;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.entity.staff.po.StaffPlanPO;
import com.engine.organization.enums.LogModuleNameEnum;
@ -12,7 +13,6 @@ import com.engine.organization.mapper.staff.StaffMapper;
import com.engine.organization.mapper.staff.StaffPlanMapper;
import com.engine.organization.service.StaffService;
import com.engine.organization.service.impl.StaffServiceImpl;
import com.engine.organization.util.MenuBtn;
import com.engine.organization.util.OrganizationWrapper;
import com.engine.organization.util.db.MapperProxyFactory;
import weaver.hrm.User;
@ -47,7 +47,7 @@ public class StaffWrapper extends OrganizationWrapper {
* @param params
* @return
*/
public Map<String, Object> listPage(StaffSearchParam params) {
public Map<String, Object> listPage(StaffSerachParam params) {
return getStaffService(user).listPage(params);
}
@ -58,7 +58,7 @@ public class StaffWrapper extends OrganizationWrapper {
* @return
*/
@Log(operateType = OperateTypeEnum.ADD, operateModule = LogModuleNameEnum.STAFF, operateDesc = "新增编制上报")
public int saveStaff(StaffSearchParam param) {
public int saveStaff(StaffParams param) {
int saveStaff = getStaffService(user).saveStaff(param);
writeOperateLog(new Object() {
}.getClass(), getStaffPlanMapper().getStaffPlanByID(param.getPlanId()).getPlanName(), JSON.toJSONString(param), "新增编制上报");
@ -72,7 +72,7 @@ public class StaffWrapper extends OrganizationWrapper {
* @return
*/
@Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.STAFF, operateDesc = "更新编制上报")
public int updateStaff(StaffSearchParam param) {
public int updateStaff(StaffParams param) {
StaffPO staffByID = getStaffMapper().getStaffByID(param.getId());
int updateStaff = getStaffService(user).updateStaff(param);
writeOperateLog(new Object() {

@ -0,0 +1,42 @@
package weaver.interfaces.organization.cronjob;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.chart.params.StatisticsParam;
import com.engine.organization.service.ChartService;
import com.engine.organization.service.impl.ChartServiceImpl;
import org.apache.commons.lang3.StringUtils;
import weaver.hrm.User;
import weaver.interfaces.schedule.BaseCronJob;
/**
* @Author liang.cheng
* @Date 2023/9/14 9:20 AM
* @Description:
* @Version 1.0
*/
public class StatisticsPersonCron extends BaseCronJob {
private ChartService getChartService(User user) {
return ServiceUtil.getService(ChartServiceImpl.class, user);
}
private String companyId;
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
@Override
public void execute() {
Integer value = StringUtils.isNotBlank(companyId) ? Integer.parseInt(companyId) : null;
StatisticsParam build = StatisticsParam.builder().companyId(value).build();
User user = new User();
user.setUid(1);
getChartService(user).recordStatistics(build);
}
}
Loading…
Cancel
Save