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

!33 岗位表单更改 

Merge pull request !33 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-05-31 02:34:03 +00:00 committed by Gitee
parent 342ffeb7ee 04c7ec175f
commit 6680f188dc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 15 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +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,
creator int null,
delete_type int null,
create_time date null,
@ -19,6 +20,7 @@ CREATE TABLE JCL_ORG_LEVEL (
description text NULL,
scheme_id int null,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -34,6 +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,
creator int null,
delete_type int null,
create_time date null,
@ -49,6 +52,7 @@ CREATE TABLE JCL_ORG_SEQUENCE (
description text NULL,
scheme_id int null,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -62,6 +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,
creator int null,
delete_type int null,
create_time date null,
@ -80,6 +85,7 @@ CREATE TABLE JCL_ORG_POST_INFO (
post_id int null,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -99,6 +105,7 @@ CREATE TABLE JCL_ORG_COMP (
comp_principal int null,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -176,6 +183,7 @@ CREATE TABLE JCL_ORG_DEPT (
show_order int null,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -183,43 +191,6 @@ CREATE TABLE JCL_ORG_DEPT (
CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDGROUP_DEPT
CREATE TABLE JCL_FIELD_EXTENDGROUP_DEPT (
id int auto_increment NOT NULL,
extend_type int null,
group_name varchar(100) 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 auto_increment NOT NULL,
extend_type int null,
table_name varchar(100) NULL,
field_name varchar(100) NULL,
field_name_desc varchar(100) NULL,
field_type varchar(1000) 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 auto_increment NOT NULL,
@ -257,6 +228,7 @@ CREATE TABLE JCL_ORG_JOB (
work_duty text null,
work_authority text null,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -274,44 +246,7 @@ CREATE TABLE JCL_ORG_JOBDT (
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT CL_ORG_DEPTPEXT_PK PRIMARY KEY (id)
);
-- JCL_FIELD_EXTENDGROUP_JOB
CREATE TABLE JCL_FIELD_EXTENDGROUP_JOB (
id int auto_increment NOT NULL,
extend_type int null,
group_name varchar(100) 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 auto_increment NOT NULL,
extend_type int null,
table_name varchar(100) NULL,
field_name varchar(100) NULL,
field_name_desc varchar(100) NULL,
field_type varchar(1000) 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)
CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (id)
);
-- JCL_ORG_JOBPEXT
@ -347,6 +282,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
company_id varchar(100) NULL,
description text NULL,
forbidden_tag int NULL,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,
@ -368,6 +304,7 @@ CREATE TABLE JCL_ORG_STAFF (
lack_status int null,
staff_desc varchar(100) NULL,
description text null,
is_used int not null,
creator int null,
delete_type int null,
create_time date null,

6
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -275,7 +275,7 @@ public class JobServiceImpl extends Service implements JobService {
jobNoItem.setRules("required|string");
// 名称
SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "jobName");
jobNoItem.setRules("required|string");
jobNameItem.setRules("required|string");
// 所属分部
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser");
// 所属部门
@ -609,7 +609,7 @@ public class JobServiceImpl extends Service implements JobService {
SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "编号", "jobNo");
// 名称
SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "jobName");
jobNoItem.setRules("required|string");
jobNameItem.setRules("required|string");
// 所属分部
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser");
// 所属部门
@ -617,7 +617,7 @@ public class JobServiceImpl extends Service implements JobService {
// 岗位序列
SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
// 等级方案
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "schemeId", "schemeBrowser");
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
// 上级岗位
SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser");
// 是否关键岗