+
+
+ <#form:form id="inputForm" model="${employeeOffice}" action="${ctx}/sys/empOffice/save" method="post" class="form-horizontal">
+ <#form:hidden path="empCode"/>
+ <#form:hidden path="isNewRecord"/>
+
+
+
+
+
- <#form:select multiple="true" path="employee.employeePosts" items="${postList}"
- itemLabel="postName" itemValue="postCode" class="form-control"/>
+ <#form:select multiple="true" path="employee.employeePosts" items="${postList}"
+ itemLabel="postName" itemValue="postCode" class="form-control"/>
@@ -158,6 +158,20 @@
+
<% } %>
+
diff --git a/web/db/db2/core.sql b/web/db/db2/core.sql
index 366940f4..f21dd61d 100644
--- a/web/db/db2/core.sql
+++ b/web/db/db2/core.sql
@@ -4,6 +4,7 @@
DROP TABLE js_gen_table_column;
DROP TABLE js_gen_table;
DROP TABLE js_sys_company_office;
+DROP TABLE js_sys_employee_office;
DROP TABLE js_sys_employee_post;
DROP TABLE js_sys_user_data_scope;
DROP TABLE js_sys_user_role;
@@ -276,6 +277,17 @@ CREATE TABLE js_sys_employee
);
+-- 员工附属机构关系表
+CREATE TABLE js_sys_employee_office
+(
+ id varchar(64) NOT NULL UNIQUE,
+ emp_code varchar(64) NOT NULL,
+ office_code varchar(64) NOT NULL,
+ post_code varchar(64),
+ PRIMARY KEY (emp_code, office_code)
+);
+
+
-- 员工与岗位关联表
CREATE TABLE js_sys_employee_post
(
diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql
index 2fb32dd6..8eb4f02b 100644
--- a/web/db/mssql/core.sql
+++ b/web/db/mssql/core.sql
@@ -4,6 +4,7 @@
IF OBJECT_ID('[js_gen_table_column]') IS NOT NULL DROP TABLE [js_gen_table_column];
IF OBJECT_ID('[js_gen_table]') IS NOT NULL DROP TABLE [js_gen_table];
IF OBJECT_ID('[js_sys_company_office]') IS NOT NULL DROP TABLE [js_sys_company_office];
+IF OBJECT_ID('[js_sys_employee_office]') IS NOT NULL DROP TABLE [js_sys_employee_office];
IF OBJECT_ID('[js_sys_employee_post]') IS NOT NULL DROP TABLE [js_sys_employee_post];
IF OBJECT_ID('[js_sys_user_data_scope]') IS NOT NULL DROP TABLE [js_sys_user_data_scope];
IF OBJECT_ID('[js_sys_user_role]') IS NOT NULL DROP TABLE [js_sys_user_role];
@@ -276,6 +277,17 @@ CREATE TABLE [js_sys_employee]
);
+-- 员工附属机构关系表
+CREATE TABLE [js_sys_employee_office]
+(
+ [id] varchar(64) NOT NULL UNIQUE,
+ [emp_code] varchar(64) NOT NULL,
+ [office_code] varchar(64) NOT NULL,
+ [post_code] varchar(64),
+ PRIMARY KEY ([emp_code], [office_code])
+);
+
+
-- 员工与岗位关联表
CREATE TABLE [js_sys_employee_post]
(
diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql
index eb36c6b5..a94e69c9 100644
--- a/web/db/mysql/core.sql
+++ b/web/db/mysql/core.sql
@@ -5,6 +5,7 @@ SET SESSION FOREIGN_KEY_CHECKS=0;
DROP TABLE IF EXISTS js_gen_table_column;
DROP TABLE IF EXISTS js_gen_table;
DROP TABLE IF EXISTS js_sys_company_office;
+DROP TABLE IF EXISTS js_sys_employee_office;
DROP TABLE IF EXISTS js_sys_employee_post;
DROP TABLE IF EXISTS js_sys_user_data_scope;
DROP TABLE IF EXISTS js_sys_user_role;
@@ -277,6 +278,18 @@ CREATE TABLE js_sys_employee
) COMMENT = '员工表';
+-- 员工附属机构关系表
+CREATE TABLE js_sys_employee_office
+(
+ id varchar(64) NOT NULL COMMENT '编号',
+ emp_code varchar(64) NOT NULL COMMENT '员工编码',
+ office_code varchar(64) NOT NULL COMMENT '机构编码',
+ post_code varchar(64) COMMENT '岗位编码',
+ PRIMARY KEY (emp_code, office_code),
+ UNIQUE (id)
+) COMMENT = '员工附属机构关系表';
+
+
-- 员工与岗位关联表
CREATE TABLE js_sys_employee_post
(
diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql
index 39112ebe..9a3806cd 100644
--- a/web/db/oracle/core.sql
+++ b/web/db/oracle/core.sql
@@ -4,6 +4,7 @@
DROP TABLE js_gen_table_column CASCADE CONSTRAINTS;
DROP TABLE js_gen_table CASCADE CONSTRAINTS;
DROP TABLE js_sys_company_office CASCADE CONSTRAINTS;
+DROP TABLE js_sys_employee_office CASCADE CONSTRAINTS;
DROP TABLE js_sys_employee_post CASCADE CONSTRAINTS;
DROP TABLE js_sys_user_data_scope CASCADE CONSTRAINTS;
DROP TABLE js_sys_user_role CASCADE CONSTRAINTS;
@@ -276,6 +277,17 @@ CREATE TABLE js_sys_employee
);
+-- 员工附属机构关系表
+CREATE TABLE js_sys_employee_office
+(
+ id varchar2(64) NOT NULL UNIQUE,
+ emp_code varchar2(64) NOT NULL,
+ office_code varchar2(64) NOT NULL,
+ post_code varchar2(64),
+ PRIMARY KEY (emp_code, office_code)
+);
+
+
-- 员工与岗位关联表
CREATE TABLE js_sys_employee_post
(
@@ -1104,6 +1116,11 @@ COMMENT ON COLUMN js_sys_employee.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_employee.remarks IS '备注信息';
COMMENT ON COLUMN js_sys_employee.corp_code IS '租户代码';
COMMENT ON COLUMN js_sys_employee.corp_name IS '租户名称';
+COMMENT ON TABLE js_sys_employee_office IS '员工附属机构关系表';
+COMMENT ON COLUMN js_sys_employee_office.id IS '编号';
+COMMENT ON COLUMN js_sys_employee_office.emp_code IS '员工编码';
+COMMENT ON COLUMN js_sys_employee_office.office_code IS '机构编码';
+COMMENT ON COLUMN js_sys_employee_office.post_code IS '岗位编码';
COMMENT ON TABLE js_sys_employee_post IS '员工与岗位关联表';
COMMENT ON COLUMN js_sys_employee_post.emp_code IS '员工编码';
COMMENT ON COLUMN js_sys_employee_post.post_code IS '岗位编码';
diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql
index 193d3468..d53d9f47 100644
--- a/web/db/postgresql/core.sql
+++ b/web/db/postgresql/core.sql
@@ -4,6 +4,7 @@
DROP TABLE IF EXISTS js_gen_table_column;
DROP TABLE IF EXISTS js_gen_table;
DROP TABLE IF EXISTS js_sys_company_office;
+DROP TABLE IF EXISTS js_sys_employee_office;
DROP TABLE IF EXISTS js_sys_employee_post;
DROP TABLE IF EXISTS js_sys_user_data_scope;
DROP TABLE IF EXISTS js_sys_user_role;
@@ -276,6 +277,17 @@ CREATE TABLE js_sys_employee
) WITHOUT OIDS;
+-- 员工附属机构关系表
+CREATE TABLE js_sys_employee_office
+(
+ id varchar(64) NOT NULL UNIQUE,
+ emp_code varchar(64) NOT NULL,
+ office_code varchar(64) NOT NULL,
+ post_code varchar(64),
+ PRIMARY KEY (emp_code, office_code)
+) WITHOUT OIDS;
+
+
-- 员工与岗位关联表
CREATE TABLE js_sys_employee_post
(
@@ -1104,6 +1116,11 @@ COMMENT ON COLUMN js_sys_employee.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_employee.remarks IS '备注信息';
COMMENT ON COLUMN js_sys_employee.corp_code IS '租户代码';
COMMENT ON COLUMN js_sys_employee.corp_name IS '租户名称';
+COMMENT ON TABLE js_sys_employee_office IS '员工附属机构关系表';
+COMMENT ON COLUMN js_sys_employee_office.id IS '编号';
+COMMENT ON COLUMN js_sys_employee_office.emp_code IS '员工编码';
+COMMENT ON COLUMN js_sys_employee_office.office_code IS '机构编码';
+COMMENT ON COLUMN js_sys_employee_office.post_code IS '岗位编码';
COMMENT ON TABLE js_sys_employee_post IS '员工与岗位关联表';
COMMENT ON COLUMN js_sys_employee_post.emp_code IS '员工编码';
COMMENT ON COLUMN js_sys_employee_post.post_code IS '岗位编码';