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

!70 表结构更新 BUG修复 

Merge pull request !70 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-08 06:22:52 +00:00 committed by Gitee
parent 28cbc16ef3 80a33a7787
commit 71f03a3519
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 59 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,6 +134,7 @@ 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,
extend_group_id int null,
isenable int null,
isrequired int null,
@ -152,7 +153,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,
@ -193,7 +194,7 @@ CREATE TABLE JCL_ORG_DEPT (
-- JCL_ORG_DEPTEXT
CREATE TABLE JCL_ORG_DEPTEXT (
id int auto_increment NOT NULL,
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
@ -253,7 +254,7 @@ CREATE TABLE JCL_ORG_JOBDT (
-- JCL_ORG_JOBEXT
CREATE TABLE JCL_ORG_JOBEXT (
id int auto_increment NOT NULL,
id int NOT NULL,
creator int null,
delete_type int null,
create_time date null,
@ -327,56 +328,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)
);
);

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

@ -136,6 +136,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
FIELD_NAME_DESC NVARCHAR2(100) NULL,
FIELD_TYPE NVARCHAR2(1000) NULL,
CONTROL_TYPE NUMBER NULL,
BROWSER_TYPE NVARCHAR2(100) NULL,
EXTEND_GROUP_ID NUMBER NULL,
ISENABLE NUMBER NULL,
ISREQUIRED NUMBER NULL,
@ -328,56 +329,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 NUMBER not null,
SERIAL_TYPE NVARCHAR2(50) null,
SERIAL_ENABLE CHAR(1) null,
ONESELF_TYPE NVARCHAR2(50) null,
CREATOR NUMBER null,
DELETE_TYPE NUMBER null,
CREATE_TIME DATE null,
UPDATE_TIME DATE null,
constraint JCL_CODERULE primary key (ID)
);
--JCL_CODERULE_DETAIL
create table JCL_CODERULE_DETAIL (
ID NUMBER not null,
CODERULE_ID NUMBER(11) null,
RULE_TYPE NVARCHAR2(50) null,
RULE_VALUE NVARCHAR2(255) null,
SHOW_ORDER NUMBER(11) null,
CREATOR NUMBER null,
DELETE_TYPE NUMBER 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 NUMBER NOT NULL,
CODERULE_ID NUMBER(11) NULL,
RESERVED_CODE NVARCHAR2(255) NULL,
RESERVED_DESC NVARCHAR2 (1000) NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,
UPDATE_TIME DATE NULL,
CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (ID)
);
);

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

@ -8,8 +8,8 @@ CREATE TABLE JCL_ORG_SCHEME (
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
@ -23,8 +23,8 @@ CREATE TABLE JCL_ORG_LEVEL (
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
@ -39,8 +39,8 @@ CREATE TABLE JCL_ORG_GRADE (
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)
);
@ -55,8 +55,8 @@ CREATE TABLE JCL_ORG_SEQUENCE (
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)
);
@ -69,8 +69,8 @@ CREATE TABLE JCL_ORG_POST (
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)
);
@ -88,8 +88,8 @@ CREATE TABLE JCL_ORG_POST_INFO (
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)
);
@ -108,8 +108,8 @@ CREATE TABLE JCL_ORG_COMP (
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)
);
@ -120,8 +120,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP (
group_name varchar(100) COLLATE Chinese_PRC_CI_AS 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)
);
@ -134,6 +134,7 @@ 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,
browser_type varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
extend_group_id int null,
isenable int null,
isrequired int null,
@ -145,18 +146,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)
);
@ -166,8 +167,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)
);
@ -186,18 +187,18 @@ CREATE TABLE JCL_ORG_DEPT (
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_ORG_DEPTEXT
CREATE TABLE JCL_ORG_DEPTEXT (
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_DEPTEXT_PK PRIMARY KEY (id)
);
@ -207,8 +208,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)
);
@ -231,8 +232,8 @@ CREATE TABLE JCL_ORG_JOB (
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)
);
@ -246,18 +247,18 @@ CREATE TABLE JCL_ORG_JOBDT (
grade_id_span varchar(100) 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_JOBDT_PK PRIMARY KEY (id)
);
-- JCL_ORG_JOBEXT
CREATE TABLE JCL_ORG_JOBEXT (
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_JOBEXT_PK PRIMARY KEY (id)
);
@ -267,8 +268,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)
);
@ -279,16 +280,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)
);
@ -309,8 +310,8 @@ CREATE TABLE JCL_ORG_STAFF (
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)
);
@ -324,59 +325,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)
);
--JCL_CODERULE
CREATE TABLE JCL_CODERULE (
id int IDENTITY(1,1) 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 IDENTITY(1,1) 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 IDENTITY(1,1) 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)
);
);

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

@ -284,6 +284,7 @@ public class JobServiceImpl extends Service implements JobService {
isKeyOptions.add(noOption);
SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey");
isKeyItem.setDetailtype(3);
isKeyItem.setValue("0");
conditionItems.add(jobNoItem);
conditionItems.add(jobNameItem);

3
src/com/engine/organization/service/impl/TestServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.engine.organization.service.impl;
import com.engine.organization.entity.po.Demo;
import com.engine.organization.service.TestService;
import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService;
/**
* @Author weaver_cl
@ -10,7 +9,7 @@ import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService;
* @Date 2022/4/28
* @Version V1.0
**/
@WeaIocService
//@WeaIocService
public class TestServiceImpl implements TestService {
@Override

4
src/com/engine/organization/web/DemoController.java
View File

@ -5,7 +5,6 @@ import com.engine.organization.entity.po.Demo;
import com.engine.organization.service.TestService;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.DemoWrapper;
import com.weaverboot.frame.ioc.anno.fieldAnno.WeaAutowired;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
@ -17,7 +16,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.List;
/**
* @Author weaver_cl
@ -48,7 +46,7 @@ public class DemoController {
/**
* 方案2 基于weaverboot 实现后端架构（推荐使用）
*/
@WeaAutowired
//@WeaAutowired
private TestService testService;
@GET