diff --git a/docs/sqlupgrade/DM/sql202212120503.sql b/docs/sqlupgrade/DM/sql202212120503.sql index 4e301984..239ebe4f 100644 --- a/docs/sqlupgrade/DM/sql202212120503.sql +++ b/docs/sqlupgrade/DM/sql202212120503.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/DM/sql202308170203.sql b/docs/sqlupgrade/DM/sql202308170203.sql new file mode 100644 index 00000000..569916ea --- /dev/null +++ b/docs/sqlupgrade/DM/sql202308170203.sql @@ -0,0 +1,3 @@ +ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER; +/ + diff --git a/docs/sqlupgrade/DM/sql202308210602.sql b/docs/sqlupgrade/DM/sql202308210602.sql new file mode 100644 index 00000000..6f5dd24b --- /dev/null +++ b/docs/sqlupgrade/DM/sql202308210602.sql @@ -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; +/ \ No newline at end of file diff --git a/docs/sqlupgrade/GS/sql202212120503.sql b/docs/sqlupgrade/GS/sql202212120503.sql index 4e301984..239ebe4f 100644 --- a/docs/sqlupgrade/GS/sql202212120503.sql +++ b/docs/sqlupgrade/GS/sql202212120503.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/GS/sql202307100103.sql b/docs/sqlupgrade/GS/sql202307100103.sql index c759a6ed..95be1b08 100644 --- a/docs/sqlupgrade/GS/sql202307100103.sql +++ b/docs/sqlupgrade/GS/sql202307100103.sql @@ -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 ,'快捷搜索自定義' 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 ,'組織快速調整' 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; / \ No newline at end of file diff --git a/docs/sqlupgrade/GS/sql202308170203.sql b/docs/sqlupgrade/GS/sql202308170203.sql new file mode 100644 index 00000000..569916ea --- /dev/null +++ b/docs/sqlupgrade/GS/sql202308170203.sql @@ -0,0 +1,3 @@ +ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER; +/ + diff --git a/docs/sqlupgrade/GS/sql202308210602.sql b/docs/sqlupgrade/GS/sql202308210602.sql new file mode 100644 index 00000000..18f5d47b --- /dev/null +++ b/docs/sqlupgrade/GS/sql202308210602.sql @@ -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; +/ \ No newline at end of file diff --git a/docs/sqlupgrade/JC/sql202212120503.sql b/docs/sqlupgrade/JC/sql202212120503.sql index 549d7f16..239ebe4f 100644 --- a/docs/sqlupgrade/JC/sql202212120503.sql +++ b/docs/sqlupgrade/JC/sql202212120503.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/JC/sql202308170203.sql b/docs/sqlupgrade/JC/sql202308170203.sql new file mode 100644 index 00000000..569916ea --- /dev/null +++ b/docs/sqlupgrade/JC/sql202308170203.sql @@ -0,0 +1,3 @@ +ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER; +/ + diff --git a/docs/sqlupgrade/JC/sql202308210602.sql b/docs/sqlupgrade/JC/sql202308210602.sql new file mode 100644 index 00000000..4f13bb8c --- /dev/null +++ b/docs/sqlupgrade/JC/sql202308210602.sql @@ -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; +/ \ No newline at end of file diff --git a/docs/sqlupgrade/Mysql/sql202212120503.sql b/docs/sqlupgrade/Mysql/sql202212120503.sql index 502aeceb..9c9e3bd6 100644 --- a/docs/sqlupgrade/Mysql/sql202212120503.sql +++ b/docs/sqlupgrade/Mysql/sql202212120503.sql @@ -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; \ No newline at end of file +update jcl_org_cardbutton set name = '详细信息', url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${id}' where id = 1; \ No newline at end of file diff --git a/docs/sqlupgrade/Mysql/sql202308170203.sql b/docs/sqlupgrade/Mysql/sql202308170203.sql new file mode 100644 index 00000000..1e4d37ad --- /dev/null +++ b/docs/sqlupgrade/Mysql/sql202308170203.sql @@ -0,0 +1 @@ +alter table jcl_org_scheme add subcompanyid int; \ No newline at end of file diff --git a/docs/sqlupgrade/Mysql/sql202308210602.sql b/docs/sqlupgrade/Mysql/sql202308210602.sql new file mode 100644 index 00000000..10236f50 --- /dev/null +++ b/docs/sqlupgrade/Mysql/sql202308210602.sql @@ -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; \ No newline at end of file diff --git a/docs/sqlupgrade/Oracle/sql202212120503.sql b/docs/sqlupgrade/Oracle/sql202212120503.sql index d9a8dce8..6ba8cd4d 100644 --- a/docs/sqlupgrade/Oracle/sql202212120503.sql +++ b/docs/sqlupgrade/Oracle/sql202212120503.sql @@ -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 / \ No newline at end of file diff --git a/docs/sqlupgrade/Oracle/sql202308170203.sql b/docs/sqlupgrade/Oracle/sql202308170203.sql new file mode 100644 index 00000000..75e84411 --- /dev/null +++ b/docs/sqlupgrade/Oracle/sql202308170203.sql @@ -0,0 +1,2 @@ +ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER +/ \ No newline at end of file diff --git a/docs/sqlupgrade/Oracle/sql202308210602.sql b/docs/sqlupgrade/Oracle/sql202308210602.sql new file mode 100644 index 00000000..a396fdc0 --- /dev/null +++ b/docs/sqlupgrade/Oracle/sql202308210602.sql @@ -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; +/ \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202210200503.sql b/docs/sqlupgrade/PG/sql202210200503.sql index 57519958..bed34540 100644 --- a/docs/sqlupgrade/PG/sql202210200503.sql +++ b/docs/sqlupgrade/PG/sql202210200503.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202211100103.sql b/docs/sqlupgrade/PG/sql202211100103.sql index cd245d7a..65ca0ab0 100644 --- a/docs/sqlupgrade/PG/sql202211100103.sql +++ b/docs/sqlupgrade/PG/sql202211100103.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202212120403.sql b/docs/sqlupgrade/PG/sql202212120403.sql index aeea9da2..904e01ed 100644 --- a/docs/sqlupgrade/PG/sql202212120403.sql +++ b/docs/sqlupgrade/PG/sql202212120403.sql @@ -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 $$; / \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202212120503.sql b/docs/sqlupgrade/PG/sql202212120503.sql index d9a8dce8..6ba8cd4d 100644 --- a/docs/sqlupgrade/PG/sql202212120503.sql +++ b/docs/sqlupgrade/PG/sql202212120503.sql @@ -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 / \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202212120603.sql b/docs/sqlupgrade/PG/sql202212120603.sql index c86f9aaf..b43439fa 100644 --- a/docs/sqlupgrade/PG/sql202212120603.sql +++ b/docs/sqlupgrade/PG/sql202212120603.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202301120603.sql b/docs/sqlupgrade/PG/sql202301120603.sql index a87f0b09..7121166f 100644 --- a/docs/sqlupgrade/PG/sql202301120603.sql +++ b/docs/sqlupgrade/PG/sql202301120603.sql @@ -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 / diff --git a/docs/sqlupgrade/PG/sql202308170203.sql b/docs/sqlupgrade/PG/sql202308170203.sql new file mode 100644 index 00000000..0c5d92b4 --- /dev/null +++ b/docs/sqlupgrade/PG/sql202308170203.sql @@ -0,0 +1,2 @@ +ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER; +/ \ No newline at end of file diff --git a/docs/sqlupgrade/PG/sql202308210602.sql b/docs/sqlupgrade/PG/sql202308210602.sql new file mode 100644 index 00000000..6d4cb0e4 --- /dev/null +++ b/docs/sqlupgrade/PG/sql202308210602.sql @@ -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) +); +/ \ No newline at end of file diff --git a/docs/sqlupgrade/SQLServer/sql202212120503.sql b/docs/sqlupgrade/SQLServer/sql202212120503.sql index 604bf842..60e0a35b 100644 --- a/docs/sqlupgrade/SQLServer/sql202212120503.sql +++ b/docs/sqlupgrade/SQLServer/sql202212120503.sql @@ -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 \ No newline at end of file diff --git a/docs/sqlupgrade/SQLServer/sql202308170203.sql b/docs/sqlupgrade/SQLServer/sql202308170203.sql new file mode 100644 index 00000000..1f566b61 --- /dev/null +++ b/docs/sqlupgrade/SQLServer/sql202308170203.sql @@ -0,0 +1,2 @@ +alter table jcl_org_scheme add subcompanyid int +GO \ No newline at end of file diff --git a/docs/sqlupgrade/SQLServer/sql202308210602.sql b/docs/sqlupgrade/SQLServer/sql202308210602.sql new file mode 100644 index 00000000..397d13d5 --- /dev/null +++ b/docs/sqlupgrade/SQLServer/sql202308210602.sql @@ -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 \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202207180401.sql b/docs/sqlupgrade/ST/sql202207180401.sql index ad249f49..0d4ed595 100644 --- a/docs/sqlupgrade/ST/sql202207180401.sql +++ b/docs/sqlupgrade/ST/sql202207180401.sql @@ -1,839 +1,911 @@ -delete from HtmlLabelIndex where id = 538769 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538769 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538769,'编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538769 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538769,'编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538769 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538769 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538769 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538769 as indexid ,'编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538769 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538769 as indexid ,'编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538769 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538769 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538769 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538769 as indexid ,'Number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538769 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 538769 as indexid ,'Number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538769 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538769 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538769 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538769 as indexid ,'編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538769 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538769 as indexid ,'編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538769 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538768 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538768 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538768,'自定义设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538768 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538768,'自定义设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538768 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538768 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538768 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538768 as indexid ,'自定义设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538768 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538768 as indexid ,'自定义设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538768 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538768 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538768 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538768 as indexid ,'Custom settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538768 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 538768 as indexid ,'Custom settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538768 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538768 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538768 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538768 as indexid ,'自定義設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538768 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538768 as indexid ,'自定義設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538768 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538767 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538767 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538767,'人员卡片字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538767 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538767,'人员卡片字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538767 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538767 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538767 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538767 as indexid ,'人员卡片字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538767 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538767 as indexid ,'人员卡片字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538767 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538767 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538767 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538767 as indexid ,'Personnel card field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538767 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 538767 as indexid ,'Personnel card field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538767 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538767 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538767 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538767 as indexid ,'人員卡片字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538767 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538767 as indexid ,'人員卡片字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538767 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538766 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538766 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538766,'部门字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538766 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538766,'部门字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538766 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538766 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538766 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538766 as indexid ,'部门字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538766 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538766 as indexid ,'部门字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538766 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538766 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538766 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538766 as indexid ,'Department field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538766 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 538766 as indexid ,'Department field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538766 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538766 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538766 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538766 as indexid ,'部門字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538766 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538766 as indexid ,'部門字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538766 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538765 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538765 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538765,'分部字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538765 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538765,'分部字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538765 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538765 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538765 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538765 as indexid ,'分部字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538765 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538765 as indexid ,'分部字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538765 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538765 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538765 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538765 as indexid ,'Partial field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538765 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 538765 as indexid ,'Partial field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538765 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538765 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538765 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538765 as indexid ,'分部字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538765 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538765 as indexid ,'分部字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538765 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538764 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538764 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538764,'人员编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538764 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538764,'人员编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538764 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538764 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538764 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538764 as indexid ,'人员编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538764 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538764 as indexid ,'人员编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538764 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538764 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538764 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538764 as indexid ,'Personnel number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538764 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 538764 as indexid ,'Personnel number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538764 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538764 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538764 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538764 as indexid ,'人員編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538764 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538764 as indexid ,'人員編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538764 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538763 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538763 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538763,'岗位编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538763 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538763,'岗位编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538763 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538763 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538763 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538763 as indexid ,'岗位编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538763 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538763 as indexid ,'岗位编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538763 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538763 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538763 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538763 as indexid ,'Position number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538763 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 538763 as indexid ,'Position number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538763 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538763 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538763 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538763 as indexid ,'崗位編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538763 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538763 as indexid ,'崗位編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538763 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538762 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538762 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538762,'部门编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538762 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538762,'部门编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538762 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538762 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538762 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538762 as indexid ,'部门编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538762 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538762 as indexid ,'部门编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538762 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538762 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538762 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538762 as indexid ,'Department number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538762 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 538762 as indexid ,'Department number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538762 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538762 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538762 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538762 as indexid ,'部門編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538762 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538762 as indexid ,'部門編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538762 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538761 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538761 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538761,'编号管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538761 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538761,'编号管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538761 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538761 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538761 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538761 as indexid ,'编号管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538761 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538761 as indexid ,'编号管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538761 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538761 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538761 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538761 as indexid ,'Number management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538761 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 538761 as indexid ,'Number management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538761 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538761 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538761 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538761 as indexid ,'編號管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538761 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538761 as indexid ,'編號管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538761 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538760 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538760 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538760,'组织画像' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538760 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538760,'组织画像' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538760 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538760 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538760 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538760 as indexid ,'组织画像' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538760 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538760 as indexid ,'组织画像' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538760 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538760 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538760 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538760 as indexid ,'Organization portrait' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538760 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 538760 as indexid ,'Organization portrait' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538760 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538760 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538760 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538760 as indexid ,'組織畫像' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538760 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538760 as indexid ,'組織畫像' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538760 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538759 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538759 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538759,'分部编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538759 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538759,'分部编号设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538759 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538759 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538759 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538759 as indexid ,'分部编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538759 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538759 as indexid ,'分部编号设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538759 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538759 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538759 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538759 as indexid ,'Segment number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538759 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 538759 as indexid ,'Segment number setting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538759 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538759 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538759 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538759 as indexid ,'分部編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538759 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538759 as indexid ,'分部編號設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538759 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538758 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538758 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538758,'组织架构图' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538758 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538758,'组织架构图' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538758 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538758 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538758 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538758 as indexid ,'组织架构图' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538758 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538758 as indexid ,'组织架构图' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538758 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538758 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538758 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538758 as indexid ,'Organization chart' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538758 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 538758 as indexid ,'Organization chart' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538758 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538758 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538758 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538758 as indexid ,'組織架構圖' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538758 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538758 as indexid ,'組織架構圖' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538758 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538757 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538757 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538757,'岗位字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538757 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538757,'岗位字段定义' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538757 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538757 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538757 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538757 as indexid ,'岗位字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538757 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538757 as indexid ,'岗位字段定义' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538757 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538757 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538757 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538757 as indexid ,'Position field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538757 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 538757 as indexid ,'Position field definition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538757 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538757 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538757 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538757 as indexid ,'崗位字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538757 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538757 as indexid ,'崗位字段定義' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538757 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538753 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538753 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538753,'编制流程设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538753 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538753,'编制流程设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538753 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538753 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538753 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538753 as indexid ,'编制流程设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538753 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538753 as indexid ,'编制流程设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538753 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538753 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538753 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538753 as indexid ,'Preparation process settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538753 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 538753 as indexid ,'Preparation process settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538753 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538753 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538753 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538753 as indexid ,'編製流程設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538753 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538753 as indexid ,'編製流程設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538753 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538752 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538752 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538752,'编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538752 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538752,'编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538752 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538752 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538752 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538752 as indexid ,'编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538752 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538752 as indexid ,'编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538752 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538752 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538752 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538752 as indexid ,'Compilation information' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538752 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 538752 as indexid ,'Compilation information' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538752 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538752 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538752 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538752 as indexid ,'編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538752 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538752 as indexid ,'編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538752 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538751 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538751 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538751,'编制方案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538751 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538751,'编制方案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538751 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538751 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538751 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538751 as indexid ,'编制方案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538751 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538751 as indexid ,'编制方案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538751 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538751 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538751 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538751 as indexid ,'Preparation plan' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538751 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 538751 as indexid ,'Preparation plan' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538751 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538751 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538751 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538751 as indexid ,'編製方案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538751 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538751 as indexid ,'編製方案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538751 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538750 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538750 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538750,'编制管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538750 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538750,'编制管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538750 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538750 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538750 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538750 as indexid ,'编制管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538750 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538750 as indexid ,'编制管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538750 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538750 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538750 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538750 as indexid ,'Preparation management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538750 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 538750 as indexid ,'Preparation management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538750 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538750 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538750 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538750 as indexid ,'編製管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538750 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538750 as indexid ,'編製管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538750 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538743 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538743 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538743,'组织透视' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538743 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538743,'组织透视' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538743 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538743 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538743 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538743 as indexid ,'组织透视' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538743 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538743 as indexid ,'组织透视' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538743 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538743 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538743 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538743 as indexid ,'Organizational perspective' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538743 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 538743 as indexid ,'Organizational perspective' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538743 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538743 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538743 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538743 as indexid ,'組織透視' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538743 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538743 as indexid ,'組織透視' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538743 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538742 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538742 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538742,'组织图示' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538742 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538742,'组织图示' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538742 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538742 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538742 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538742 as indexid ,'组织图示' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538742 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538742 as indexid ,'组织图示' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538742 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538742 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538742 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538742 as indexid ,'Organization diagram' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538742 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 538742 as indexid ,'Organization diagram' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538742 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538742 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538742 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538742 as indexid ,'組織圖示' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538742 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538742 as indexid ,'組織圖示' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538742 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538741 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538741 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538741,'组织展示' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538741 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538741,'组织展示' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538741 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538741 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538741 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538741 as indexid ,'组织展示' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538741 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538741 as indexid ,'组织展示' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538741 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538741 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538741 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538741 as indexid ,'Organization display' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538741 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 538741 as indexid ,'Organization display' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538741 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538741 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538741 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538741 as indexid ,'組織展示' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538741 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538741 as indexid ,'組織展示' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538741 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538740 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538740 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538740,'人员管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538740 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538740,'人员管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538740 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538740 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538740 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538740 as indexid ,'人员管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538740 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538740 as indexid ,'人员管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538740 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538740 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538740 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538740 as indexid ,'Personnel management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538740 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 538740 as indexid ,'Personnel management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538740 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538740 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538740 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538740 as indexid ,'人員管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538740 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538740 as indexid ,'人員管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538740 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538739 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538739 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538739,'岗位管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538739 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538739,'岗位管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538739 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538739 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538739 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538739 as indexid ,'岗位管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538739 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538739 as indexid ,'岗位管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538739 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538739 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538739 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538739 as indexid ,'Post management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538739 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 538739 as indexid ,'Post management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538739 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538739 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538739 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538739 as indexid ,'崗位管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538739 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538739 as indexid ,'崗位管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538739 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538738 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538738 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538738,'部门管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538738 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538738,'部门管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538738 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538738 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538738 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538738 as indexid ,'部门管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538738 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538738 as indexid ,'部门管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538738 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538738 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538738 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538738 as indexid ,'Department management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538738 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 538738 as indexid ,'Department management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538738 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538738 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538738 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538738 as indexid ,'部門管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538738 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538738 as indexid ,'部門管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538738 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538737 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538737 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538737,'分部管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538737 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538737,'分部管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538737 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538737 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538737 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538737 as indexid ,'分部管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538737 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538737 as indexid ,'分部管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538737 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538737 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538737 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538737 as indexid ,'Segment management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538737 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 538737 as indexid ,'Segment management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538737 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538737 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538737 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538737 as indexid ,'分部管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538737 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538737 as indexid ,'分部管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538737 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538736 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538736 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538736,'集团管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538736 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538736,'集团管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538736 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538736 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538736 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538736 as indexid ,'集团管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538736 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538736 as indexid ,'集团管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538736 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538736 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538736 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538736 as indexid ,'Group management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538736 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 538736 as indexid ,'Group management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538736 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538736 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538736 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538736 as indexid ,'集團管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538736 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538736 as indexid ,'集團管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538736 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538735 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538735 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538735,'组织机构' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538735 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538735,'组织机构' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538735 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538735 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538735 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538735 as indexid ,'组织机构' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538735 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538735 as indexid ,'组织机构' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538735 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538735 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538735 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538735 as indexid ,'Organization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538735 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 538735 as indexid ,'Organization' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538735 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538735 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538735 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538735 as indexid ,'組織機構' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538735 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538735 as indexid ,'組織機構' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538735 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538733 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538733 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538733,'职务管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538733 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538733,'职务管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538733 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538733 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538733 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538733 as indexid ,'职务管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538733 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538733 as indexid ,'职务管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538733 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538733 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538733 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538733 as indexid ,'Job management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538733 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 538733 as indexid ,'Job management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538733 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538733 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538733 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538733 as indexid ,'職務管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538733 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538733 as indexid ,'職務管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538733 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538732 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538732 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538732,'岗位序列' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538732 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538732,'岗位序列' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538732 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538732 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538732 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538732 as indexid ,'岗位序列' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538732 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538732 as indexid ,'岗位序列' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538732 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538732 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538732 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538732 as indexid ,'Position sequence' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538732 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 538732 as indexid ,'Position sequence' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538732 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538732 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538732 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538732 as indexid ,'崗位序列' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538732 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538732 as indexid ,'崗位序列' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538732 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538731 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538731 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538731,'职级' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538731 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538731,'职级' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538731 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538731 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538731 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538731 as indexid ,'职级' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538731 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538731 as indexid ,'职级' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538731 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538731 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538731 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538731 as indexid ,'Rank' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538731 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 538731 as indexid ,'Rank' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538731 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538731 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538731 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538731 as indexid ,'職級' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538731 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538731 as indexid ,'職級' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538731 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538730 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538730 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538730,'职等' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538730 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538730,'职等' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538730 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538730 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538730 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538730 as indexid ,'职等' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538730 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538730 as indexid ,'职等' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538730 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538730 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538730 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538730 as indexid ,'grade of positions' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538730 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 538730 as indexid ,'grade of positions' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538730 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538730 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538730 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538730 as indexid ,'職等' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538730 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538730 as indexid ,'職等' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538730 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538729 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538729 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538729,'等级方案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538729 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538729,'等级方案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538729 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538729 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538729 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538729 as indexid ,'等级方案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538729 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538729 as indexid ,'等级方案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538729 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538729 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538729 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538729 as indexid ,'Grade scheme' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538729 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 538729 as indexid ,'Grade scheme' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538729 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538729 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538729 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538729 as indexid ,'等級方案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538729 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538729 as indexid ,'等級方案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538729 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538728 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538728 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538728,'岗职位体系' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538728 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538728,'岗职位体系' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538728 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538728 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538728 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538728 as indexid ,'岗职位体系' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538728 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538728 as indexid ,'岗职位体系' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538728 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538728 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538728 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538728 as indexid ,'Post position system' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538728 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 538728 as indexid ,'Post position system' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538728 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538728 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538728 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538728 as indexid ,'崗職位體系' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538728 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538728 as indexid ,'崗職位體系' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538728 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538727 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538727 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538727,'应用框架' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538727 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538727,'应用框架' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538727 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538727 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538727 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538727 as indexid ,'应用框架' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538727 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538727 as indexid ,'应用框架' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538727 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538727 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538727 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538727 as indexid ,'Application framework' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538727 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 538727 as indexid ,'Application framework' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538727 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538727 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538727 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538727 as indexid ,'應用框架' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538727 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538727 as indexid ,'應用框架' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538727 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538726 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538726 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538726,'组织管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538726 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538726,'组织管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538726 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538726 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538726 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538726 as indexid ,'组织管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538726 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538726 as indexid ,'组织管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538726 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538726 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538726 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538726 as indexid ,'Organization management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538726 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 538726 as indexid ,'Organization management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538726 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538726 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538726 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538726 as indexid ,'組織管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538726 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538726 as indexid ,'組織管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538726 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelIndex where id = 538838 and ( trim(indexdesc) is null ) ; +delete from HtmlLabelIndex where id = 538781 and ( trim(indexdesc) is null ); / -insert into HtmlLabelIndex(id,indexdesc) select 538838,'组织数据导入' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538838 and ( trim(indexdesc) is not null )) and rownum = 1 ; +insert into HtmlLabelIndex(id,indexdesc) select 538781,'聚才林岗位' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538781 and ( trim(indexdesc) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538838 and languageid=7 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538781 and languageid=7 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538838 as indexid ,'组织数据导入' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538838 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538781 as indexid ,'聚才林岗位' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538781 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538838 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +delete from HtmlLabelInfo where indexid = 538781 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538838 as indexid ,'Organization data import' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538838 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 538781 as indexid ,'Jucailin post' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538781 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; / -delete from HtmlLabelInfo where indexid = 538838 and languageid=9 and ( trim(labelname) is null ) ; +delete from HtmlLabelInfo where indexid = 538781 and languageid=9 and ( trim(labelname) is null ); / -insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538838 as indexid ,'組織數據導入' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538838 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538781 as indexid ,'聚才林崗位' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538781 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; +/ + +delete from HtmlLabelIndex where id = 538838 and ( trim(indexdesc) is null ); +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538838,'组织数据导入' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538838 and ( trim(indexdesc) is not null )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 538838 and languageid=7 and ( trim(labelname) is null ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538838 as indexid ,'组织数据导入' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538838 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 538838 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538838 as indexid ,'Organization data import' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538838 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 538838 and languageid=9 and ( trim(labelname) is null ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538838 as indexid ,'組織數據導入' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538838 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; +/ + +delete from HtmlLabelIndex where id = 512838 and ( trim(indexdesc) is null ); +/ + +insert into HtmlLabelIndex(id,indexdesc) select 512838,'花名册' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 512838 and ( trim(indexdesc) is not null )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 512838 and languageid=7 and ( trim(labelname) is null ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 512838 as indexid ,'花名册' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 512838 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 512838 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 512838 as indexid ,'Roster' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 512838 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 512838 and languageid=9 and ( trim(labelname) is null ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 512838 as indexid ,'花名冊' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 512838 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; +/ + +delete from HtmlLabelIndex where id = 538880 and ( trim(indexdesc) is null ); +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538880,'人员卡片显示栏目' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538880 and ( trim(indexdesc) is not null )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 538880 and languageid=7 and ( trim(labelname) is null ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538880 as indexid ,'人员卡片显示栏目' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538880 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 538880 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538880 as indexid ,'Personnel card display column' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538880 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1; +/ + +delete from HtmlLabelInfo where indexid = 538880 and languageid=9 and ( trim(labelname) is null ); +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538880 as indexid ,'人員卡片显示欄目' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538880 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202207180502.sql b/docs/sqlupgrade/ST/sql202207180502.sql index eed38c1c..0d7527a7 100644 --- a/docs/sqlupgrade/ST/sql202207180502.sql +++ b/docs/sqlupgrade/ST/sql202207180502.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202207180603.sql b/docs/sqlupgrade/ST/sql202207180603.sql index 69364e1d..73addcf7 100644 --- a/docs/sqlupgrade/ST/sql202207180603.sql +++ b/docs/sqlupgrade/ST/sql202207180603.sql @@ -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); / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202207180903.sql b/docs/sqlupgrade/ST/sql202207180903.sql index aeddd44d..8786ddbe 100644 --- a/docs/sqlupgrade/ST/sql202207180903.sql +++ b/docs/sqlupgrade/ST/sql202207180903.sql @@ -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(), ''); diff --git a/docs/sqlupgrade/ST/sql202208150200.sql b/docs/sqlupgrade/ST/sql202208150200.sql index 507ced7b..a5c02e36 100644 --- a/docs/sqlupgrade/ST/sql202208150200.sql +++ b/docs/sqlupgrade/ST/sql202208150200.sql @@ -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,'组织管理','组织管理'); diff --git a/docs/sqlupgrade/ST/sql202211100103.sql b/docs/sqlupgrade/ST/sql202211100103.sql index 67b271e6..fac7f249 100644 --- a/docs/sqlupgrade/ST/sql202211100103.sql +++ b/docs/sqlupgrade/ST/sql202211100103.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202212120302.sql b/docs/sqlupgrade/ST/sql202212120302.sql index 5721d4a5..fc23bb9a 100644 --- a/docs/sqlupgrade/ST/sql202212120302.sql +++ b/docs/sqlupgrade/ST/sql202212120302.sql @@ -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'; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202212120403.sql b/docs/sqlupgrade/ST/sql202212120403.sql index 7cfca253..bca3dcb0 100644 --- a/docs/sqlupgrade/ST/sql202212120403.sql +++ b/docs/sqlupgrade/ST/sql202212120403.sql @@ -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()); diff --git a/docs/sqlupgrade/ST/sql202212120503.sql b/docs/sqlupgrade/ST/sql202212120503.sql index 4e301984..239ebe4f 100644 --- a/docs/sqlupgrade/ST/sql202212120503.sql +++ b/docs/sqlupgrade/ST/sql202212120503.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202212120603.sql b/docs/sqlupgrade/ST/sql202212120603.sql index 1d847417..4a4b3b42 100644 --- a/docs/sqlupgrade/ST/sql202212120603.sql +++ b/docs/sqlupgrade/ST/sql202212120603.sql @@ -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; diff --git a/docs/sqlupgrade/ST/sql202301120603.sql b/docs/sqlupgrade/ST/sql202301120603.sql index cf80c8f6..3463535f 100644 --- a/docs/sqlupgrade/ST/sql202301120603.sql +++ b/docs/sqlupgrade/ST/sql202301120603.sql @@ -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; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202307100103.sql b/docs/sqlupgrade/ST/sql202307100103.sql index c759a6ed..95be1b08 100644 --- a/docs/sqlupgrade/ST/sql202307100103.sql +++ b/docs/sqlupgrade/ST/sql202307100103.sql @@ -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 ,'快捷搜索自定義' 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 ,'組織快速調整' 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; / \ No newline at end of file diff --git a/docs/sqlupgrade/ST/sql202308170203.sql b/docs/sqlupgrade/ST/sql202308170203.sql new file mode 100644 index 00000000..569916ea --- /dev/null +++ b/docs/sqlupgrade/ST/sql202308170203.sql @@ -0,0 +1,3 @@ +ALTER TABLE JCL_ORG_SCHEME ADD SUBCOMPANYID NUMBER; +/ + diff --git a/docs/sqlupgrade/ST/sql202308210602.sql b/docs/sqlupgrade/ST/sql202308210602.sql new file mode 100644 index 00000000..fa659e3f --- /dev/null +++ b/docs/sqlupgrade/ST/sql202308210602.sql @@ -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; +/ + diff --git a/src/com/api/organization/web/StaffOutController.java b/src/com/api/organization/web/StaffOutController.java new file mode 100644 index 00000000..45964831 --- /dev/null +++ b/src/com/api/organization/web/StaffOutController.java @@ -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 { +} diff --git a/src/com/engine/organization/entity/staff/bo/StaffBO.java b/src/com/engine/organization/entity/staff/bo/StaffBO.java index 5efced65..6064e382 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffBO.java @@ -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 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; } diff --git a/src/com/engine/organization/entity/staff/param/StaffOutParam.java b/src/com/engine/organization/entity/staff/param/StaffOutParam.java new file mode 100644 index 00000000..0a4a59a5 --- /dev/null +++ b/src/com/engine/organization/entity/staff/param/StaffOutParam.java @@ -0,0 +1,42 @@ +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.鍏跺畠 + */ + private Integer changeMode; + + /** + * 鍙樺姩鏁 + */ + private Integer num; + +} diff --git a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffParams.java similarity index 93% rename from src/com/engine/organization/entity/staff/param/StaffSearchParam.java rename to src/com/engine/organization/entity/staff/param/StaffParams.java index 003231c5..dad8209a 100644 --- a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffParams.java @@ -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; /** * 缂栧埗鏁 */ diff --git a/src/com/engine/organization/entity/staff/param/StaffSerachParam.java b/src/com/engine/organization/entity/staff/param/StaffSerachParam.java new file mode 100644 index 00000000..dfe6e696 --- /dev/null +++ b/src/com/engine/organization/entity/staff/param/StaffSerachParam.java @@ -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; +} diff --git a/src/com/engine/organization/entity/staff/po/StaffPO.java b/src/com/engine/organization/entity/staff/po/StaffPO.java index f1681d3c..5e3a02b6 100644 --- a/src/com/engine/organization/entity/staff/po/StaffPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffPO.java @@ -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; /** * 缂栧埗鏁 */ diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index a92383e3..02381c89 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -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; /** * 骞村害 */ diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 671422f8..4e2e5e0f 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -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; /** * 鍒嗛儴 */ diff --git a/src/com/engine/organization/enums/StaffChangeEnum.java b/src/com/engine/organization/enums/StaffChangeEnum.java new file mode 100644 index 00000000..81fe5b3d --- /dev/null +++ b/src/com/engine/organization/enums/StaffChangeEnum.java @@ -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; + } +} diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.java b/src/com/engine/organization/mapper/staff/StaffMapper.java index 20dae234..533c5a0a 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffMapper.java @@ -33,6 +33,16 @@ public interface StaffMapper { */ List 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 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 selectByEcCompany(@Param("companyIds") Collection companyIds); + + List selectByEcDepartment(@Param("departmentIds") Collection departmentIds); } diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml index 41fb3eb3..d79f36dc 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml @@ -67,6 +67,27 @@ order by update_time desc + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.java b/src/com/engine/organization/mapper/staff/StaffPlanMapper.java index 863706c6..8884113d 100644 --- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.java @@ -74,4 +74,14 @@ public interface StaffPlanMapper { List listUsedId(); List getStaffPlansByIds(@Param("ids") Collection 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 + */ + StaffPlanPO customSelect(@Param("timeStart") String timeStart,@Param("ecCompany") String ecCompany,@Param("controlDimension") String controlDimension); + } diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml index afe9e648..fe600553 100644 --- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml @@ -296,4 +296,13 @@ + + \ No newline at end of file diff --git a/src/com/engine/organization/service/StaffOutService.java b/src/com/engine/organization/service/StaffOutService.java new file mode 100644 index 00000000..10753b61 --- /dev/null +++ b/src/com/engine/organization/service/StaffOutService.java @@ -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); +} diff --git a/src/com/engine/organization/service/StaffService.java b/src/com/engine/organization/service/StaffService.java index 2090dbf1..c2978d1d 100644 --- a/src/com/engine/organization/service/StaffService.java +++ b/src/com/engine/organization/service/StaffService.java @@ -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 listPage(StaffSearchParam params); + Map 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鎵归噺鍒犻櫎缂栧埗 diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java new file mode 100644 index 00000000..5de3a2fe --- /dev/null +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -0,0 +1,216 @@ +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.StaffChangeEnum; +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> 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 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 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); + buildStaffPO(staffPO); + return staffMapper().updateStaff(staffPO); + } + + private Integer frozenStaffNums(StaffOutParam param) { + StaffPO staffPO = select(param); + List 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); + Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum(); + //寮烘帶绛栫暐涓嬩笉瀹硅瓒呯紪 + if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) { + OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0,"寮烘帶绛栫暐涓嬩笉瀹硅瓒呯紪"); + } + List numbers = Arrays.asList(staffPO.getPermanentNum(),param.getNum()); + //1.澧炲姞鍦ㄧ紪鏁 + int sum = numbers.stream() + .mapToInt(Integer::intValue) + .sum(); + staffPO.setPermanentNum(sum); + //鍚戜笂閮ㄩ棬 鍒嗛儴鍦ㄧ紪鏁拌皟鏁 + upwardReviewSums(param); + //2.璋冩暣鏂瑰紡涓烘祦绋嬫椂閲婃斁鍐荤粨鏁 + if (param.getChangeMode() == 1) { + List 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 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 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())); + if (!"".equals(allSupCompany)) { + Collection subCompanys = Arrays.stream(allSupCompany.split(",")) + .map(Integer::parseInt) + .collect(Collectors.toList()); + List 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()); + } + staffMapper().updateStaff(item); + }); + } + } + } + + //2.閮ㄩ棬 + if (param.getDepartment() != null) { + String allSupDepartment = departmentComInfo.getAllSupDepartment(String.valueOf(param.getDepartment())); + if ("".equals(allSupDepartment)) { + Collection subDepartments = Arrays.stream(allSupDepartment.split(",")) + .map(Integer::parseInt) + .collect(Collectors.toList()); + List 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()); + } + staffMapper().updateStaff(item); + }); + } + } + } + + } + + private StaffPO select(StaffOutParam param) { + List staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob()); + OrganizationAssert.notNull(staffPO,"鏈煡璇㈠埌瀵瑰簲缂栧埗鏂规涓嬬殑缁勭粐缂栧埗淇℃伅锛"); + return staffPO.get(0); + } + + private static void buildStaffPO(StaffPO staffPO) { + List 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 function = affairFunctionS.get(functionEnum); + return function.apply(staffOutParam); + } + +} diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index b2ad3d36..d7d8fbdc 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -120,7 +120,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe // 鍒ゆ柇鏈夋棤閲嶅鏁版嵁 List detachListById = getMangeDetachMapper().getDetachListById(ecManager); if (CollectionUtils.isNotEmpty(detachListById)) { - Set noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById); + Set noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById, param.getId()); noRepeatRoleLevels.addAll(Arrays.asList(noRepeatRoleLevel.split(","))); noRepeatRoleLevel = StringUtils.join(noRepeatRoleLevels, ","); List collect = detachListById.stream().map(ManagerDetachPO::getId).map(Long::valueOf).collect(Collectors.toList()); @@ -149,7 +149,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe // 鍒ゆ柇鏈夋棤閲嶅鏁版嵁 List detachListById = getMangeDetachMapper().getDetachListById(ecManager); if (CollectionUtils.isNotEmpty(detachListById)) { - Set noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById); + Set noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById,param.getId()); noRepeatRoleLevels.addAll(Arrays.asList(noRepeatRoleLevel.split(","))); noRepeatRoleLevel = StringUtils.join(noRepeatRoleLevels, ","); List collect = detachListById.stream().map(ManagerDetachPO::getId).map(Long::valueOf).collect(Collectors.toList()); @@ -226,11 +226,15 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe * 鑾峰緱鏃犻噸澶嶈鑹茬骇鍒 * * @param detachList detachList + * @param id * @return return */ - private Set getNoRepeatRoleLevels(List detachList) { + private Set getNoRepeatRoleLevels(List detachList, Integer id) { Set ecRoleLevels = new HashSet<>(); for (ManagerDetachPO managerDetach : detachList) { + if (null != id && id.equals(managerDetach.getId())) { + continue; + } Set ids = Stream.of(managerDetach.getJclRolelevel().split(",")).collect(Collectors.toSet()); if (CollectionUtils.isNotEmpty(ids)) { ecRoleLevels.addAll(ids); diff --git a/src/com/engine/organization/service/impl/StaffOutServiceImpl.java b/src/com/engine/organization/service/impl/StaffOutServiceImpl.java new file mode 100644 index 00000000..3ca212c9 --- /dev/null +++ b/src/com/engine/organization/service/impl/StaffOutServiceImpl.java @@ -0,0 +1,30 @@ +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(); + return functionFactory.actuator(staffOutParam.getType(), staffOutParam); + } + + @Override + public Integer transactionOnJob(StaffOutParam staffOutParam) { + FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(); + return functionFactory.actuator(staffOutParam.getType(), staffOutParam); + } +} diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 0a4accc1..f5dc87bc 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -73,6 +73,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { Date startDate = DateUtil.parseToDate(timeStart); Date endDate = DateUtil.parseToDate(timeEnd); OrganizationAssert.isFalse(startDate.after(endDate), "寮濮嬫椂闂翠笉鍏佽鍦ㄧ粨鏉熸椂闂翠箣鍚"); + StaffPlanPO staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(), param.getEcCompany(), param.getControlDimension()); + OrganizationAssert.isNull(staffPlanPO1,"鍚屼竴缁村害涓嬶紝鐩稿悓閫傜敤鍏徃缂栧埗鏂规鐨勬椂闂存涓嶅厑璁稿嚭鐜颁氦鍙"); return getStaffPlanMapper().insertIgnoreNull(staffPlanPO); } @@ -92,6 +94,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { Date startDate = DateUtil.parseToDate(timeStart); Date endDate = DateUtil.parseToDate(timeEnd); OrganizationAssert.isFalse(startDate.after(endDate), "寮濮嬫椂闂翠笉鍏佽鍦ㄧ粨鏉熸椂闂翠箣鍚"); + StaffPlanPO staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(), param.getEcCompany(), param.getControlDimension()); + OrganizationAssert.isNull(staffPlanPO1,"鍚屼竴缁村害涓嬶紝鐩稿悓閫傜敤鍏徃缂栧埗鏂规鐨勬椂闂存涓嶅厑璁稿嚭鐜颁氦鍙"); // 澶氶夎祴鍊 staffPlanPO.setCompanyId(staffPlanPO.getEcCompany()); return getStaffPlanMapper().updateStaffPlan(staffPlanPO); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 0da7379d..70f9e5ab 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -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; @@ -104,7 +106,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override - public Map listPage(StaffSearchParam params) { + public Map listPage(StaffSerachParam params) { Map resultMap = new HashMap<>(); boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); resultMap.put("hasRight", hasRight); @@ -124,13 +126,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 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 +142,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 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(); @@ -338,7 +345,7 @@ public class StaffServiceImpl extends Service implements StaffService { List addGroups = new ArrayList<>(); List 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 +362,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 +388,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 +452,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()); @@ -473,7 +480,7 @@ public class StaffServiceImpl extends Service implements StaffService { sql += " and departmentid = " + staffPO.getEcDepartment(); } if (null != staffPO.getJobId() && 0 != staffPO.getJobId()) { - JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(staffPO.getJobId()); + JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(Long.valueOf(staffPO.getJobId())); if (null == jobById) { return; } diff --git a/src/com/engine/organization/transmethod/DepartmentTransMethod.java b/src/com/engine/organization/transmethod/DepartmentTransMethod.java index d490418f..3e033359 100644 --- a/src/com/engine/organization/transmethod/DepartmentTransMethod.java +++ b/src/com/engine/organization/transmethod/DepartmentTransMethod.java @@ -18,8 +18,11 @@ public class DepartmentTransMethod { public static String getSpanById(String planId) { DepartmentMapper departmentMapper = MapperProxyFactory.getProxy(DepartmentMapper.class); - List> 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> maps = departmentMapper.listDeptsByIds(DeleteParam.builder().ids(planId).build().getIds()); + names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); + } return names; } } diff --git a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java index bcdcfbc9..fdf7a21b 100644 --- a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java +++ b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java @@ -18,12 +18,16 @@ public class HrmResourceTransMethod { public static String getFieldTrueValue(String id, String para) { HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0])); - // hfm.getCustomFields(); String fieldName = para.substring(para.lastIndexOf("_") + 1); JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName); User user = new User(); user.setUid(1); try { + if (hfm.isBaseField(fieldName)) { + if ("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) { return ""; diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index 82d0b130..2c09c921 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -23,8 +23,12 @@ public class JobTransMethod { public static String getSpanById(String jobId) { JobMapper jobMapper = MapperProxyFactory.getProxy(JobMapper.class); - List jobsByIds = jobMapper.getJobsByIds(DeleteParam.builder().ids(jobId).build().getIds()); - return jobsByIds.stream().map(JobPO::getJobTitleName).collect(Collectors.joining(",")); + String names = "/"; + if (!"".equals(jobId)) { + List 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) { diff --git a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java index f15bd9f0..494f1d1a 100644 --- a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java @@ -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 "/"; + } } diff --git a/src/com/engine/organization/transmethod/StaffTransMethod.java b/src/com/engine/organization/transmethod/StaffTransMethod.java index 88949cbe..cc264738 100644 --- a/src/com/engine/organization/transmethod/StaffTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffTransMethod.java @@ -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; } + } diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index aedc24fd..755d5baf 100644 --- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -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) { diff --git a/src/com/engine/organization/web/StaffController.java b/src/com/engine/organization/web/StaffController.java index a14e990f..fc8d9ebe 100644 --- a/src/com/engine/organization/web/StaffController.java +++ b/src/com/engine/organization/web/StaffController.java @@ -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 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)); diff --git a/src/com/engine/organization/web/StaffOutController.java b/src/com/engine/organization/web/StaffOutController.java new file mode 100644 index 00000000..a9f9bb2b --- /dev/null +++ b/src/com/engine/organization/web/StaffOutController.java @@ -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); + } + } + +} diff --git a/src/com/engine/organization/wrapper/StaffWrapper.java b/src/com/engine/organization/wrapper/StaffWrapper.java index 3fc552ef..1b46e618 100644 --- a/src/com/engine/organization/wrapper/StaffWrapper.java +++ b/src/com/engine/organization/wrapper/StaffWrapper.java @@ -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 listPage(StaffSearchParam params) { + public Map 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() {