From 077945dfa12e5e7f0e1d1bc74b7afbcbdd28cb3a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 6 Sep 2022 10:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/脚本/Mysql/浏览按钮mysql.sql | 4 ++-- docs/脚本/Mysql/表结构、初始化数据.sql | 6 ++++++ docs/脚本/Oracle/表结构、初始化数据Oracle.sql | 6 ++++++ docs/脚本/SqlServer/浏览按钮sqlserver.sql | 4 ++-- docs/脚本/SqlServer/表结构、基础数据.sql | 6 ++++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/docs/脚本/Mysql/浏览按钮mysql.sql b/docs/脚本/Mysql/浏览按钮mysql.sql index 9b7e65cc..72bb7769 100644 --- a/docs/脚本/Mysql/浏览按钮mysql.sql +++ b/docs/脚本/Mysql/浏览按钮mysql.sql @@ -38,8 +38,8 @@ select @current_time:= date_format( now(),'%T'); 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, '', '', @current_date, @current_time, NULL, NULL, '', '', '0', uuid(), '', '', '', '', '1', 0, 1); select @datashowset_id:= max(id) from datashowset; INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, @current_date, @current_time, NULL, NULL); -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 1, 1, uuid(), NULL); -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 0, 2, uuid(), NULL); +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 0, 1, uuid(), NULL); +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 1, 2, uuid(), 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, uuid(), NULL); INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'post_info_no', '2', '', 1, uuid(), ''); INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_info_name', '2', '', 2, uuid(), ''); diff --git a/docs/脚本/Mysql/表结构、初始化数据.sql b/docs/脚本/Mysql/表结构、初始化数据.sql index 5497f737..640563b4 100644 --- a/docs/脚本/Mysql/表结构、初始化数据.sql +++ b/docs/脚本/Mysql/表结构、初始化数据.sql @@ -84,6 +84,7 @@ CREATE TABLE `jcl_org_comp` ( `comp_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `comp_name_short` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `parent_company` int(11) NULL DEFAULT NULL, + `ec_company` int(11) NULL DEFAULT NULL, `org_code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `industry` int(11) NULL DEFAULT NULL, `comp_principal` int(11) NULL DEFAULT NULL, @@ -133,7 +134,9 @@ CREATE TABLE `jcl_org_dept` ( `dept_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `dept_name_short` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `parent_comp` int(11) NULL DEFAULT NULL, + `ec_company` int(11) NULL DEFAULT NULL, `parent_dept` int(11) NULL DEFAULT NULL, + `ec_department` int(11) NULL DEFAULT NULL, `dept_principal` int(11) NULL DEFAULT NULL, `show_order` int(11) NULL DEFAULT NULL, `description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL, @@ -482,7 +485,9 @@ CREATE TABLE `jcl_org_staff` ( `id` int(11) NOT NULL AUTO_INCREMENT, `plan_id` int(11) NULL DEFAULT NULL, `comp_id` int(11) NULL DEFAULT NULL, + `ec_company` int(11) NULL DEFAULT NULL, `dept_id` int(11) NULL DEFAULT NULL, + `ec_department` int(11) NULL DEFAULT NULL, `job_id` int(11) NULL DEFAULT NULL, `staff_num` int(11) NULL DEFAULT NULL, `control_policy` int(11) NULL DEFAULT NULL, @@ -508,6 +513,7 @@ CREATE TABLE `jcl_org_staffplan` ( `time_start` date NULL DEFAULT NULL, `time_end` date NULL DEFAULT NULL, `company_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `ec_company` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `control_dimension` varchar(5) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL, `forbidden_tag` int(11) NULL DEFAULT NULL, diff --git a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql index 510e4dd6..ae02ca38 100644 --- a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql +++ b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql @@ -104,6 +104,7 @@ CREATE TABLE JCL_ORG_COMP ( COMP_NAME NVARCHAR2(100) NULL, COMP_NAME_SHORT NVARCHAR2(100) NULL, PARENT_COMPANY NUMBER NULL, + EC_COMPANY NUMBER NULL, ORG_CODE NVARCHAR2(100) NULL, INDUSTRY NUMBER NULL, COMP_PRINCIPAL NUMBER NULL, @@ -212,7 +213,9 @@ CREATE TABLE JCL_ORG_DEPT ( DEPT_NAME NVARCHAR2(100) NULL, DEPT_NAME_SHORT NVARCHAR2(100) NULL, PARENT_COMP NUMBER NULL, + EC_COMPANY NUMBER NULL, PARENT_DEPT NUMBER NULL, + EC_DEPARTMENT NUMBER NULL, DEPT_PRINCIPAL NUMBER NULL, SHOW_ORDER NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, @@ -427,6 +430,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( TIME_START DATE NULL, TIME_END DATE NULL, COMPANY_ID NVARCHAR2(100) NULL, + EC_COMPANY NVARCHAR2(100) NULL, CONTROL_DIMENSION NVARCHAR2(5) NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, @@ -444,7 +448,9 @@ CREATE TABLE JCL_ORG_STAFF ( ID NUMBER NOT NULL, PLAN_ID NUMBER NULL, COMP_ID NUMBER NULL, + EC_COMPANY NUMBER NULL, DEPT_ID NUMBER NULL, + EC_DEPARTMENT NUMBER NULL, JOB_ID NUMBER NULL, STAFF_NUM NUMBER NULL, CONTROL_POLICY NUMBER NULL, diff --git a/docs/脚本/SqlServer/浏览按钮sqlserver.sql b/docs/脚本/SqlServer/浏览按钮sqlserver.sql index dfdda47c..ed6d3f2d 100644 --- a/docs/脚本/SqlServer/浏览按钮sqlserver.sql +++ b/docs/脚本/SqlServer/浏览按钮sqlserver.sql @@ -58,8 +58,8 @@ select @current_time = CONVERT(varchar(100), GETDATE(), 24) 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, '', '', @current_date, @current_time, NULL, NULL, '', '', '0', newid(), '', '', '', '', '1', 0, 1) set @datashowset_id = (select max(id) from datashowset) INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, @current_date, @current_time, NULL, NULL) -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 1, 1, newid(), NULL) -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 0, 2, newid(), NULL) +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 0, 1, newid(), NULL) +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 1, 2, newid(), 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, newid(), NULL) INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'post_info_no', '2', '', 1, newid(), '') INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_info_name', '2', '', 2, newid(), '') diff --git a/docs/脚本/SqlServer/表结构、基础数据.sql b/docs/脚本/SqlServer/表结构、基础数据.sql index df806b9b..44f81814 100644 --- a/docs/脚本/SqlServer/表结构、基础数据.sql +++ b/docs/脚本/SqlServer/表结构、基础数据.sql @@ -109,6 +109,7 @@ CREATE TABLE [dbo].[JCL_ORG_COMP] ( [comp_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [comp_name_short] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [parent_company] int NULL, + [ec_company] int NULL, [org_code] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [industry] int NULL, [comp_principal] int NULL, @@ -170,7 +171,9 @@ CREATE TABLE [dbo].[JCL_ORG_DEPT] ( [dept_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [dept_name_short] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [parent_comp] int NULL, + [ec_company] int NULL, [parent_dept] int NULL, + [ec_department] int NULL, [dept_principal] int NULL, [show_order] int NULL, [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, @@ -589,7 +592,9 @@ CREATE TABLE [dbo].[JCL_ORG_STAFF] ( [id] int IDENTITY(1,1) NOT NULL, [plan_id] int NULL, [comp_id] int NULL, + [ec_company] int NULL, [dept_id] int NULL, + [ec_department] int NULL, [job_id] int NULL, [staff_num] int NULL, [control_policy] int NULL, @@ -621,6 +626,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFFPLAN] ( [time_start] datetime NULL, [time_end] datetime NULL, [company_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, + [ec_company] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [control_dimension] varchar(5) COLLATE Chinese_PRC_CI_AS NULL, [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL,