liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!103 生产合并 

Merge pull request !103 from reset/develop
This commit is contained in:
reset 2022-06-20 06:13:46 +00:00 committed by Gitee
parent 6df0c69c56 30d44f029b
commit 023833490c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
227 changed files with 4988 additions and 1538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
docs/权限SQL/权限插入SQL.sql Normal file
View File

@ -0,0 +1,71 @@
-- 等级方案
insert into SystemRights (id,rightdesc,righttype) values (-20220601,'等级方案权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220601,7,'等级方案权限','等级方案权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220601,8,'Scheme Right','Scheme Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220601,'等级方案权限','Scheme:All',-20220601) ;
-- 职等
insert into SystemRights (id,rightdesc,righttype) values (-20220602,'职等权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220602,7,'职等权限','职等权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220602,8,'Level Right','Level Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220602,'职等权限','Level:All',-20220602) ;
-- 职级
insert into SystemRights (id,rightdesc,righttype) values (-20220603,'职级权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220603,7,'职级权限','职级权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220603,8,'Grade Right','Grade Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220603,'职级权限','Grade:All',-20220603) ;
-- 岗位序列
insert into SystemRights (id,rightdesc,righttype) values (-20220604,'岗位序列权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220604,7,'岗位序列权限','岗位序列权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220604,8,'Sequence Right','Sequence Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220604,'岗位序列权限','Sequence:All',-20220604) ;
-- 职务分类
insert into SystemRights (id,rightdesc,righttype) values (-20220605,'职务分类权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220605,7,'职务分类权限','职务分类权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220605,8,'Post Right','Post Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220605,'职务分类权限','Post:All',-20220605) ;
-- 职务信息
insert into SystemRights (id,rightdesc,righttype) values (-20220606,'职务信息权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220606,7,'职务信息权限','职务信息权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220606,8,'PostInfo Right','PostInfo Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220606,'职务信息权限','PostInfo:All',-20220606) ;
-- 集团管理
insert into SystemRights (id,rightdesc,righttype) values (-20220607,'集团管理权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220607,7,'集团管理权限','集团管理权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220607,8,'Group Right','Group Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220607,'集团管理权限','Group:All',-20220607) ;
-- 公司/分部管理
insert into SystemRights (id,rightdesc,righttype) values (-20220608,'公司/分部管理权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220608,7,'公司/分部管理权限','公司/分部管理权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220608,8,'Company Right','Company Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220608,'公司/分部管理权限','Company:All',-20220608) ;
-- 部门管理
insert into SystemRights (id,rightdesc,righttype) values (-20220609,'部门管理权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220609,7,'部门管理权限','部门管理权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220609,8,'Department Right','Department Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220609,'部门管理权限','Department:All',-20220609) ;
-- 岗位管理
insert into SystemRights (id,rightdesc,righttype) values (-20220610,'岗位管理权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220610,7,'岗位管理权限','岗位管理权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220610,8,'Job Right','Job Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220610,'岗位管理权限','Job:All',-20220610) ;
-- 编制方案
insert into SystemRights (id,rightdesc,righttype) values (-20220611,'编制方案权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220611,7,'编制方案权限','编制方案权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220611,8,'StaffPlan Right','StaffPlan Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220611,'编制方案权限','StaffPlan:All',-20220611) ;
-- 编制表
insert into SystemRights (id,rightdesc,righttype) values (-20220612,'编制表权限','0');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220612,7,'编制表权限','编制表权限');
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220612,8,'Staff Right','Staff Right');
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220612,'编制表权限','Staff:All',-20220612) ;

120
docs/表结构SQL/MySQL.sql
View File

@ -5,7 +5,7 @@ CREATE TABLE JCL_ORG_SCHEME (
scheme_name varchar(100) NULL,
scheme_description text NULL,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -20,7 +20,7 @@ CREATE TABLE JCL_ORG_LEVEL (
description text NULL,
scheme_id int null,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -36,7 +36,7 @@ CREATE TABLE JCL_ORG_GRADE (
scheme_id int null,
level_id varchar(100) null,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -52,7 +52,7 @@ CREATE TABLE JCL_ORG_SEQUENCE (
description text NULL,
scheme_id int null,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -66,7 +66,7 @@ CREATE TABLE JCL_ORG_POST (
post_no varchar(100) null,
post_name varchar(100) NULL,
description text NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -85,7 +85,7 @@ CREATE TABLE JCL_ORG_POST_INFO (
post_id int null,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -105,7 +105,7 @@ CREATE TABLE JCL_ORG_COMP (
comp_principal int null,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -116,8 +116,10 @@ CREATE TABLE JCL_ORG_COMP (
-- JCL_FIELD_EXTENDGROUP
CREATE TABLE JCL_FIELD_EXTENDGROUP (
id int auto_increment NOT NULL,
pid int null,
extend_type int null,
group_name varchar(100) NULL,
show_order int null,
creator int null,
delete_type int null,
create_time date null,
@ -125,6 +127,20 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP (
CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDTITLE
create table JCL_FIELD_EXTENDTITLE (
id int auto_increment not null,
group_id int null,
title varchar(100) null,
show_order int null,
is_show int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
constraint JCL_FIELD_EXTENDTITLE_PK primary key (id)
);
-- JCL_FIELD_EXTENDINFO
CREATE TABLE JCL_FIELD_EXTENDINFO (
id int auto_increment NOT NULL,
@ -134,6 +150,8 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
field_name_desc varchar(100) NULL,
field_type varchar(1000) NULL,
control_type int null,
browser_type varchar(100) NULL,
custom_value text null,
extend_group_id int null,
isenable int null,
isrequired int null,
@ -141,7 +159,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
search_show int null,
edit_show int null,
add_show int null,
browser_show int null,
browser_show int null,
show_order int null,
creator int null,
delete_type int null,
@ -152,7 +170,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
-- JCL_ORG_COMPEXT
CREATE TABLE JCL_ORG_COMPEXT (
id int auto_increment NOT NULL,
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
@ -183,7 +201,7 @@ CREATE TABLE JCL_ORG_DEPT (
show_order int null,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -191,14 +209,14 @@ CREATE TABLE JCL_ORG_DEPT (
CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id)
);
-- JCL_ORG_DEPTPEXT
CREATE TABLE JCL_ORG_DEPTPEXT (
id int auto_increment NOT NULL,
-- JCL_ORG_DEPTEXT
CREATE TABLE JCL_ORG_DEPTEXT (
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_DEPTPEXT_PK PRIMARY KEY (id)
CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (id)
);
-- JCL_ORG_DEPTEXT_DT1
@ -228,7 +246,7 @@ CREATE TABLE JCL_ORG_JOB (
work_duty text null,
work_authority text null,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -240,8 +258,10 @@ CREATE TABLE JCL_ORG_JOB (
CREATE TABLE JCL_ORG_JOBDT (
id int auto_increment NOT NULL,
mainid int NULL,
level_id int null,
grade_id int null,
level_id varchar(100) NULL,
grade_id varchar(100) NULL,
level_id_span varchar(1000) NULL,
grade_id_span varchar(1000) NULL,
creator int null,
delete_type int null,
create_time date null,
@ -249,14 +269,14 @@ CREATE TABLE JCL_ORG_JOBDT (
CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (id)
);
-- JCL_ORG_JOBPEXT
CREATE TABLE JCL_ORG_JOBPEXT (
id int auto_increment NOT NULL,
-- JCL_ORG_JOBEXT
CREATE TABLE JCL_ORG_JOBEXT (
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_JOBPEXT_PK PRIMARY KEY (id)
CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (id)
);
-- JCL_ORG_JOBEXT_DT1
@ -282,7 +302,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
company_id varchar(100) NULL,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -304,7 +324,7 @@ CREATE TABLE JCL_ORG_STAFF (
lack_status int null,
staff_desc varchar(100) NULL,
description text null,
is_used int not null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
@ -325,56 +345,4 @@ CREATE TABLE JCL_ORG_STAFFS (
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id)
);
--JCL_CODERULE
CREATE TABLE JCL_CODERULE (
id int auto_increment NOT NULL,
serial_type varchar(50) null,
serial_enable char(1) null,
oneself_type varchar(50) null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_CODERULE PRIMARY KEY (id)
);
--JCL_CODERULE_DETAIL
CREATE TABLE JCL_CODERULE_DETAIL (
id int auto_increment NOT NULL,
coderule_id int(11) null,
rule_type varchar(50) null,
rule_value varchar(255) null,
show_order int(11) null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_CODERULE_DETAIL PRIMARY KEY (id)
);
--JCL_CODERULE_RESERVED
CREATE TABLE JCL_CODERULE_RESERVED (
id int auto_increment NOT NULL,
coderule_id int(11) null,
reserved_code varchar(255) null,
reserved_desc varchar (1000) null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (id)
);
);

138
docs/表结构SQL/Oracle.sql
View File

@ -5,6 +5,7 @@ CREATE TABLE JCL_ORG_SCHEME (
SCHEME_NAME NVARCHAR2(100) NULL,
SCHEME_DESCRIPTION NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -19,6 +20,7 @@ CREATE TABLE JCL_ORG_LEVEL (
DESCRIPTION NVARCHAR2(1000) NULL,
SCHEME_ID NUMBER NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -35,6 +37,7 @@ CREATE TABLE JCL_ORG_GRADE (
SCHEME_ID NUMBER NULL,
LEVEL_ID NVARCHAR2(100) NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -51,6 +54,7 @@ CREATE TABLE JCL_ORG_SEQUENCE (
DESCRIPTION NVARCHAR2(1000) NULL,
SCHEME_ID NUMBER NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -64,6 +68,7 @@ CREATE TABLE JCL_ORG_POST (
POST_NO NVARCHAR2(100) NULL,
POST_NAME NVARCHAR2(100) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -81,7 +86,8 @@ CREATE TABLE JCL_ORG_POST_INFO (
POST_INFO_QUALIFICATION NVARCHAR2(1000) NULL,
POST_ID NUMBER NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -101,6 +107,7 @@ CREATE TABLE JCL_ORG_COMP (
COMP_PRINCIPAL NUMBER NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -111,8 +118,10 @@ CREATE TABLE JCL_ORG_COMP (
-- JCL_FIELD_EXTENDGROUP
CREATE TABLE JCL_FIELD_EXTENDGROUP (
ID NUMBER NOT NULL,
EXTEND_TYPE NUMBER NULL,
PID NUMBER NULL,
EXTEND_TYPE NUMBER NULL,
GROUP_NAME NVARCHAR2(100) NULL,
SHOW_ORDER NUMBER null,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -120,6 +129,20 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP (
CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (ID)
);
-- JCL_FIELD_EXTENDTITLE
CREATE TABLE JCL_FIELD_EXTENDTITLE (
ID NUMBER NOT NULL,
GROUP_ID NUMBER NULL,
TITLE VARCHAR(100) NULL,
SHOW_ORDER NUMBER NULL,
IS_SHOW NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (ID)
);
-- JCL_FIELD_EXTENDINFO
CREATE TABLE JCL_FIELD_EXTENDINFO (
ID NUMBER NOT NULL,
@ -129,6 +152,8 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
FIELD_NAME_DESC NVARCHAR2(100) NULL,
FIELD_TYPE NVARCHAR2(1000) NULL,
CONTROL_TYPE NUMBER NULL,
CUSTOM_VALUE NVARCHAR2(1000) NULL,
BROWSER_TYPE NVARCHAR2(100) NULL,
EXTEND_GROUP_ID NUMBER NULL,
ISENABLE NUMBER NULL,
ISREQUIRED NUMBER NULL,
@ -178,6 +203,7 @@ CREATE TABLE JCL_ORG_DEPT (
SHOW_ORDER NUMBER NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -185,51 +211,14 @@ CREATE TABLE JCL_ORG_DEPT (
CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (ID)
);
-- JCL_FIELD_EXTENDGROUP_DEPT
CREATE TABLE JCL_FIELD_EXTENDGROUP_DEPT (
ID NUMBER NOT NULL,
EXTEND_TYPE NUMBER NULL,
GROUP_NAME NVARCHAR2(100) NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_FIELD_EXTENDGROUP_DEPT_PK PRIMARY KEY (ID)
);
-- JCL_FIELD_EXTENDINFO_DEPT
CREATE TABLE JCL_FIELD_EXTENDINFO_DEPT (
ID NUMBER NOT NULL,
EXTEND_TYPE NUMBER NULL,
TABLE_NAME NVARCHAR2(100) NULL,
FIELD_NAME NVARCHAR2(100) NULL,
FIELD_NAME_DESC NVARCHAR2(100) NULL,
FIELD_TYPE NVARCHAR2(1000) NULL,
CONTROL_TYPE NUMBER NULL,
EXTEND_GROUP NUMBER NULL,
ISENABLE NUMBER NULL,
ISREQUIRED NUMBER NULL,
LIST_SHOW NUMBER NULL,
SEARCH_SHOW NUMBER NULL,
EDIT_SHOW NUMBER NULL,
ADD_SHOW NUMBER NULL,
BUTTON_SHOW NUMBER NULL,
SHOW_ORDER NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_FIELD_EXTENDINFO_DEPT_PK PRIMARY KEY (ID)
);
-- JCL_ORG_DEPTPEXT
CREATE TABLE JCL_ORG_DEPTPEXT (
-- JCL_ORG_DEPTEXT
CREATE TABLE JCL_ORG_DEPTEXT (
ID NUMBER NOT NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_DEPTPEXT_PK PRIMARY KEY (ID)
CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (ID)
);
-- JCL_ORG_DEPTEXT_DT1
@ -259,6 +248,7 @@ CREATE TABLE JCL_ORG_JOB (
WORK_DUTY NVARCHAR2(1000) NULL,
WORK_AUTHORITY NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -270,60 +260,25 @@ CREATE TABLE JCL_ORG_JOB (
CREATE TABLE JCL_ORG_JOBDT (
ID NUMBER NOT NULL,
MAINID NUMBER NULL,
LEVEL_ID NUMBER NULL,
GRADE_ID NUMBER NULL,
LEVEL_ID NVARCHAR2(100) NULL,
GRADE_ID NVARCHAR2(100) NULL,
LEVEL_ID_SPAN NVARCHAR2(1000) NULL,
GRADE_ID_SPAN NVARCHAR2(1000) NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT CL_ORG_DEPTPEXT_PK PRIMARY KEY (ID)
CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (ID)
);
-- JCL_FIELD_EXTENDGROUP_JOB
CREATE TABLE JCL_FIELD_EXTENDGROUP_JOB (
ID NUMBER NOT NULL,
EXTEND_TYPE NUMBER NULL,
GROUP_NAME NVARCHAR2(100) NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_FIELD_EXTENDGROUP_JOB_PK PRIMARY KEY (ID)
);
-- JCL_FIELD_EXTENDINFO_JOB
CREATE TABLE JCL_FIELD_EXTENDINFO_JOB (
ID NUMBER NOT NULL,
EXTEND_TYPE NUMBER NULL,
TABLE_NAME NVARCHAR2(100) NULL,
FIELD_NAME NVARCHAR2(100) NULL,
FIELD_NAME_DESC NVARCHAR2(100) NULL,
FIELD_TYPE NVARCHAR2(1000) NULL,
CONTROL_TYPE NUMBER NULL,
EXTEND_GROUP NUMBER NULL,
ISENABLE NUMBER NULL,
ISREQUIRED NUMBER NULL,
LIST_SHOW NUMBER NULL,
SEARCH_SHOW NUMBER NULL,
EDIT_SHOW NUMBER NULL,
ADD_SHOW NUMBER NULL,
BUTTON_SHOW NUMBER NULL,
SHOW_ORDER NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_FIELD_EXTENDINFO_JOB_PK PRIMARY KEY (ID)
);
-- JCL_ORG_JOBPEXT
CREATE TABLE JCL_ORG_JOBPEXT (
-- JCL_ORG_JOBEXT
CREATE TABLE JCL_ORG_JOBEXT (
ID NUMBER NOT NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_JOBPEXT_PK PRIMARY KEY (ID)
CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (ID)
);
-- JCL_ORG_JOBEXT_DT1
@ -348,6 +303,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
COMPANY_ID NVARCHAR2(100) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -369,6 +325,7 @@ CREATE TABLE JCL_ORG_STAFF (
LACK_STATUS NUMBER NULL,
STAFF_DESC NVARCHAR2(100) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
@ -389,13 +346,4 @@ CREATE TABLE JCL_ORG_STAFFS (
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (ID)
);
);

234
docs/表结构SQL/SqlServer.sql
View File

@ -5,10 +5,11 @@ CREATE TABLE JCL_ORG_SCHEME (
scheme_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
scheme_description text COLLATE Chinese_PRC_CI_AS NULL,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_SCHEME_PK PRIMARY KEY (id)
);
-- JCL_ORG_LEVEL
@ -19,10 +20,11 @@ CREATE TABLE JCL_ORG_LEVEL (
description text COLLATE Chinese_PRC_CI_AS NULL,
scheme_id int null,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_LEVEL_PK PRIMARY KEY (id)
);
-- JCL_ORG_GRADE
@ -34,10 +36,11 @@ CREATE TABLE JCL_ORG_GRADE (
scheme_id int null,
level_id varchar(100) null,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_GRADE_PK PRIMARY KEY (id)
);
@ -49,10 +52,11 @@ CREATE TABLE JCL_ORG_SEQUENCE (
description text COLLATE Chinese_PRC_CI_AS NULL,
scheme_id int null,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_SEQUENCE_PK PRIMARY KEY (id)
);
@ -62,10 +66,11 @@ CREATE TABLE JCL_ORG_POST (
post_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
post_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
description text COLLATE Chinese_PRC_CI_AS NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_POST_PK PRIMARY KEY (id)
);
@ -79,11 +84,12 @@ CREATE TABLE JCL_ORG_POST_INFO (
post_info_qualification text null,
post_id int null,
description text COLLATE Chinese_PRC_CI_AS NULL,
forbidden_tag int NULL,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_POST_INFO_PK PRIMARY KEY (id)
);
@ -99,25 +105,42 @@ CREATE TABLE JCL_ORG_COMP (
comp_principal int null,
description text COLLATE Chinese_PRC_CI_AS NULL,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_COMP_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDGROUP
CREATE TABLE JCL_FIELD_EXTENDGROUP (
id int IDENTITY(1,1) NOT NULL,
pid int null,
extend_type int null,
group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
show_order int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDTITLE
create table JCL_FIELD_EXTENDTITLE (
id int IDENTITY(1,1) NOT NULL,
group_id int null,
title varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
show_order int null,
is_show int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDINFO
CREATE TABLE JCL_FIELD_EXTENDINFO (
id int IDENTITY(1,1) NOT NULL,
@ -127,6 +150,8 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
control_type int null,
custom_value text null,
browser_type varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
extend_group_id int null,
isenable int null,
isrequired int null,
@ -138,18 +163,18 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
show_order int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_FIELD_EXTENDINFO_PK PRIMARY KEY (id)
);
-- JCL_ORG_COMPEXT
CREATE TABLE JCL_ORG_COMPEXT (
id int IDENTITY(1,1) NOT NULL,
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_COMPEXT_PK PRIMARY KEY (id)
);
@ -159,8 +184,8 @@ CREATE TABLE JCL_ORG_COMPEXT_DT1 (
mainid int NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_COMPEXT_DT1_PK PRIMARY KEY (id)
);
@ -176,58 +201,22 @@ CREATE TABLE JCL_ORG_DEPT (
show_order int null,
description text COLLATE Chinese_PRC_CI_AS NULL,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDGROUP_DEPT
CREATE TABLE JCL_FIELD_EXTENDGROUP_DEPT (
id int IDENTITY(1,1) NOT NULL,
extend_type int null,
group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
-- JCL_ORG_DEPTEXT
CREATE TABLE JCL_ORG_DEPTEXT (
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_FIELD_EXTENDGROUP_DEPT_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDINFO_DEPT
CREATE TABLE JCL_FIELD_EXTENDINFO_DEPT (
id int IDENTITY(1,1) NOT NULL,
extend_type int null,
table_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
control_type int null,
extend_group int null,
isenable int null,
isrequired int null,
list_show int null,
search_show int null,
edit_show int null,
add_show int null,
button_show int null,
show_order int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_FIELD_EXTENDINFO_DEPT_PK PRIMARY KEY (id)
);
-- JCL_ORG_DEPTPEXT
CREATE TABLE JCL_ORG_DEPTPEXT (
id int IDENTITY(1,1) NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_DEPTPEXT_PK PRIMARY KEY (id)
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (id)
);
-- JCL_ORG_DEPTEXT_DT1
@ -236,8 +225,8 @@ CREATE TABLE JCL_ORG_DEPTEXT_DT1 (
mainid int NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_DEPTEXT_DT1_PK PRIMARY KEY (id)
);
@ -248,7 +237,7 @@ CREATE TABLE JCL_ORG_JOB (
job_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
parent_comp int null,
parent_dept int null,
sequence_id int null,
sequence_id int null,
scheme_id int null,
parent_job int null,
is_key int null,
@ -257,10 +246,11 @@ CREATE TABLE JCL_ORG_JOB (
work_duty text null,
work_authority text null,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_JOB_PK PRIMARY KEY (id)
);
@ -268,60 +258,25 @@ CREATE TABLE JCL_ORG_JOB (
CREATE TABLE JCL_ORG_JOBDT (
id int IDENTITY(1,1) NOT NULL,
mainid int NULL,
level_id int null,
grade_id int null,
level_id varchar(100) NULL,
grade_id varchar(100) NULL,
level_id_span varchar(1000) NULL,
grade_id_span varchar(1000) NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT CL_ORG_DEPTPEXT_PK PRIMARY KEY (id)
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDGROUP_JOB
CREATE TABLE JCL_FIELD_EXTENDGROUP_JOB (
id int IDENTITY(1,1) NOT NULL,
extend_type int null,
group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
-- JCL_ORG_JOBEXT
CREATE TABLE JCL_ORG_JOBEXT (
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_FIELD_EXTENDGROUP_JOB_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDINFO_JOB
CREATE TABLE JCL_FIELD_EXTENDINFO_JOB (
id int IDENTITY(1,1) NOT NULL,
extend_type int null,
table_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
control_type int null,
extend_group int null,
isenable int null,
isrequired int null,
list_show int null,
search_show int null,
edit_show int null,
add_show int null,
button_show int null,
show_order int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_FIELD_EXTENDINFO_JOB_PK PRIMARY KEY (id)
);
-- JCL_ORG_JOBPEXT
CREATE TABLE JCL_ORG_JOBPEXT (
id int IDENTITY(1,1) NOT NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_JOBPEXT_PK PRIMARY KEY (id)
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (id)
);
-- JCL_ORG_JOBEXT_DT1
@ -330,8 +285,8 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 (
mainid int NULL,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_JOBEXT_DT1_PK PRIMARY KEY (id)
);
@ -342,15 +297,16 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
plan_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
plan_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
plan_year varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
time_start date NULL,
time_end date NULL,
time_start datetime null,
time_end datetime null,
company_id varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
description text NULL,
forbidden_tag int NULL,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_STAFFPLAN_PK PRIMARY KEY (id)
);
@ -367,11 +323,12 @@ CREATE TABLE JCL_ORG_STAFF (
freeze_num int null,
lack_status int null,
staff_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
description text null,
description text null,
is_used int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_STAFF_PK PRIMARY KEY (id)
);
@ -385,16 +342,7 @@ CREATE TABLE JCL_ORG_STAFFS (
requestid int null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
create_time datetime null,
update_time datetime null,
CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id)
);
);

2
src/com/api/organization/web/CodeSettingController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/30
* @Version V1.0
**/

2
src/com/api/organization/web/CompController.java
View File

@ -3,7 +3,7 @@ package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/17
* @version: 1.0

2
src/com/api/organization/web/DemoController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/4/26
* @Version V1.0
**/

2
src/com/api/organization/web/DepartmentController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/20
* @Version V1.0
**/

13
src/com/api/organization/web/FieldDefinedController.java Normal file
View File

@ -0,0 +1,13 @@
package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @Author weaver_cl
* @Description:
* @Date 2022/6/13
* @Version V1.0
**/
@Path("/bs/hrmorganization/fieldDefined")
public class FieldDefinedController extends com.engine.organization.web.FieldDefinedController {
}

2
src/com/api/organization/web/GradeController.java
View File

@ -3,7 +3,7 @@ package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/11
* @version: 1.0

2
src/com/api/organization/web/GroupController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/16
* @version: 1.0

2
src/com/api/organization/web/JobController.java
View File

@ -3,7 +3,7 @@ package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/27
* @version: 1.0

2
src/com/api/organization/web/LevelController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/10
* @version: 1.0

2
src/com/api/organization/web/PostController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/api/organization/web/PostInfoController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/api/organization/web/SchemeController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/10
* @version: 1.0

2
src/com/api/organization/web/SequenceController.java
View File

@ -4,7 +4,7 @@ import javax.ws.rs.Path;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/12
* @version: 1.0

2
src/com/api/organization/web/StaffController.java
View File

@ -3,7 +3,7 @@ package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0

2
src/com/api/organization/web/StaffPlanController.java
View File

@ -3,7 +3,7 @@ package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0

2
src/com/engine/organization/annotation/CheckboxPopedom.java
View File

@ -4,7 +4,7 @@ import java.lang.annotation.*;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/30
* @Version V1.0
**/

2
src/com/engine/organization/annotation/Log.java
View File

@ -6,7 +6,7 @@ import java.lang.annotation.*;
/**
* @Author dxfeng
* @Description: TODO
* @Description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/annotation/OperatePopedom.java
View File

@ -4,7 +4,7 @@ import java.lang.annotation.*;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/30
* @Version V1.0
**/

2
src/com/engine/organization/annotation/OrganizationTable.java
View File

@ -8,7 +8,7 @@ import java.lang.annotation.*;
/**
* @Author dxfeng
* @Description: TODO
* @Description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/annotation/OrganizationTableColumn.java
View File

@ -4,7 +4,7 @@ import java.lang.annotation.*;
/**
* @Author dxfeng
* @Description: TODO
* @Description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/annotation/OrganizationTableOperate.java
View File

@ -4,7 +4,7 @@ import java.lang.annotation.*;
/**
* @Author dxfeng
* @Description: TODO
* @Description:
* @Date 2022/5/9
* @Version V1.0
**/

6
src/com/engine/organization/entity/DeleteParam.java
View File

@ -9,12 +9,11 @@ import weaver.general.StringUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/9
* @Version V1.0
**/
@ -29,8 +28,7 @@ public class DeleteParam {
if(StringUtil.isEmpty(ids)){
return new ArrayList<>();
}
List<Long> collect = Arrays.stream(ids.split(",")).map(item -> Long.parseLong(item)).collect(Collectors.toList());
return collect;
return Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
}
}

2
src/com/engine/organization/entity/LoggerContext.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* @Author weaver_cl
* @Description: TODO 日志实体类 hr_log
* @description: 日志实体类 hr_log
* @Date 2022/4/27
* @Version V1.0
**/

116
src/com/engine/organization/entity/SelectOptionParam.java Normal file
View File

@ -0,0 +1,116 @@
package com.engine.organization.entity;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.api.browser.bean.SearchConditionOption;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
* @author:dxfeng
* @createTime: 2022/06/13
* @version: 1.0
*/
public class SelectOptionParam {
/**
* 下拉框Json转换
*
* @param customValue
* @return
*/
public static List<SearchConditionOption> convertJsonToListOption(String customValue) {
List<SearchConditionOption> selectOptions = new ArrayList<>();
JSONArray objects = JSONObject.parseArray(customValue);
if (objects.size() < 3) {
return selectOptions;
}
JSONObject o = (JSONObject) objects.get(2);
JSONArray datas = o.getJSONArray("datas");
if (!datas.isEmpty()) {
int size = datas.size();
for (int i = 0; i < size; i++) {
JSONObject jsonObject = (JSONObject) datas.get(i);
SearchConditionOption option = new SearchConditionOption(StringUtils.isEmpty(jsonObject.getString("key")) ? i + "" : jsonObject.getString("key"), jsonObject.getString("option"));
selectOptions.add(option);
}
}
return selectOptions;
}
/**
* 获取自定义浏览按钮标识
*
* @param customValue
* @return
*/
public static String getCustomBrowserId(String customValue) {
try {
JSONArray objects = JSONObject.parseArray(customValue);
if (null != objects && objects.size() > 2) {
JSONObject object = (JSONObject) objects.get(2);
return object.getString("value");
}
} catch (Exception e) {
}
return customValue;
}
/**
* 获取自定义浏览按钮标识
*
* @param customValue
* @return
*/
public static String getCustomBrowserValueSpan(String customValue) {
JSONArray objects = JSONObject.parseArray(customValue);
if (null != objects && objects.size() > 2) {
JSONObject object = (JSONObject) objects.get(2);
return object.getString("valueSpan");
}
return customValue;
}
/**
* 获取文本长度
*
* @param customValue
* @return
*/
public static String getTextLength(String customValue) {
JSONArray objects = JSONObject.parseArray(customValue);
if (null != objects && objects.size() > 2) {
return objects.get(2).toString();
}
return customValue;
}
/**
* 获取下拉框信息
*
* @param customValue
* @return
*/
public static List<Object> getSelectFields(String customValue) {
List<Object> selectFields = new ArrayList<>();
JSONArray objects = JSONObject.parseArray(customValue);
if (objects.size() < 3) {
return selectFields;
}
JSONObject o = (JSONObject) objects.get(2);
JSONArray datas = o.getJSONArray("datas");
if (!datas.isEmpty()) {
int size = datas.size();
for (int i = 0; i < size; i++) {
selectFields.add(datas.get(i));
}
}
return selectFields;
}
}

2
src/com/engine/organization/entity/TopTab.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/11
* @version: 1.0

2
src/com/engine/organization/entity/TreeData.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.ArrayList;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/codesetting/bo/CodeSettingBO.java
View File

@ -15,7 +15,7 @@ import java.util.stream.Collectors;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/31
* @Version V1.0
**/

2
src/com/engine/organization/entity/codesetting/param/CodeBaseParam.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/31
* @Version V1.0
**/

2
src/com/engine/organization/entity/codesetting/param/CodeSaveDetailParam.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/31
* @Version V1.0
**/

2
src/com/engine/organization/entity/codesetting/param/CodeSaveParam.java
View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/31
* @Version V1.0
**/

2
src/com/engine/organization/entity/codesetting/po/CodeRuleDetailPO.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/30
* @Version V1.0
**/

2
src/com/engine/organization/entity/codesetting/po/CodeRulePO.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/30
* @Version V1.0
**/

2
src/com/engine/organization/entity/codesetting/po/CodeRuleReservedPO.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
/**
* @Author weaver_cl
* @Description: TODO
* @Description:
* @Date 2022/5/31
* @Version V1.0
**/

38
src/com/engine/organization/entity/company/bo/CompBO.java
View File

@ -1,6 +1,5 @@
package com.engine.organization.entity.company.bo;
import com.api.hrm.bean.TreeNode;
import com.engine.organization.entity.company.dto.CompListDTO;
import com.engine.organization.entity.company.param.CompSearchParam;
import com.engine.organization.entity.company.po.CompPO;
@ -16,7 +15,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/16
* @version: 1.0
@ -27,7 +26,20 @@ public class CompBO {
Map<Long, CompPO> poMaps = list.stream().collect(Collectors.toMap(CompPO::getId, item -> item));
List<CompListDTO> dtoList = list.stream().map(e -> CompListDTO.builder().id(e.getId()).compNo(e.getCompNo()).compName(e.getCompName()).compNameShort(e.getCompNameShort()).parentCompany(e.getParentCompany()).parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName()).orgCode(e.getOrgCode()).industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")).compPrincipal(getUserNameById(e.getCompPrincipal() + "")).forbiddenTag(e.getForbiddenTag()).build()).collect(Collectors.toList());
List<CompListDTO> dtoList = list.stream().map(e ->
CompListDTO
.builder()
.id(e.getId())
.compNo(e.getCompNo())
.compName(e.getCompName())
.compNameShort(e.getCompNameShort())
.parentCompany(e.getParentCompany())
.parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName())
.orgCode(e.getOrgCode())
.industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + ""))
.compPrincipal(getUserNameById(e.getCompPrincipal() + ""))
.forbiddenTag(e.getForbiddenTag())
.build()).collect(Collectors.toList());
Map<Long, List<CompListDTO>> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany));
// 处理被引用数据
List<String> usedIds = MapperProxyFactory.getProxy(CompMapper.class).listUsedId();
@ -66,11 +78,27 @@ public class CompBO {
if (null == param) {
return null;
}
return CompPO.builder().id(param.getId() == null ? 0 : param.getId()).compNo(param.getCompNo()).compName(param.getCompName()).compNameShort(param.getCompNameShort()).parentCompany(param.getParentCompany()).orgCode(param.getOrgCode()).industry(param.getIndustry()).compPrincipal(param.getCompPrincipal()).description(param.getDescription()).forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1).deleteType(0).createTime(new Date()).updateTime(new Date()).creator(employeeId).build();
return CompPO
.builder()
.id(param.getId() == null ? 0 : param.getId())
.compNo(param.getCompNo())
.compName(param.getCompName())
.compNameShort(param.getCompNameShort())
.parentCompany(param.getParentCompany())
.orgCode(param.getOrgCode())
.industry(param.getIndustry())
.compPrincipal(param.getCompPrincipal())
.description(param.getDescription())
.forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)
.deleteType(0)
.createTime(new Date())
.updateTime(new Date())
.creator(employeeId)
.build();
}
public static List<TreeNode> buildSetToSearchTree(Set<CompPO> comps) {
public static List<SearchTree> buildSetToSearchTree(Set<CompPO> comps) {
return comps.stream().map(item -> {
SearchTree tree = new SearchTree();
tree.setCanClick(true);

2
src/com/engine/organization/entity/company/dto/CompListDTO.java
View File

@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
import java.util.List;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/16
* @version: 1.0

2
src/com/engine/organization/entity/company/param/CompSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/16
* @version: 1.0

2
src/com/engine/organization/entity/company/po/CompPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/16
* @version: 1.0

31
src/com/engine/organization/entity/department/bo/DepartmentBO.java
View File

@ -5,6 +5,7 @@ import com.engine.organization.entity.department.param.DeptSearchParam;
import com.engine.organization.entity.department.po.DepartmentPO;
import com.engine.organization.entity.department.vo.SingleDeptTreeVO;
import com.engine.organization.entity.searchtree.SearchTree;
import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.mapper.department.DepartmentMapper;
import com.engine.organization.mapper.employee.EmployeeMapper;
import com.engine.organization.util.db.MapperProxyFactory;
@ -15,7 +16,7 @@ import java.util.stream.Collectors;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/5/20
* @Version V1.0
**/
@ -32,13 +33,13 @@ public class DepartmentBO {
.deptNo(e.getDeptNo())
.deptName(e.getDeptName())
.deptNameShort(e.getDeptNameShort())
.parentComp(e.getParentComp() + "")// 命名
.parentComp(null == e.getParentComp() ? "" : MapperProxyFactory.getProxy(CompMapper.class).listById(e.getParentComp()).getCompName())
.parentDept(e.getParentDept())
.parentDeptName(null == poMaps.get(e.getParentDept()) ? "" : poMaps.get(e.getParentDept())
.getDeptName()).deptPrincipal(getEmployeeNameById(e.getDeptPrincipal()))
.parentDeptName(null == poMaps.get(e.getParentDept()) ? "" : poMaps.get(e.getParentDept()).getDeptName())
.deptPrincipal(getEmployeeNameById(e.getDeptPrincipal()))
.showOrder(null == e.getShowOrder() ? 0 : e.getShowOrder())
.forbiddenTag(e.getForbiddenTag())
.build()).collect(Collectors.toList());
.build() ).collect(Collectors.toList());
Map<Long, List<DepartmentListDTO>> collects = dtoList.stream().filter(item -> null != item.getParentDept() && 0 != item.getParentDept()).collect(Collectors.groupingBy(DepartmentListDTO::getParentDept));
// 处理被引用数据
List<String> usedIds = MapperProxyFactory.getProxy(DepartmentMapper.class).listUsedId();
@ -80,14 +81,15 @@ public class DepartmentBO {
.builder()
.id(param.getId() == null ? 0 : param.getId())
.deptNo(param.getDeptNo())
.deptName(param.getDeptName())
.deptName(param.getDepartmentName())
.deptNameShort(param.getDeptNameShort())
.parentComp(param.getParentComp())
.parentDept(param.getParentDept())
.parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp())
.parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept())
.deptPrincipal(param.getDeptPrincipal())
.showOrder(param.getShowOrder())
.forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)
.description(param.getDescription()).deleteType(0)
.description(param.getDescription())
.deleteType(0)
.createTime(new Date())
.updateTime(new Date())
.creator(employeeId)
@ -100,7 +102,16 @@ public class DepartmentBO {
return Collections.emptyList();
}
List<SingleDeptTreeVO> singleDeptTreeVOS = departmentPOs.stream().map(e -> SingleDeptTreeVO.builder().id(e.getId()).deptName(e.getDeptName()).parentComp(e.getParentComp()).parentDept(e.getParentDept()).parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue())).deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())).build()).collect(Collectors.toList());
List<SingleDeptTreeVO> singleDeptTreeVOS = departmentPOs.stream().map(e ->
SingleDeptTreeVO
.builder()
.id(e.getId())
.deptName(e.getDeptName())
.parentComp(e.getParentComp())
.parentDept(e.getParentDept())
.parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue()))
.deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal()))
.build()).collect(Collectors.toList());
//获取非一级部门
Map<Long, List<SingleDeptTreeVO>> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getParentComp()) && null != item.getParentDept()).collect(Collectors.groupingBy(SingleDeptTreeVO::getParentDept));

12
src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
View File

@ -13,7 +13,7 @@ import java.util.List;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/5/19
* @Version V1.0
**/
@ -82,11 +82,11 @@ public class DepartmentListDTO {
@TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder")
private int showOrder;
/**
* 说明
*/
@TableTitle(title = "说明", dataIndex = "description", key = "description")
private String description;
///**
// * 说明
// */
//@TableTitle(title = "说明", dataIndex = "description", key = "description")
//private String description;
/**
* 禁用标记

31
src/com/engine/organization/entity/department/param/DepartmentMergeParam.java Normal file
View File

@ -0,0 +1,31 @@
package com.engine.organization.entity.department.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/02
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DepartmentMergeParam {
/**
* 所选部门
*/
private Long id;
/**
* 合并部门
*/
private Long department;
/**
* 合并后名称
*/
private String mergeName;
}

23
src/com/engine/organization/entity/department/param/DepartmentMoveParam.java Normal file
View File

@ -0,0 +1,23 @@
package com.engine.organization.entity.department.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/02
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DepartmentMoveParam {
private Long id;
private String moveType;
private Long company;
private Long department;
}

26
src/com/engine/organization/entity/department/param/DeptCopyParam.java Normal file
View File

@ -0,0 +1,26 @@
package com.engine.organization.entity.department.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/01
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DeptCopyParam {
private String ids;
private String company;
/**
* 是否复制岗位
*/
private String copyJob;
}

8
src/com/engine/organization/entity/department/param/DeptSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/23
* @version: 1.0
@ -21,7 +21,7 @@ public class DeptSearchParam extends BaseQueryParam {
private String deptNo;
private String deptName;
private String departmentName;
private String deptNameShort;
@ -36,4 +36,8 @@ public class DeptSearchParam extends BaseQueryParam {
private String description;
private Boolean forbiddenTag;
private Long subcompanyid1;
private Long departmentid;
}

4
src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/5/20
* @Version V1.0
**/
@ -20,4 +20,6 @@ public class QuerySingleDeptListParam extends BaseQueryParam {
private Long parentComp;
private Long parentDept;
}

2
src/com/engine/organization/entity/department/po/DepartmentPO.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/5/19
* @Version V1.0
**/

2
src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java
View File

@ -12,7 +12,7 @@ import java.util.List;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/5/20
* @Version V1.0
**/

2
src/com/engine/organization/entity/employee/Employee.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/5/20
* @Version V1.0
**/

2
src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
View File

@ -1,7 +1,7 @@
package com.engine.organization.entity.employee.vo;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/31
* @version: 1.0

24
src/com/engine/organization/entity/extend/ExtendInfoOperateType.java Normal file
View File

@ -0,0 +1,24 @@
package com.engine.organization.entity.extend;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/13
* @version: 1.0
*/
public enum ExtendInfoOperateType {
LIST("list"),
SEARCH("search"),
EDIT("edit"),
ADD("add");
private String value;
ExtendInfoOperateType(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}

90
src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java Normal file
View File

@ -0,0 +1,90 @@
package com.engine.organization.entity.extend.bo;
import com.engine.organization.entity.extend.po.ExtendGroupPO;
import com.engine.organization.entity.extend.po.ExtendTitlePO;
import com.engine.organization.entity.fieldset.vo.TypeTreeVO;
import com.engine.organization.mapper.extend.ExtendTitleMapper;
import com.engine.organization.util.db.MapperProxyFactory;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Author weaver_cl
* @Description:
* @Date 2022/6/14
* @Version V1.0
**/
public class ExtendGroupBO {
public static List<TypeTreeVO> buildTypeTree(List<ExtendGroupPO> extendGroupPOS) {
if (CollectionUtils.isEmpty(extendGroupPOS)) {
return Collections.emptyList();
}
List<TypeTreeVO> typeTreeVOS = extendGroupPOS.stream().map(e ->
TypeTreeVO.builder()
.canClick(true)
.addChild(e.getPid() == null)
.domid(String.valueOf(e.getId()))
.childs(Lists.newArrayList())
.hasGroup(isHasGroup(e.getId()))
.isShow(e.getIsShow())
.key(e.getId())
.name(e.getGroupName())
.viewAttr(e.getIsSystemDefault() == 0 ? 1 : 2)
.pid(e.getPid())
.build()).collect(Collectors.toList());
//获取非一级
Map<Long, List<TypeTreeVO>> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO::getPid));
return typeTreeVOS.stream().peek(e -> {
e.setChilds(collects.get(e.getKey()));
e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0);
}).filter(item -> item.getPid() == null).collect(Collectors.toList());
}
private static boolean isHasGroup(Long id) {
List<ExtendTitlePO> titlesByGroupID = MapperProxyFactory.getProxy(ExtendTitleMapper.class).getTitlesByGroupID(id);
return titlesByGroupID.size() > 0;
}
/**
* 获取对应表名
*
* @param extendGroupPO
* @return
*/
public static String getTableNameByGroupPO(ExtendGroupPO extendGroupPO) {
String tableName = "";
switch (extendGroupPO.getExtendType()) {
case 1:
tableName = "JCL_ORG_COMP";
break;
case 2:
tableName = "JCL_ORG_DEPT";
break;
case 3:
tableName = "JCL_ORG_JOB";
break;
default:
break;
}
if (extendGroupPO.getIsSystemDefault() == 0) {
} else if (null == extendGroupPO.getPid()) {
tableName += "EXT";
} else {
tableName += "EXT_DT1";
}
return tableName;
}
}

186
src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
View File

@ -3,6 +3,7 @@ package com.engine.organization.entity.extend.bo;
import com.api.browser.bean.BrowserBean;
import com.api.browser.bean.BrowserValueInfo;
import com.api.browser.bean.SearchConditionItem;
import com.api.browser.bean.SearchConditionOption;
import com.api.browser.service.BrowserValueInfoService;
import com.api.browser.util.BrowserInitUtil;
import com.api.browser.util.ConditionFactory;
@ -11,22 +12,26 @@ import com.api.hrm.bean.FieldItem;
import com.api.hrm.util.FieldType;
import com.api.hrm.util.ServiceUtil;
import com.engine.kq.cmd.shiftmanagement.toolkit.ShiftManagementToolKit;
import com.engine.organization.entity.SelectOptionParam;
import com.engine.organization.entity.extend.param.ExtendInfoFieldParam;
import com.engine.organization.entity.extend.po.ExtendGroupPO;
import com.engine.organization.entity.extend.po.ExtendInfoPO;
import com.engine.organization.mapper.extend.ExtendInfoMapper;
import com.engine.organization.util.OrganizationFormItemUtil;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.sensitive.biz.SensitiveWordTypeComInfo;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.file.ImageFileManager;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.definedfield.HrmFieldManager;
import weaver.systeminfo.SystemEnv;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/19
* @version: 1.0
@ -63,6 +68,69 @@ public class ExtendInfoBO {
}
/**
* 新增自定义字段时，对象转换
*
* @param user
* @param infoFieldParam
* @param extendGroupPO
* @param extendGroupId
* @param showOrder
* @return
*/
public static ExtendInfoPO convertFieldParam2ExtendInfo(User user, ExtendInfoFieldParam infoFieldParam, ExtendGroupPO extendGroupPO, Long extendGroupId, Integer showOrder) {
if (null == infoFieldParam) {
return null;
}
String controlType = infoFieldParam.getControlType();
String browserType = infoFieldParam.getBrowserType(controlType);
String dbType = infoFieldParam.getDbType(controlType, browserType);
if (StringUtils.isEmpty(dbType)) {
dbType = infoFieldParam.getDbType("2", "");
}
return ExtendInfoPO
.builder()
.id(infoFieldParam.getId())
.extendType(extendGroupPO.getExtendType())
.tableName(ExtendGroupBO.getTableNameByGroupPO(extendGroupPO))
.fieldName(infoFieldParam.getFieldname())
.fieldNameDesc(infoFieldParam.getFieldlabel())
// 数据库类型
.fieldType(dbType)
.controlType(Integer.parseInt(controlType))
.browserType(browserType)
.extendGroupId(extendGroupId)
.isenable("1".equals(infoFieldParam.getEnable()) ? 1 : 0)
.isrequired("1".equals(infoFieldParam.getRequired()) ? 1 : 0)
.listShow(1)
.editShow("0".equals(infoFieldParam.getIsModify()) ? 0 : 1)
.addShow(1)
.browserShow(1)
.customValue(infoFieldParam.getFieldType().toString())
.showOrder(showOrder)
// 非系统初始化字段
.isSystemDefault(1)
.creator((long) user.getUID())
.deleteType(0)
.createTime(new Date())
.build();
}
/**
* 当前自定义字段是否已使用
*
* @param tableName
* @param fieldName
* @return
*/
public static boolean fieldIsUsed(String tableName, String fieldName) {
if (StringUtils.isAnyEmpty(tableName, fieldName)) {
return true;
}
List<Object> objects = MapperProxyFactory.getProxy(ExtendInfoMapper.class).listFieldsByTableName(tableName, fieldName);
objects.removeIf(Objects::isNull);
return CollectionUtils.isNotEmpty(objects);
}
/**
* 明细表字段
@ -114,7 +182,8 @@ public class ExtendInfoBO {
// 浏览按钮特殊处理
if (FieldType.BROWSER.equals(fieldItem.getType())) {
BrowserBean browserConditionParam = OrganizationFormItemUtil.browserItem(user, 2, 16, fieldItem.getViewAttr(), false, extendInfoPO.getFieldNameDesc(), extendInfoPO.getBrowserType(), extendInfoPO.getFieldName(), extendInfoPO.getCustomBrowserId()).getBrowserConditionParam();
String browserId = SelectOptionParam.getCustomBrowserId(extendInfoPO.getCustomValue());
BrowserBean browserConditionParam = OrganizationFormItemUtil.browserItem(user, 2, 16, fieldItem.getViewAttr(), false, extendInfoPO.getFieldNameDesc(), extendInfoPO.getBrowserType(), extendInfoPO.getFieldName(), browserId).getBrowserConditionParam();
fieldItem.setBrowserConditionParam(browserConditionParam);
}
@ -163,7 +232,7 @@ public class ExtendInfoBO {
String fieldlabel = Util.null2String(extendInfoPO.getFieldNameDesc());//字段显示名
String fieldhtmltype = Util.null2String(extendInfoPO.getControlType());//字段类型
String detailtype = Util.null2String(extendInfoPO.getBrowserType());//字段二级类型（浏览框--单人力）
String dmlurl = Util.null2String("");
String customValue = Util.null2String(extendInfoPO.getCustomValue());
boolean isQuickSearch = true;
boolean isScope = false;
@ -176,11 +245,12 @@ public class ExtendInfoBO {
} else if (detailtype.equals("2")) {//数字
searchConditionItem = conditionFactory.createCondition(ConditionType.INPUTNUMBER, fieldlabel, fieldname, isQuickSearch);
} else {
searchConditionItem = conditionFactory.createCondition(ConditionType.INPUT, fieldlabel, fieldname, isQuickSearch);
searchConditionItem = conditionFactory.createCondition(ConditionType.INPUT, "25034", fieldname, isQuickSearch);
}
} else if (fieldhtmltype.equals("2")) {//多行文本框
searchConditionItem = conditionFactory.createCondition(ConditionType.TEXTAREA, fieldlabel, fieldname);
} else if (fieldhtmltype.equals("3")) {//浏览按钮
customValue = SelectOptionParam.getCustomBrowserId(customValue);
if (detailtype.equals("2")) {
if (!extendInfoPO.getTableName().toLowerCase().contains("_dt")) {
searchConditionItem = conditionFactory.createCondition(ConditionType.DATEPICKER, fieldlabel, fieldname);
@ -212,25 +282,25 @@ public class ExtendInfoBO {
searchConditionItem = conditionFactory.createCondition(ConditionType.TIMERANGEPICKER, fieldlabel, domkey);
searchConditionItem.setValue(fieldvalue);
} else {
//if (detailtype.equals("161") || detailtype.equals("162") || detailtype.equals("256") || detailtype.equals("257")) {
// BrowserBean browserbean = new BrowserBean(detailtype + "");
// BrowserInitUtil browserInitUtil = new BrowserInitUtil();
// String fielddbtype = dmlurl;
// if (!dmlurl.startsWith("browser.")) {
// fielddbtype = "browser." + dmlurl;
// }
// if (detailtype.equals("161") || detailtype.equals("162")) {
// browserInitUtil.initCustomizeBrow(browserbean, fielddbtype, Util.getIntValue(detailtype), user.getUID());
// } else {
// browserbean.getDataParams().put("cube_treeid", dmlurl);
// browserbean.getDataParams().put("currenttime", System.currentTimeMillis());
// browserInitUtil.initBrowser(browserbean, user.getLanguage());
// }
// searchConditionItem = new SearchConditionItem(ConditionType.BROWSER, SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()), new String[]{fieldname}, browserbean);
//} else {
searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype);
//}
// searchConditionItem.getBrowserConditionParam().setHideVirtualOrg(hrmFieldBean.getHideVirtualOrg());
if (detailtype.equals("161") || detailtype.equals("162") || detailtype.equals("256") || detailtype.equals("257")) {
BrowserBean browserbean = new BrowserBean(detailtype + "");
BrowserInitUtil browserInitUtil = new BrowserInitUtil();
String fielddbtype = customValue;
if (!customValue.startsWith("browser.")) {
fielddbtype = "browser." + customValue;
}
if (detailtype.equals("161") || detailtype.equals("162")) {
browserInitUtil.initCustomizeBrow(browserbean, fielddbtype, Util.getIntValue(detailtype), user.getUID());
} else {
browserbean.getDataParams().put("cube_treeid", customValue);
browserbean.getDataParams().put("currenttime", System.currentTimeMillis());
browserInitUtil.initBrowser(browserbean, user.getLanguage());
}
searchConditionItem = new SearchConditionItem(ConditionType.BROWSER, fieldlabel, new String[]{fieldname}, browserbean);
} else {
searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype);
}
//searchConditionItem.getBrowserConditionParam().setHideVirtualOrg(hrmFieldBean.getHideVirtualOrg());
List<Map<String, Object>> replaceDatas = new ArrayList<Map<String, Object>>();
String tmpFieldValue = Util.null2String(fieldvalue);
if (detailtype.equals("mkqshift")) {
@ -260,7 +330,9 @@ public class ExtendInfoBO {
for (int i = 0; fieldvalues != null && i < fieldvalues.size(); i++) {
BrowserValueInfo valueInfo = fieldvalues.get(i);
String fieldshowname = valueInfo.getName();
if (fieldshowname.length() == 0) continue;
if (fieldshowname.length() == 0) {
continue;
}
Map<String, Object> replaceData = new HashMap<String, Object>();
replaceData.put("id", valueInfo.getId());
replaceData.put("name", fieldshowname);
@ -268,7 +340,7 @@ public class ExtendInfoBO {
}
} else {
if (tmpFieldValue.length() > 0) {
String fieldshowname = hrmFieldManager.getFieldvalue(user, dmlurl, Util.getIntValue(fieldid), Util.getIntValue(fieldhtmltype), Util.getIntValue(detailtype), tmpFieldValue, 0);
String fieldshowname = hrmFieldManager.getFieldvalue(user, customValue, Util.getIntValue(fieldid), Util.getIntValue(fieldhtmltype), Util.getIntValue(detailtype), tmpFieldValue, 0);
String[] fieldvalues = Util.splitString(tmpFieldValue, ",");
String[] fieldshownames = Util.splitString(fieldshowname, ",");
if (detailtype.equals("257")) {
@ -281,7 +353,9 @@ public class ExtendInfoBO {
if (fieldvalues.length != fieldshownames.length) {
break;
}
if (Util.null2String(fieldshownames[i]).length() == 0) continue;
if (Util.null2String(fieldshownames[i]).length() == 0) {
continue;
}
Map<String, Object> replaceData = new HashMap<String, Object>();
replaceData.put("id", fieldvalues[i]);
replaceData.put("name", fieldshownames[i]);
@ -298,49 +372,15 @@ public class ExtendInfoBO {
}
} else if (fieldhtmltype.equals("5")) { //选择框
// List<SearchConditionOption> statusOptions = hrmFieldBean.getSelectOption();
// if (statusOptions == null) statusOptions = new ArrayList<SearchConditionOption>();
// try {
// if (fieldid.length() > 0) {
// rs = new RecordSet();
// char flag = Util.getSeparator();
// if (hrmFieldBean.getIsFormField()) {
// if (Util.null2String(hrmFieldBean.getIssystem()).equals("1")) {
// rs.executeProc("hrm_selectitembyid_new", "" + fieldid + flag + 1);
// } else {
// rs.executeProc("cus_selectitembyid_new", "" + fieldid + flag + 1);
// }
// } else {
// if (fieldname.startsWith("column_")) {
// rs.executeProc("cus_selectitembyid_new", "" + fieldid + flag + 1);
// } else {
// rs.executeProc("hrm_searchselectitembyid", fieldid);
// }
// }
// while (rs.next()) {
// String tmpselectvalue = Util.null2String(rs.getString("selectvalue"));
// String tmpselectname = Util.toScreen(rs.getString("selectname"), user.getLanguage());
// if (Util.null2String(rs.getString("cancel")).equals("1")) continue;
// boolean isDefault = Util.null2String(rs.getString("isdefault")).equals("y");
// if (!isDefault) {
// isDefault = Util.null2String(rs.getString("hrm_isdefault")).equals("1");
// }
// SearchConditionOption searchConditionOption = new SearchConditionOption(tmpselectvalue, tmpselectname, isDefault);
// if (!statusOptions.contains(searchConditionOption)) {
// statusOptions.add(searchConditionOption);
// }
// }
// }
// } catch (Exception e) {
// writeLog(e);
// }
// searchConditionItem = conditionFactory.createCondition(ConditionType.SELECT, fieldlabel, fieldname, statusOptions);
// if (detailtype.equals("") || detailtype.equals("0")) {
// detailtype = "1";
// }
// searchConditionItem.setKey(Util.null2String(fieldvalue));
// searchConditionItem.setValue(fieldvalue);
// searchConditionItem.setDetailtype(Util.getIntValue(detailtype, 3));
List<SearchConditionOption> searchConditionOptions = SelectOptionParam.convertJsonToListOption(customValue);
searchConditionItem = conditionFactory.createCondition(ConditionType.SELECT, fieldlabel, fieldname, searchConditionOptions);
if (detailtype.equals("") || detailtype.equals("0")) {
detailtype = "1";
}
searchConditionItem.setKey(Util.null2String(fieldvalue));
searchConditionItem.setValue(fieldvalue + "");
searchConditionItem.setDetailtype(Util.getIntValue(detailtype, 3));
} else if (fieldhtmltype.equals("6")) {//附件
if (fieldname.equals("resourceimageid")) {
searchConditionItem = conditionFactory.createCondition(ConditionType.RESOURCEIMG, fieldlabel, fieldname, isQuickSearch);

35
src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java Normal file
View File

@ -0,0 +1,35 @@
package com.engine.organization.entity.extend.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import weaver.general.StringUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* @author:dxfeng
* @createTime: 2022/06/16
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtendFieldSearchParam {
private String id;
private Long groupId;
private Long groupType;
public Collection<Long> getId() {
if (StringUtil.isEmpty(id)) {
return new ArrayList<>();
}
return Arrays.stream(id.split(",")).map(Long::parseLong).collect(Collectors.toList());
}
}

22
src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java Normal file
View File

@ -0,0 +1,22 @@
package com.engine.organization.entity.extend.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author:dxfeng
* @createTime: 2022/06/16
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtendInfoChangeParam {
private String fieldids;
private String fieldnames;
private Long groupid;
private Long scopeid;
}

130
src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java Normal file
View File

@ -0,0 +1,130 @@
package com.engine.organization.entity.extend.param;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.engine.hrm.biz.FieldParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang.StringUtils;
import weaver.general.Util;
/**
* @author:dxfeng
* @createTime: 2022/06/15
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtendInfoFieldParam {
private Long id;
// field_name
private String fieldname;
// field_name_desc
private String fieldlabel;
private Object fieldType;
private String enable;
private String required;
private String isModify;
private String key;
public String getControlType() {
JSONArray fieldType = (JSONArray) this.getFieldType();
String fieldHtmlType = Util.null2String(fieldType.get(0));
if (fieldHtmlType.equals("input")) {
fieldHtmlType = "1";
} else if (fieldHtmlType.equals("textarea")) {
fieldHtmlType = "2";
} else if (fieldHtmlType.equals("browser")) {
fieldHtmlType = "3";
} else if (fieldHtmlType.equals("check")) {
fieldHtmlType = "4";
} else if (fieldHtmlType.equals("select")) {
fieldHtmlType = "5";
} else if (fieldHtmlType.equals("upload")) {
fieldHtmlType = "6";
}
return fieldHtmlType;
}
public String getBrowserType(String controlType) {
String browserType = "1";
JSONArray fieldType = (JSONArray) this.getFieldType();
if (fieldType.size() > 1) {
browserType = Util.null2String(fieldType.get(1));
}
if (controlType.equals("1")) {
if (browserType.equals("text")) {
browserType = "1";
} else if (browserType.equals("int")) {
browserType = "2";
} else if (browserType.equals("float")) {
browserType = "3";
} else if (browserType.equals("file")) {
browserType = "1";
}
}
if (controlType.equals("2")) {
browserType = "1";
} else if (controlType.equals("3")) {
browserType = Util.null2String(((JSONObject) fieldType.get(1)).get("value"));
} else if (controlType.equals("4")) {
browserType = "1";
} else if (controlType.equals("5")) {
browserType = "1";
} else if (controlType.equals("6")) {
if (browserType.equals("file")) {
browserType = "1";
}
}
return browserType;
}
public String getDbType(String controlType, String browserType) {
FieldParam fp = new FieldParam();
if (controlType.equals("1")) {
JSONArray fieldType = (JSONArray) this.getFieldType();
String dbLength = "100";
if (fieldType.size() > 2) {
dbLength = fieldType.get(2).toString();
}
fp.setSimpleText(Util.getIntValue(browserType, -1), dbLength);
} else if (controlType.equals("2")) {
fp.setText();
} else if (controlType.equals("3")) {
fp.setBrowser(Util.getIntValue(browserType, -1));
} else if (controlType.equals("4")) {
fp.setCheck();
} else if (controlType.equals("5")) {
fp.setSelect();
} else if (controlType.equals("6")) {
fp.setAttach();
}
return fp.getFielddbtype();
}
public static String toDbc(String input) {
if (StringUtils.isBlank(input)) {
return "";
}
char[] c = input.toCharArray();
for (int i = 0; i < c.length; i++) {
if (c[i] == 12288) {
c[i] = (char) 32;
continue;
}
if (c[i] > 65280 && c[i] < 65375) {
c[i] = (char) (c[i] - 65248);
}
}
return new String(c);
}
}

24
src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java Normal file
View File

@ -0,0 +1,24 @@
package com.engine.organization.entity.extend.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author:dxfeng
* @createTime: 2022/06/15
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtendTitleSaveParam {
private String data;
private Long groupType;
private Long id;
private String groupName;
private String isShow;
}

13
src/com/engine/organization/entity/extend/po/ExtendGroupPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/18
* @version: 1.0
@ -33,6 +33,17 @@ public class ExtendGroupPO {
*/
private String groupName;
/**
* 父级
*/
private Long pid;
private String isShow;
private Integer showOrder;
private Integer isSystemDefault;
private Long creator;
private int deleteType;
private Date createTime;

8
src/com/engine/organization/entity/extend/po/ExtendInfoPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/19
* @version: 1.0
@ -100,15 +100,17 @@ public class ExtendInfoPO {
private Integer browserShow;
/**
* 自定义浏览按钮标识
* 自定义标识
*/
private String customBrowserId;
private String customValue;
/**
* 显示顺序
*/
private Integer showOrder;
private Integer isSystemDefault;
private Long creator;
private int deleteType;
private Date createTime;

50
src/com/engine/organization/entity/extend/po/ExtendTitlePO.java Normal file
View File

@ -0,0 +1,50 @@
package com.engine.organization.entity.extend.po;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author:dxfeng
* @createTime: 2022/06/14
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtendTitlePO {
/**
* 主键
*/
private Long id;
/**
* 分组标识
*/
private Long groupId;
/**
* 分组名称
*/
private String title;
/**
* 展示排序
*/
private Integer showOrder;
/**
* 是否展示
*/
private String isShow;
private Integer isSystemDefault;
private Long creator;
private Integer deleteType;
private Date createTime;
private Date updateTime;
}

36
src/com/engine/organization/entity/fieldset/param/FieldTypeTreeParam.java Normal file
View File

@ -0,0 +1,36 @@
package com.engine.organization.entity.fieldset.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author weaver_cl
* @Description:
* @Date 2022/6/15
* @Version V1.0
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FieldTypeTreeParam {
private String data; //信息维护json数据
private Long id;
private Long parentId;
private String name;
private String isShow;
private String groupOrder;
private List<FieldTypeTreeParam> childs;
}

72
src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java Normal file
View File

@ -0,0 +1,72 @@
package com.engine.organization.entity.fieldset.vo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
/**
* @Author weaver_cl
* @description:
* @Date 2022/6/13
* @Version V1.0
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TypeTreeVO {
//是否可以增加子节点
private boolean addChild;
private boolean canCanceled;
//当前节点是否可点击
private boolean canClick;
//树id
private String domid;
//是否存在分组
private boolean hasGroup;
//是否有子节点
private boolean haschild;
//是否是叶子节点
private boolean isLeaf;
//是否是父节点
private boolean isParent;
//是否默认选中
private boolean isSelected;
//是否展示
private String isShow;
//是否默认展开
private boolean isopen;
//键
private Long key;
//树名称
private String name;
//子节点
private List<TypeTreeVO> childs;
//
private int viewAttr;
private ArrayList<TypeTreeVO> subs;
//父节点id
private Long pid;
}

30
src/com/engine/organization/entity/job/bo/JobBO.java
View File

@ -3,6 +3,7 @@ package com.engine.organization.entity.job.bo;
import com.engine.organization.entity.job.dto.JobListDTO;
import com.engine.organization.entity.job.param.JobSearchParam;
import com.engine.organization.entity.job.po.JobPO;
import com.engine.organization.entity.job.vo.SingleJobTreeVO;
import com.engine.organization.mapper.job.JobMapper;
import com.engine.organization.transmethod.JobTransMethod;
import com.engine.organization.util.db.MapperProxyFactory;
@ -12,7 +13,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/30
* @version: 1.0
@ -28,8 +29,8 @@ public class JobBO {
.id(param.getId() == null ? 0 : param.getId())
.jobNo(param.getJobNo())
.jobName(param.getJobName())
.parentComp(param.getParentComp())
.parentDept(param.getParentDept())
.parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp())
.parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept())
.sequenceId(param.getSequenceId())
.schemeId(param.getSchemeId())
.parentJob(param.getParentJob())
@ -47,6 +48,29 @@ public class JobBO {
}
public static List<SingleJobTreeVO> buildSingleJobTreeVOS(List<JobPO> jobPOS, Long parentDept) {
if (CollectionUtils.isEmpty(jobPOS)) {
return Collections.emptyList();
}
Map<Long, JobPO> poMaps = jobPOS.stream().collect(Collectors.toMap(JobPO::getId, item -> item));
List<SingleJobTreeVO> singleJobTreeVOS = jobPOS.stream().map(e ->
SingleJobTreeVO
.builder()
.id(e.getId())
.jobNo(e.getJobNo())
.jobName(e.getJobName())
.parentJobName(null == poMaps.get(e.getParentJob()) ? "" : poMaps.get(e.getParentJob()).getJobName())
.parentJob(e.getParentJob())
.parentDept(e.getParentDept())
.build()).collect(Collectors.toList());
//获取非一级部门
Map<Long, List<SingleJobTreeVO>> collects = singleJobTreeVOS.stream().filter(item -> null != item.getParentJob()).collect(Collectors.groupingBy(SingleJobTreeVO::getParentJob));
return singleJobTreeVOS.stream().peek(e -> e.setChildren(collects.get(e.getId()))).filter(item -> parentDept.equals(item.getParentDept()) && null == item.getParentJob()).collect(Collectors.toList());
}
public static List<JobListDTO> buildDTOList(Collection<JobListDTO> list) {
// 递归添加父级数据
Map<Long, JobListDTO> poMaps = list.stream().collect(Collectors.toMap(JobListDTO::getId, item -> item));

2
src/com/engine/organization/entity/job/dto/JobListDTO.java
View File

@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
import java.util.List;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/30
* @version: 1.0

23
src/com/engine/organization/entity/job/param/JobCopyParam.java Normal file
View File

@ -0,0 +1,23 @@
package com.engine.organization.entity.job.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/01
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class JobCopyParam {
private String ids;
private String department;
}

6
src/com/engine/organization/entity/job/param/JobSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/30
* @version: 1.0
@ -73,4 +73,8 @@ public class JobSearchParam extends BaseQueryParam {
* 禁用标记
*/
private Boolean forbiddenTag;
private Long subcompanyid1;
private Long departmentid;
}

2
src/com/engine/organization/entity/job/po/JobDTPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/31
* @version: 1.0

2
src/com/engine/organization/entity/job/po/JobPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/30
* @version: 1.0

44
src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java Normal file
View File

@ -0,0 +1,44 @@
package com.engine.organization.entity.job.vo;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.organization.annotation.OrganizationTable;
import com.engine.organization.annotation.TableTitle;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/02
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@OrganizationTable(pageId = "434c1b24-e248-11ec-8a67-00e04c680716",
tableType = WeaTableType.NONE)
public class SingleJobTreeVO {
private Long id;
@TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo")
private String jobNo;
@TableTitle(title = "名称", dataIndex = "jobName", key = "jobName")
private String jobName;
@TableTitle(title = "上级岗位", dataIndex = "parentJobName", key = "parentJobName")
private String parentJobName;
private Long parentJob;
private Long parentDept;
private List<SingleJobTreeVO> children;
}

2
src/com/engine/organization/entity/po/Demo.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
/**
* @Author weaver_cl
* @Description: TODO
* @description:
* @Date 2022/4/26
* @Version V1.0
**/

2
src/com/engine/organization/entity/postion/dto/PostDTO.java
View File

@ -5,7 +5,7 @@ import com.engine.organization.entity.postion.po.PostPO;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/postion/dto/PostInfoDTO.java
View File

@ -6,7 +6,7 @@ import com.engine.organization.entity.postion.po.PostInfoPO;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/postion/po/PostInfoPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/postion/po/PostPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/13
* @version: 1.0

2
src/com/engine/organization/entity/scheme/dto/GradeDTO.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/11
* @Version V1.0
**/

2
src/com/engine/organization/entity/scheme/dto/LevelDTO.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/entity/scheme/dto/SchemeDTO.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
import java.util.Map;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/entity/scheme/param/GradeSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/11
* @Version V1.0
**/

2
src/com/engine/organization/entity/scheme/param/LevelSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/9
* @Version V1.0
**/

2
src/com/engine/organization/entity/scheme/po/GradePO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/11
* @version: 1.0

2
src/com/engine/organization/entity/scheme/po/LevelPO.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
/**
*
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/09
* @version: 1.0

2
src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
View File

@ -8,7 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/11
* @version: 1.0

2
src/com/engine/organization/entity/searchtree/SearchTree.java
View File

@ -4,7 +4,7 @@ import com.api.hrm.bean.TreeNode;
import lombok.Data;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/26
* @version: 1.0

2
src/com/engine/organization/entity/searchtree/SearchTreeParams.java
View File

@ -3,7 +3,7 @@ package com.engine.organization.entity.searchtree;
import lombok.Data;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/26
* @version: 1.0

2
src/com/engine/organization/entity/sequence/dto/SequenceDTO.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/11
* @Version V1.0
**/

2
src/com/engine/organization/entity/sequence/param/SequenceSearchParam.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
/**
* @Author dxfeng
* @Description: TODO
* @description:
* @Date 2022/5/12
* @Version V1.0
**/

2
src/com/engine/organization/entity/sequence/po/SequencePO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/12
* @version: 1.0

2
src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
View File

@ -8,7 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/12
* @version: 1.0

43
src/com/engine/organization/entity/staff/bo/StaffBO.java
View File

@ -2,11 +2,12 @@ package com.engine.organization.entity.staff.bo;
import com.engine.organization.entity.staff.param.StaffSearchParam;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.transmethod.StaffTransMethod;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0
@ -35,4 +36,44 @@ public class StaffBO {
.creator(employeeId)
.build();
}
public static void buildStaffDesc(StaffPO staffPO) {
staffPO.setLackStatus(parseLackStatus(null == staffPO.getStaffNum() ? 0 : staffPO.getStaffNum(), null == staffPO.getPermanentNum() ? 0 : staffPO.getPermanentNum()));
StringBuilder sb = new StringBuilder();
sb.append("编制数：").append(parseNull(staffPO.getStaffNum()))
.append(",在编数：").append(parseNull(staffPO.getPermanentNum()))
.append(",冻结数：").append(parseNull(staffPO.getFreezeNum()))
.append(",缺编状态：").append(StaffTransMethod.getLackSpan(staffPO.getLackStatus()+""));
staffPO.setStaffDesc(sb.toString());
}
/**
* null 转换为 0
*
* @param number
* @return
*/
private static Integer parseNull(Integer number) {
return null == number ? 0 : number;
}
/**
* 转换缺编状态
*
* @param staffNum
* @param permanentNum
* @return
*/
private static int parseLackStatus(int staffNum, int permanentNum) {
if (staffNum == permanentNum) {
return 2;
}
if (staffNum > permanentNum) {
return 1;
}
return 3;
}
}

12
src/com/engine/organization/entity/staff/bo/StaffPlanBO.java
View File

@ -2,11 +2,13 @@ package com.engine.organization.entity.staff.bo;
import com.engine.organization.entity.staff.param.StaffPlanSearchParam;
import com.engine.organization.entity.staff.po.StaffPlanPO;
import weaver.common.DateUtil;
import weaver.general.StringUtil;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0
@ -21,15 +23,17 @@ public class StaffPlanBO {
.planNo(param.getPlanNo())
.planName(param.getPlanName())
.planYear(param.getPlanYear())
.timeStart(param.getTimeStart())
.timeEnd(param.getTimeEnd())
.timeStart(StringUtil.isEmpty(param.getTimeStart()) ? null : DateUtil.parseToDateTime(param.getTimeStart()))
.timeEnd(StringUtil.isEmpty(param.getTimeEnd()) ? null : DateUtil.parseToDateTime(param.getTimeEnd()))
.companyId(param.getCompanyId())
.description(param.getDescription())
.forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 0 : 1)
.forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)
.deleteType(0)
.createTime(new Date())
.updateTime(new Date())
.creator(employeeId)
.build();
}
}

8
src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java
View File

@ -5,10 +5,8 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0
@ -37,11 +35,11 @@ public class StaffPlanSearchParam {
/**
* 时间开始
*/
private Date timeStart;
private String timeStart;
/**
* 时间结束
*/
private Date timeEnd;
private String timeEnd;
/**
* 适用公司
*/

12
src/com/engine/organization/entity/staff/param/StaffSearchParam.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0
@ -65,4 +65,14 @@ public class StaffSearchParam {
* 说明
*/
private String description;
/**
* 方案名称
*/
private String staffName;
/**
* 调整数量
*/
private Integer changeNum;
}

2
src/com/engine/organization/entity/staff/po/StaffPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/25
* @version: 1.0

2
src/com/engine/organization/entity/staff/po/StaffPlanPO.java
View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @description:
* @author:dxfeng
* @createTime: 2022/05/24
* @version: 1.0

50
src/com/engine/organization/entity/staff/po/StaffsPO.java Normal file
View File

@ -0,0 +1,50 @@
package com.engine.organization.entity.staff.po;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description:
* @author:dxfeng
* @createTime: 2022/06/07
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class StaffsPO {
/**
* 主键
*/
private Long id;
/**
* 编制ID
*/
private Long staffId;
/**
* 业务类型
*/
private Integer businessType;
/**
* 编制变动数
*/
private Integer changeNum;
/**
* 业务来源
*/
private Integer businessSource;
/**
* 关联流程
*/
private Integer requestId;
private Long creator;
private int deleteType;
private Date createTime;
private Date updateTime;
}

Some files were not shown because too many files have changed in this diff Show More