diff --git a/docs/1017/Mysql.sql b/docs/1017/Mysql.sql index 1076007e..9d51857f 100644 --- a/docs/1017/Mysql.sql +++ b/docs/1017/Mysql.sql @@ -98,4 +98,6 @@ alter table JCL_ORG_HRMRESOURCE add ec_company int; alter table JCL_ORG_HRMRESOURCE add uuid varchar(50); -insert into jcl_org_hrmresource (work_code, last_name, sex, status, account_type, belong_to, job_title, job_level, location_id, show_order, ec_company, company_id, ec_department, department_id, company_start_date, work_start_date, job_activity_desc, resource_image_id, mobile, telephone, email, uuid, delete_type) select a.workcode , a.lastname , a.sex , a.status , a.accounttype , a.belongto , c.id, c.grade_id, a.locationid , a.dsporder , a.subcompanyid1 , c.parent_comp, a.departmentid , c.parent_dept, a.companystartdate , a.workstartdate , a.jobactivitydesc , a.resourceimageid, a.mobile , a.telephone , a.email, a.uuid, 0 from hrmresource a inner join hrmjobtitles b on a.jobtitle = b.id inner join ( select * from jcl_org_job ) c on a.subcompanyid1 = c.ec_company and a.departmentid = c.ec_department and b.jobtitlename = c.job_name; \ No newline at end of file +insert into jcl_org_hrmresource (work_code, last_name, sex, status, account_type, belong_to, job_title, job_level, location_id, show_order, ec_company, company_id, ec_department, department_id, company_start_date, work_start_date, job_activity_desc, resource_image_id, mobile, telephone, email, uuid, delete_type) select a.workcode , a.lastname , a.sex , a.status , a.accounttype , a.belongto , c.id, c.grade_id, a.locationid , a.dsporder , a.subcompanyid1 , c.parent_comp, a.departmentid , c.parent_dept, a.companystartdate , a.workstartdate , a.jobactivitydesc , a.resourceimageid, a.mobile , a.telephone , a.email, a.uuid, 0 from hrmresource a inner join hrmjobtitles b on a.jobtitle = b.id inner join ( select * from jcl_org_job ) c on a.subcompanyid1 = c.ec_company and a.departmentid = c.ec_department and b.jobtitlename = c.job_name; + +update jcl_org_map a inner join jcl_org_hrmresource b on a.uuid = b.uuid set a.id = (300000000 + b.id), a.fobjid = b.id; \ No newline at end of file diff --git a/docs/1017/SqlServer.sql b/docs/1017/SqlServer.sql index fde5a984..e755841e 100644 --- a/docs/1017/SqlServer.sql +++ b/docs/1017/SqlServer.sql @@ -1,49 +1,42 @@ -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEMCLASS]') AND type IN ('U')) -DROP TABLE [dbo].[JCL_ORG_ITEMCLASS] -GO - CREATE TABLE [dbo].[JCL_ORG_ITEMCLASS] ( - [fid] int IDENTITY(1,1) NOT NULL, - [fno] varchar(50) NOT NULL, - [fname] varchar(50) NOT NULL, - [fmemo] varchar(255) NULL, - [creator] int NULL, - [create_time] datetime NULL, - [update_time] datetime NULL - ) +[fid] int IDENTITY(1,1) NOT NULL, +[fno] varchar(50) NOT NULL, +[fname] varchar(50) NOT NULL, +[fmemo] varchar(255) NULL, +[creator] int NULL, +[create_time] datetime NULL, +[update_time] datetime NULL +) GO ALTER TABLE [dbo].[JCL_ORG_ITEMCLASS] SET (LOCK_ESCALATION = TABLE) GO ALTER TABLE [dbo].[JCL_ORG_ITEMCLASS] ADD CONSTRAINT [JCL_ORG_ITEMCLASS_PK] PRIMARY KEY CLUSTERED ([fid]) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY] GO - IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEM]') AND type IN ('U')) -DROP TABLE [dbo].[JCL_ORG_ITEM] -GO CREATE TABLE [dbo].[JCL_ORG_ITEM] ( - [fid] int IDENTITY(1,1) NOT NULL, - [fclassid] int NOT NULL, - [fno] varchar(50) NOT NULL, - [fname] varchar(255) NOT NULL, - [fmemo] varchar(255) NULL, - [fdelete] int NOT NULL, - [creator] int NULL, - [create_time] datetime NULL, - [update_time] datetime NULL - ) +[fid] int IDENTITY(1,1) NOT NULL, +[fclassid] int NOT NULL, +[fno] varchar(50) NOT NULL, +[fname] varchar(255) NOT NULL, +[fmemo] varchar(255) NULL, +[fdelete] int NOT NULL, +[creator] int NULL, +[create_time] datetime NULL, +[update_time] datetime NULL +) GO ALTER TABLE [dbo].[JCL_ORG_ITEM] SET (LOCK_ESCALATION = TABLE) GO ALTER TABLE [dbo].[JCL_ORG_ITEM] ADD CONSTRAINT [JCL_ORG_ITEM_PK] PRIMARY KEY CLUSTERED ([fid]) - WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) - ON [PRIMARY] +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY] GO delete from jcl_org_job where id not in ( select max(id) from jcl_org_job group by parent_comp , parent_dept, parent_job, job_name) @@ -57,55 +50,58 @@ INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_nam INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'status', '状态', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 4, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"试用"},{"default":"","unuse":"","id":"1","key":"1","option":"正式"},{"default":"","unuse":"","id":"2","key":"2","option":"临时"},{"default":"","unuse":"","id":"3","key":"3","option":"试用延期"},{"default":"","unuse":"","id":"4","key":"4","option":"解聘"},{"default":"","unuse":"","id":"5","key":"5","option":"离职"},{"default":"","unuse":"","id":"6","key":"6","option":"退休"},{"default":"","unuse":"","id":"7","key":"7","option":"无效"},{"default":"","unuse":"","id":"8","key":"8","option":"在职"}],"sort":"horizontal"}]', 0) INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'account_type', '账号类型', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"主账号"},{"default":"","unuse":"","id":"1","key":"1","option":"次账号"}],"sort":"horizontal"}]', 0) INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'belong_to', '主账号', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 6, 1, 0, GETDATE(), GETDATE(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_title', '岗位', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 7, 1, 0, GETDATE(), GETDATE(), '666', '["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"name":"聚才林岗位","id":"666"}],"value":"666"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_level', '职级', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 8, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职级浏览按钮","value":"gradeBrowser"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_group_id', '职务类别', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 9, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","value":"postBrowser"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_activity', '职务', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 10, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务信息浏览按钮","value":"PostInfoBrowser"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'location_id', '办公地点', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 11, 1, 0, GETDATE(), GETDATE(), '262', '["browser",{"valueSpan":"办公地点","replaceDatas":[{"name":"办公地点","id":"262"}],"value":"262"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'show_order', '显示顺序', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 12, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'ec_company', '分部', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 13, 1, 0, GETDATE(), GETDATE(), '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'ec_department', '部门', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 14, 1, 0, GETDATE(), GETDATE(), '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'company_start_date', '入职日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 15, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'work_start_date', '参加工作日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 16, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_activity_desc', '职责描述', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 17, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'department_id', '部门', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 18, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","value":"deptBrowser"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'login_id', '登录名', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 19, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_call', '职称', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 20, 1, 0, GETDATE(), GETDATE(), '260', '["browser",{"valueSpan":"职称","replaceDatas":[{"name":"职称","id":"260"}],"value":"260"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'system_language', '系统语言', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 21, 1, 0, GETDATE(), GETDATE(), '259', '["browser",{"valueSpan":"语言","replaceDatas":[{"name":"语言","id":"259"}],"value":"259"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'resource_image_id', '照片', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 22, 1, 0, GETDATE(), GETDATE(), '1', '["upload","file"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'messager_url', '头像', 'varchar(1000)', 6, 4, 0, 0, 1, NULL, 1, 1, 1, 23, 1, 0, GETDATE(), GETDATE(), '1', '["upload","file"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'company_id', '分部', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 24, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"公司分部浏览按钮","value":"compBrowser"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'pass_word', '密码', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 25, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'sec_level', '安全级别', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 26, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'birthday', '出生日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 27, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'folk', '民族', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 28, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'native_place', '籍贯', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 29, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'reg_resident_place', '户口', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 30, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'certificate_num', '身份证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 31, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'marital_status', '婚姻状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 32, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"未婚"},{"default":"","unuse":"","id":"1","key":"1","option":"已婚"},{"default":"","unuse":"","id":"2","key":"2","option":"离异"}],"sort":"horizontal"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'policy', '政治面貌', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 33, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'be_member_date', '入团日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 34, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'start_date', '合同开始日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 35, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'be_party_date', '入党日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 36, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'islabouunion', '工会会员', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 37, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"是"},{"default":"","unuse":"","id":"1","key":"1","option":"否"}],"sort":"horizontal"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'education_level', '学历', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 38, 1, 0, GETDATE(), GETDATE(), '30', '["browser",{"valueSpan":"学历","replaceDatas":[{"name":"学历","id":"30"}],"value":"30"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'degree', '学位', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 39, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'health_info', '健康状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 40, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"优秀"},{"default":"","unuse":"","id":"1","key":"1","option":"良好"},{"default":"","unuse":"","id":"2","key":"2","option":"一般"},{"default":"","unuse":"","id":"3","key":"3","option":"较差"}],"sort":"horizontal"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'height', '身高', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 41, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'weight', '体重', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 42, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'use_kind', '用工性质', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 43, 1, 0, GETDATE(), GETDATE(), '31', '["browser",{"valueSpan":"用工性质","replaceDatas":[{"name":"用工性质","id":"31"}],"value":"31"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'end_date', '合同结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 44, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'probation_end_date', '试用期结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 45, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'resident_place', '现居住地', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 46, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'home_address', '家庭联系方式', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 47, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'temp_resident_number', '暂住证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 48, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'accum_fund_account', '公积金帐户', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 49, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'account_name', '工资账号户名', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 50, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'bank_id', '工资银行', 'varchar(400)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 51, 1, 0, GETDATE(), GETDATE(), '284', '["browser",{"valueSpan":"工资银行","replaceDatas":[{"name":"工资银行","id":"284"}],"value":"284"}]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'account_id', '工资账号', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 52, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 53, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 54, 1, 0, GETDATE(), GETDATE(), '3', '["input","float"]', 0) -INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 55, 1, 0, GETDATE(), GETDATE(), '3', '["input","float"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'ec_company', '分部', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 7, 1, 0, GETDATE(), GETDATE(), '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_title', '岗位', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 8, 1, 0, GETDATE(), GETDATE(), '666', '["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"name":"聚才林岗位","id":"666"}],"value":"666"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'ec_department', '部门', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 9, 1, 0, GETDATE(), GETDATE(), '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'scheme_id', '等级方案', 'text', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 10, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"等级方案浏览按钮","value":"schemeBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'sequence_id', '岗位序列', 'text', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 11, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"岗位序列","value":"sequenceBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_grade', '职级', 'text', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 12, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职级浏览按钮","value":"gradeBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_level', '职等', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 13, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职等浏览按钮","value":"LevelBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_group_id', '职务类别', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 14, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","value":"postBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_activity', '职务', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 15, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务信息浏览按钮","value":"PostInfoBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'location_id', '办公地点', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 16, 1, 0, GETDATE(), GETDATE(), '262', '["browser",{"valueSpan":"办公地点","replaceDatas":[{"name":"办公地点","id":"262"}],"value":"262"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'show_order', '显示顺序', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 17, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'company_start_date', '入职日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 18, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'work_start_date', '参加工作日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 19, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_activity_desc', '职责描述', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 20, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'resource_image_id', '照片', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 21, 1, 0, GETDATE(), GETDATE(), '1', '["upload","file"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'department_id', '所属部门', 'int', 3, 4, 1, 1, 0, NULL, 0, 0, 1, 22, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","value":"deptBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'login_id', '登录名', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 23, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'job_call', '职称', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 24, 1, 0, GETDATE(), GETDATE(), '260', '["browser",{"valueSpan":"职称","replaceDatas":[{"name":"职称","id":"260"}],"value":"260"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'system_language', '系统语言', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 25, 1, 0, GETDATE(), GETDATE(), '259', '["browser",{"valueSpan":"语言","replaceDatas":[{"name":"语言","id":"259"}],"value":"259"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'messager_url', '头像', 'varchar(1000)', 6, 4, 0, 0, 0, NULL, 1, 1, 1, 26, 1, 0, GETDATE(), GETDATE(), '1', '["upload","file"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'company_id', '所属分部', 'int', 3, 4, 1, 1, 0, NULL, 0, 0, 1, 27, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"公司分部浏览按钮","value":"compBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'pass_word', '密码', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 28, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'sec_level', '安全级别', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 29, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'birthday', '出生日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 30, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'folk', '民族', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 31, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'native_place', '籍贯', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 32, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'reg_resident_place', '户口', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 33, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'certificate_num', '身份证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 34, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'marital_status', '婚姻状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 35, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"未婚"},{"default":"","unuse":"","id":"1","key":"1","option":"已婚"},{"default":"","unuse":"","id":"2","key":"2","option":"离异"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'policy', '政治面貌', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 36, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'be_member_date', '入团日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 37, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'start_date', '合同开始日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 38, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'be_party_date', '入党日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 39, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'islabouunion', '工会会员', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 40, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"是"},{"default":"","unuse":"","id":"1","key":"1","option":"否"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'education_level', '学历', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 41, 1, 0, GETDATE(), GETDATE(), '30', '["browser",{"valueSpan":"学历","replaceDatas":[{"name":"学历","id":"30"}],"value":"30"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'degree', '学位', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 42, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'health_info', '健康状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 43, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"优秀"},{"default":"","unuse":"","id":"1","key":"1","option":"良好"},{"default":"","unuse":"","id":"2","key":"2","option":"一般"},{"default":"","unuse":"","id":"3","key":"3","option":"较差"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'height', '身高', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 44, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'weight', '体重', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 45, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'use_kind', '用工性质', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 46, 1, 0, GETDATE(), GETDATE(), '31', '["browser",{"valueSpan":"用工性质","replaceDatas":[{"name":"用工性质","id":"31"}],"value":"31"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'end_date', '合同结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 47, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'probation_end_date', '试用期结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 48, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'resident_place', '现居住地', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 49, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'home_address', '家庭联系方式', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 50, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'temp_resident_number', '暂住证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 51, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'accum_fund_account', '公积金帐户', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 52, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'account_name', '工资账号户名', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 53, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'bank_id', '工资银行', 'varchar(400)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 54, 1, 0, GETDATE(), GETDATE(), '284', '["browser",{"valueSpan":"工资银行","replaceDatas":[{"name":"工资银行","id":"284"}],"value":"284"}]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'account_id', '工资账号', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 55, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 56, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 57, 1, 0, GETDATE(), GETDATE(), '3', '["input","float"]', 0) +INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 58, 1, 0, GETDATE(), GETDATE(), '3', '["input","float"]', 0) INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'manager_id', '直接上级', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 1, 1, 0, GETDATE(), GETDATE(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'assistant_id', '助理', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 2, 1, 0, GETDATE(), GETDATE(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) INSERT INTO jcl_field_extendinfo (extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES(4, 'JCL_ORG_HRMRESOURCE', 'mobile', '移动电话', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 1, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) @@ -123,7 +119,17 @@ alter table JCL_ORG_HRMRESOURCE add ec_company int GO alter table JCL_ORG_HRMRESOURCE add uuid varchar(50) GO - +alter table JCL_ORG_HRMRESOURCE add job_grade varchar(50) +GO +alter table JCL_ORG_HRMRESOURCE add scheme_id varchar(50) +GO +alter table JCL_ORG_HRMRESOURCE add sequence_id varchar(50) +GO +ALTER TABLE JCL_ORG_HRMRESOURCE ALTER COLUMN job_level varchar(50) +GO insert into jcl_org_hrmresource (work_code, last_name, sex, status, account_type, belong_to, job_title, job_level, location_id, show_order, ec_company, company_id, ec_department, department_id, company_start_date, work_start_date, job_activity_desc, resource_image_id, mobile, telephone, email, uuid, delete_type) select a.workcode , a.lastname , a.sex , a.status , a.accounttype , a.belongto , c.id, c.grade_id, a.locationid , a.dsporder , a.subcompanyid1 , c.parent_comp, a.departmentid , c.parent_dept, a.companystartdate , a.workstartdate , a.jobactivitydesc , a.resourceimageid, a.mobile , a.telephone , a.email, a.uuid, 0 from hrmresource a inner join hrmjobtitles b on a.jobtitle = b.id inner join ( select * from jcl_org_job ) c on a.subcompanyid1 = c.ec_company and a.departmentid = c.ec_department and b.jobtitlename = c.job_name +GO + +update a set a.id = (300000000 + b.id), a.fobjid = b.id from jcl_org_map a inner join jcl_org_hrmresource b on a.uuid = b.uuid GO \ No newline at end of file diff --git a/docs/脚本/Mysql/组织架构图触发器.sql b/docs/脚本/Mysql/组织架构图触发器.sql index 173ef144..acebeb7c 100644 --- a/docs/脚本/Mysql/组织架构图触发器.sql +++ b/docs/脚本/Mysql/组织架构图触发器.sql @@ -2,7 +2,7 @@ insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) -select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,a.comp_principal,c.messagerurl, +select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,g.id,c.messagerurl, c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade,ifnull(parent_company,0),ifnull(parent_company,0), ifnull(e.fcnt,0),ifnull(f.fcnt,0),0,NOW(),'2099-12-31' from @@ -26,7 +26,7 @@ insert into jcl_org_map fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) -select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,a.dept_principal,c.messagerurl, +select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,g.id,c.messagerurl, c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade, (case ifnull(parent_dept,0) when 0 then parent_comp else parent_dept+100000000 end), (case ifnull(parent_dept,0) when 0 then parent_comp else parent_dept end), @@ -58,28 +58,23 @@ from JCL_ORG_job as a where plan_id in (select id from JCL_ORG_STAFFPLAN where time_start<=NOW() and time_end>NOW()) group by job_id) e on a.id=e.job_id - left join (select d.id,b.jobtitlename,count(1) fcnt - from hrmresource a - inner join HrmJobTitles b on a.jobtitle=b.id - inner join hrmdepartment c on a.departmentid=c.id - inner join jcl_org_dept d on a.uuid=b.uuid - group by d.id,b.jobtitlename) f - on f.id=a.parent_dept and a.job_name=f.jobtitlename -where ifnull(a.delete_type,0) <>1 and ifnull(a.forbidden_tag,0) <>1 and a.id>=10; + left join (select job_title,count(1) fcnt from jcl_org_hrmresource) f + on f.job_title=a.id +where ifnull(a.delete_type,0) <>1 and ifnull(a.forbidden_tag,0) <>1; insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fisvitual,fdatebegin,fdateend) -select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id, +select a.id+300000000,4,a.id,c.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id, b.job_name,a.job_level,a.job_grade, ifnull( b.id, '' ) +200000000, b.id, - 0,NOW(),'2099-12-31' + 0,NOW(),'2099-12-31' from jcl_org_hrmresource a - left join jcl_org_job b ON a.job_title = b.id - left join hrmresource c on a.uuid = c.uuid + left join jcl_org_job b ON a.job_title = b.id + left join hrmresource c on a.uuid = c.uuid where a.status<4; insert into jcl_org_map diff --git a/docs/脚本/SqlServer/组织架构图触发器.sql b/docs/脚本/SqlServer/组织架构图触发器.sql index 28d78dc7..e56bb51c 100644 --- a/docs/脚本/SqlServer/组织架构图触发器.sql +++ b/docs/脚本/SqlServer/组织架构图触发器.sql @@ -2,7 +2,7 @@ insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) -select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,a.comp_principal,c.messagerurl, +select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,g.id,c.messagerurl, c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade,isnull(parent_company,0),isnull(parent_company,0), isnull(e.fcnt,0),isnull(f.fcnt,0),0,cast(GETDATE() as date),'2099-12-31' from @@ -25,8 +25,7 @@ insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) - -select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,a.dept_principal,c.messagerurl, +select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,g.id,c.messagerurl, c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade, (case isnull(parent_dept,0) when 0 then parent_comp else parent_dept+100000000 end), (case isnull(parent_dept,0) when 0 then parent_comp else parent_dept end), @@ -66,14 +65,14 @@ inner join hrmdepartment c on a.departmentid=c.id inner join jcl_org_dept d on a.uuid=b.uuid group by d.id,b.jobtitlename) f on f.id=a.parent_dept and a.job_name=f.jobtitlename -where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 and a.id>=10 +where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 go insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fisvitual,fdatebegin,fdateend) -select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id, +select a.id+300000000,4,a.id,c.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id, b.job_name,a.job_level,a.job_grade, cast(isnull(b.id,'') as int)+200000000, cast(isnull(b.id,'') as int), diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java index 77f70c1e..0f973bbf 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -21,6 +21,7 @@ import lombok.NoArgsConstructor; "t.last_name," + "t.department_id," + "t.company_id," + + "t.job_title," + "t.mobile," + "t.telephone," + "t.manager_id, " + @@ -58,6 +59,9 @@ public class HrmResourceVO { @OrganizationTableColumn(text = "分部", width = "25%", column = "company_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getCompanyName") private String companyName; + @OrganizationTableColumn(text = "岗位", width = "25%", column = "job_title", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getJobName") + private String jobName; + /** * 移动电话 */ diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java index 219439ec..8ee8675d 100644 --- a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java @@ -35,7 +35,7 @@ public interface HrmResourceMapper { * @param keyFieldValue * @return */ - Integer getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue); + Long getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue); ///** // * 根据所选关键字段，查询关键列 diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml index c459937f..6e8b2355 100644 --- a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml @@ -32,7 +32,7 @@ where delete_type = 0 and id = #{id} - select id from jcl_org_hrmresource where delete_type = 0 diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml index 6b98fdef..18c55956 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml @@ -142,8 +142,8 @@ diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 626a6e8e..79104c5a 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -653,8 +653,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService new Thread(new JobTriggerRunnable(jobPO.getId())).start(); } // 更新当前部门下的人员 - List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeEcDeptId); + List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString()); rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getEcCompany(), targetEcDeptId, mergeEcDeptId); + new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? ,department_id = ?, ec_department = ?where department_id =?", targetDepartment.getParentComp(), targetDepartment.getEcCompany(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId()); // 更新人员组织架构图 for (Long hrmResourceId : hrmResourceIds) { new Thread(new HrmResourceTriggerRunnable(hrmResourceId)).start(); @@ -756,7 +757,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 更新当前部门下的人员 List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString()); String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(deptById.getId().toString()); - new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID =?", ecCompanyId, ecDepartmentId); + new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId); + new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? where department_id =?", deptById.getParentComp(), ecCompanyId, deptById.getId()); // 更新人员组织架构图 for (Long hrmResourceId : hrmResourceIds) { new Thread(new HrmResourceTriggerRunnable(hrmResourceId)).start(); @@ -788,7 +790,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 更新当前部门下的人员 List hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString()); String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(departmentPO.getId().toString()); - new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID =?", ecCompanyId, ecDepartmentId); + new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId); + new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? where department_id =?", parentComp, ecCompanyId, departmentPO.getId()); // 更新人员组织架构图 for (Long hrmResourceId : hrmResourceIds) { new Thread(new HrmResourceTriggerRunnable(hrmResourceId)).start(); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 5b09db96..11246461 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -303,7 +303,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic SearchConditionItem departmentIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", ""); SearchConditionItem telephoneItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "办公电话", "telephone"); SearchConditionItem mobileItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "移动电话", "mobile"); - SearchConditionItem mobileCallItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "其他电话", "mobileCall"); conditionItems.add(lastNameItem); conditionItems.add(jobTitleItem); @@ -311,7 +310,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic conditionItems.add(departmentIdItem); conditionItems.add(telephoneItem); conditionItems.add(mobileItem); - conditionItems.add(mobileCallItem); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); apiDatas.put("conditions", addGroups); @@ -329,6 +327,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build()); rightMenuList.add(MenuBtn.rightMenu_btnLog()); btnDatas.put("rightMenu", rightMenuList); + btnDatas.put("hasRight", HasRightUtil.hasRight(user, RIGHT_NAME, true)); return btnDatas; } diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 99bfd971..1dbcfadb 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.organization.entity.fieldset.param.FieldTransferParam; import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO; import com.engine.organization.entity.jclimport.po.JclImportHistoryPO; import com.engine.organization.entity.jclimport.vo.JclImportHistoryDetailVO; +import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.enums.OrgImportEnum; @@ -26,22 +27,18 @@ import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendInfoMapper; +import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.jclimport.JclImportHistoryDetailMapper; import com.engine.organization.mapper.jclimport.JclImportHistoryMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.ImportCommonService; -import com.engine.organization.thread.CompanyTriggerRunnable; -import com.engine.organization.thread.DepartmentTriggerRunnable; -import com.engine.organization.thread.JobTriggerRunnable; -import com.engine.organization.thread.OrganizationSyncEc; +import com.engine.organization.thread.*; import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.excel.ExcelUtil; import com.engine.organization.util.relation.EcHrmRelationUtil; -import com.engine.organization.util.saveimport.hrmimport.HrmImportAdaptExcelE9; -import com.engine.organization.util.saveimport.hrmimport.HrmImportProcessE9; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.xssf.usermodel.XSSFCell; @@ -49,19 +46,18 @@ import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.common.DateUtil; -import weaver.file.FileUploadToPath; import weaver.file.ImageFileManager; import weaver.general.BaseBean; import weaver.general.GCONST; import weaver.general.Util; import weaver.hrm.definedfield.HrmFieldManager; -import weaver.join.hrm.in.HrmResourceVo; import weaver.systeminfo.SystemEnv; import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -78,6 +74,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ private static final Long COMPANY_TYPE = 1L; private static final Long DEPARTMENT_TYPE = 2L; private static final Long JOB_TYPE = 3L; + private static final Long RESOURCE_TYPE = 4L; private static final String RIGHT_NAME = "DataImport:All"; private static final String HRM_COMPANY = "hrmsubcompany"; @@ -98,8 +95,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ String tableName = ""; String errorMsg = ""; List excludeFields = new ArrayList<>(); - List includeFields = new ArrayList<>(); - List selectedList = new ArrayList<>(); + //List includeFields = new ArrayList<>(); + //List selectedList = new ArrayList<>(); Map returnMaps = new HashMap<>(); if (StringUtils.isNotBlank(importType)) { switch (importType) { @@ -123,12 +120,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ case "resource": extendType = "4"; tableName = "JCL_ORG_HRMRESOURCE"; - includeFields.add(FieldTransferParam.builder().id("-1").name("所属分部").build()); - includeFields.add(FieldTransferParam.builder().id("-2").name("所属部门").build()); - selectedList.add("-1"); - selectedList.add("-2"); - excludeFields.add("ec_company"); - excludeFields.add("ec_department"); excludeFields.add("scheme_id"); excludeFields.add("sequence_id"); excludeFields.add("job_grade"); @@ -149,9 +140,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.LIST.getValue(), "1"); List filterList = infoPOList.stream().filter(item -> !excludeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList()); List fieldDatas = filterList.stream().map(item -> FieldTransferParam.builder().id(item.getId().toString()).name(item.getFieldNameDesc()).build()).collect(Collectors.toList()); - fieldDatas.addAll(0, includeFields); + //fieldDatas.addAll(0, includeFields); List selectedKeys = filterList.stream().filter(item -> (0 == item.getIsSystemDefault()) && 1 == item.getIsrequired()).map(item -> item.getId().toString()).collect(Collectors.toList()); - selectedKeys.addAll(0,selectedList); + //selectedKeys.addAll(0, selectedList); returnMaps.put("data", fieldDatas); returnMaps.put("selectedKeys", selectedKeys); @@ -197,6 +188,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ String importType = (String) params.get("importType"); String operateType = (String) params.get("operateType"); String excelFile = (String) params.get("excelfile"); + String keyField = (String) params.get("keyField"); Map returnMap = new HashMap<>(); if (StringUtils.isNotBlank(importType)) { switch (importType) { @@ -210,27 +202,29 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ returnMap.put("pId", jobImport(operateType, excelFile)); break; case "resource": - Long importHistoryId = saveImportLog("resource", operateType); - HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9(); - FileUploadToPath fu = new FileUploadToPath(request); - - List errorInfo = importAdapt.creatImportMap(fu); - - //如果读取数据和验证模板没有发生错误 - if (errorInfo.isEmpty()) { - Map hrMap = importAdapt.getHrmImportMap(); - - HrmImportProcessE9 importProcess = new HrmImportProcessE9(); - importProcess.init(request, importHistoryId); - - - importProcess.processMap(hrMap); - } else { - for (String s : errorInfo) { - MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(JclImportHistoryDetailPO.builder().pid(importHistoryId).operateDetail(Util.null2String(s)).status("0").build()); - } - } - returnMap.put("pId", importHistoryId); + //Long importHistoryId = saveImportLog("resource", operateType); + //HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9(); + //FileUploadToPath fu = new FileUploadToPath(request); + // + //List errorInfo = importAdapt.creatImportMap(fu); + // + ////如果读取数据和验证模板没有发生错误 + //if (errorInfo.isEmpty()) { + // Map hrMap = importAdapt.getHrmImportMap(); + // + // HrmImportProcessE9 importProcess = new HrmImportProcessE9(); + // importProcess.init(request, importHistoryId); + // + // + // importProcess.processMap(hrMap); + //} else { + // for (String s : errorInfo) { + // MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(JclImportHistoryDetailPO.builder().pid(importHistoryId).operateDetail(Util.null2String(s)).status("0").build()); + // } + //} + //returnMap.put("pId", importHistoryId); + + returnMap.put("pId", hrmResourceImport(operateType, excelFile,keyField)); break; default: break; @@ -485,11 +479,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ //重复验证字段 List statusOptions = new ArrayList<>(); - statusOptions.add(new SearchConditionOption("workcode", SystemEnv.getHtmlLabelName(714, user.getLanguage()), true)); - statusOptions.add(new SearchConditionOption("loginid", SystemEnv.getHtmlLabelName(412, user.getLanguage()))); - statusOptions.add(new SearchConditionOption("lastname", SystemEnv.getHtmlLabelName(413, user.getLanguage()))); + statusOptions.add(new SearchConditionOption("last_name", SystemEnv.getHtmlLabelName(413, user.getLanguage()))); + statusOptions.add(new SearchConditionOption("work_code", SystemEnv.getHtmlLabelName(714, user.getLanguage()), true)); + //statusOptions.add(new SearchConditionOption("loginid", SystemEnv.getHtmlLabelName(412, user.getLanguage()))); searchConditionItem = conditionFactory.createCondition(ConditionType.SELECT, 24638, "keyField", statusOptions); - searchConditionItem.setValue("workcode"); + searchConditionItem.setValue("last_name"); itemList.add(searchConditionItem); //导入类型 @@ -521,11 +515,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ lsPromptLabel.add(128520); lsPromptLabel.add(125868); lsPromptLabel.add(128365); - lsPromptLabel.add(81697); - lsPromptLabel.add(81698); + //lsPromptLabel.add(81697); + //lsPromptLabel.add(81698); lsPromptLabel.add(81699); lsPromptLabel.add(516263); - lsPromptLabel.add(81701); + //lsPromptLabel.add(81701); lsPromptLabel.add(388880); lsPromptLabel.add(81702); lsPromptLabel.add(81703); @@ -854,7 +848,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.put("parent_comp", parentCompanyId); map.put("ec_company", EcHrmRelationUtil.getEcCompanyId(parentCompanyId.toString())); map.put("parent_dept", parentDepartmentId); - if(null!=parentDepartmentId){ + if (null != parentDepartmentId) { map.put("ec_department", EcHrmRelationUtil.getEcDepartmentId(parentDepartmentId.toString())); } departmentName = split[split.length - 1]; @@ -1092,7 +1086,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } map.put("parent_comp", parentCompanyId); map.put("parent_dept", parentDepartmentId); - map.put("ec_company", EcHrmRelationUtil.getEcCompanyId( Util.null2String(parentCompanyId))); + map.put("ec_company", EcHrmRelationUtil.getEcCompanyId(Util.null2String(parentCompanyId))); if (null != parentDepartmentId) { map.put("ec_department", EcHrmRelationUtil.getEcDepartmentId(Util.null2String(parentDepartmentId))); } @@ -1206,6 +1200,243 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ return importHistoryId; } + private Long hrmResourceImport(String operateType, String excelFile, String keyField) { + // TODO + keyField = "last_name"; + Long importHistoryId = saveImportLog("resource", operateType); + JclImportHistoryDetailPO historyDetailPO; + + ImageFileManager manager = new ImageFileManager(); + manager.getImageFileInfoById(Util.getIntValue(excelFile)); + XSSFWorkbook workbook; + try { + workbook = new XSSFWorkbook(manager.getInputStream()); + } catch (IOException e) { + throw new RuntimeException(e); + } + // 当前sheet + XSSFSheet sheetAt = workbook.getSheetAt(0); + int lastRow = sheetAt.getLastRowNum(); + List extendInfoPOS = new ArrayList<>(); + OrganizationAssert.isTrue(lastRow > 0, "导入数据为空"); + short lastCellNum = sheetAt.getRow(0).getLastCellNum(); + + // 遍历每一行数据 + nextRow: + for (int i = 0; i <= lastRow; i++) { + historyDetailPO = new JclImportHistoryDetailPO(); + historyDetailPO.setPid(importHistoryId); + XSSFRow row = sheetAt.getRow(i); + // 组装待处理数据 + Map map = new HashMap<>(); + Long parentCompanyId = null; + Long parentDepartmentId = null; + Long parentJobId = null; + + historyDetailPO.setRowNums(String.valueOf(i + 1)); + for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) { + XSSFCell cell = row.getCell((short) cellIndex); + String cellValue = getCellValue(cell).trim(); + if (i == 0) { + // 首行 初始化字段信息 + ExtendInfoPO extendInfoPO = getExtendInfoMapper().getInfoByExtendAndLabelName(RESOURCE_TYPE, cellValue); + extendInfoPOS.add(extendInfoPO); + } else { + ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex); + // 数据校验 + if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) { + historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + + Object reallyValue; + try { + reallyValue = getReallyValue(infoPO, cellValue); + } catch (Exception e) { + historyDetailPO.setOperateDetail(cellValue + "转换失败"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + if (StringUtils.isNotBlank(cellValue) && StringUtils.isBlank(Util.null2String(reallyValue)) && !"ec_company".equals(infoPO.getFieldName()) && !"ec_department".equals(infoPO.getFieldName())) { + historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "数据转换失败,未找到对应数据"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + map.put(infoPO.getFieldName(), reallyValue); + // 上级分部 + if ("ec_company".equals(infoPO.getFieldName())) { + String[] split = cellValue.split(">"); + if (split.length > 0) { + if (split.length > 8) { + historyDetailPO.setOperateDetail("分部层级不能大于10"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + for (String s : split) { + parentCompanyId = MapperProxyFactory.getProxy(CompMapper.class).getIdByNameAndPid(s, parentCompanyId == null ? 0 : parentCompanyId); + if (null == parentCompanyId) { + historyDetailPO.setOperateDetail(cellValue + "分部未找到对应数据"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + } + } + } + + + if ("ec_department".equals(infoPO.getFieldName())) { + String[] split = cellValue.split(">"); + if (split.length > 0) { + if (split.length > 8) { + historyDetailPO.setOperateDetail("部门层级不能大于10"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + for (String s : split) { + parentDepartmentId = MapperProxyFactory.getProxy(DepartmentMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId); + if (null == parentDepartmentId) { + historyDetailPO.setOperateDetail(cellValue + "部门未找到对应数据"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + } + } + } + + if ("job_title".equals(infoPO.getFieldName())) { + if (null == parentCompanyId) { + historyDetailPO.setOperateDetail(cellValue + "所属分部未找到"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + historyDetailPO.setRelatedName(cellValue); + String[] split = cellValue.split(">"); + if (split.length > 0) { + if (split.length > 8) { + historyDetailPO.setOperateDetail("岗位层级不能大于10"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + for (String s : split) { + parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId); + if (null == parentJobId) { + historyDetailPO.setOperateDetail(s + "岗位未找到对应数据"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } + } + } + map.put("company_id", parentCompanyId); + map.put("department_id", parentDepartmentId); + map.put("ec_company", EcHrmRelationUtil.getEcCompanyId(Util.null2String(parentCompanyId))); + if (null != parentDepartmentId) { + map.put("ec_department", EcHrmRelationUtil.getEcDepartmentId(Util.null2String(parentDepartmentId))); + } + map.put("job_title", parentJobId); + } + } + } + // 校验、数据交互 + if (i == 0) { + continue; + } + // 根据岗位获取等级方案、岗位序列、职等、职级 + if (null != parentJobId) { + JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId); + map.put("scheme_id", jobById.getSchemeId()); + map.put("sequence_id", jobById.getSequenceId()); + map.put("job_level", jobById.getLevelId()); + map.put("job_grade", jobById.getGradeId()); + } + + String keyFieldValue = Util.null2String(map.get(keyField)); + if(StringUtils.isBlank(keyFieldValue)){ + historyDetailPO.setOperateDetail("所选重复验证字段为空"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue; + } + + // 判断当前人员是否存在 + Long resourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getIdByKeyField(keyField, keyFieldValue); + if ("add".equals(operateType)) { + if (resourceId != null) { + historyDetailPO.setOperateDetail(keyFieldValue+"已存在"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue; + } + // 自动编号 + map.put("creator", user.getUID()); + map.put("delete_type", 0); + map.put("create_time", new Date()); + + String showOrder = Util.null2String(map.get("show_order")); + if (StringUtils.isBlank(showOrder)) { + Long maxShowOrder = MapperProxyFactory.getProxy(HrmResourceMapper.class).getMaxShowOrder(); + if (null == maxShowOrder) { + maxShowOrder = 0L; + } + map.put("show_order", maxShowOrder + 1); + } + Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.RESOURCE, OperateTypeEnum.ADD, map, false).sync(); + if (isThrowError(syncMap)) { + String ecCompanyID = Util.null2String(syncMap.get("id")); + RecordInfo recordInfo = getSystemDataMapper().getHrmObjectByID(HRM_COMPANY, ecCompanyID); + map.put("uuid", recordInfo.getUuid()); + ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_HRMRESOURCE").params(map).build(); + map.remove("id"); + MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams); + // 更新组织架构图 + new Thread(new HrmResourceTriggerRunnable(infoParams.getId())).start(); + historyDetailPO.setOperateDetail("添加成功"); + historyDetailPO.setStatus("1"); + + } else { + historyDetailPO.setOperateDetail(Util.null2String(syncMap.get("message"))); + historyDetailPO.setStatus("0"); + } + saveImportDetailLog(historyDetailPO); + } else if ("update".equals(operateType)) { + // 查询对应ID + if (resourceId == null) { + historyDetailPO.setOperateDetail("未找到对应数据"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue; + } + map.put("update_time", new Date()); + map.put("id", resourceId); + Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.RESOURCE, OperateTypeEnum.UPDATE, map, false).sync(); + if (isThrowError(syncMap)) { + map.remove("id"); + MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(resourceId).tableName("JCL_ORG_HRMRESOURCE").params(map).build()); + // 更新组织架构图 + new Thread(new HrmResourceTriggerRunnable(resourceId)).start(); + historyDetailPO.setOperateDetail("更新成功"); + historyDetailPO.setStatus("1"); + + } else { + historyDetailPO.setOperateDetail(Util.null2String(syncMap.get("message"))); + historyDetailPO.setStatus("0"); + } + saveImportDetailLog(historyDetailPO); + } + } + return importHistoryId; + } + /** * 读取表格文本内容 @@ -1257,7 +1488,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } else if ("float".equals(valueType)) { object = Float.parseFloat(cellValue); } else { - object = cellValue; + try { + object = new BigDecimal(cellValue).toPlainString(); + }catch (NumberFormatException ignore){ + object = cellValue; + } } break; case 3: diff --git a/src/com/engine/organization/service/impl/LogViewServiceImpl.java b/src/com/engine/organization/service/impl/LogViewServiceImpl.java index 3437ae3f..3cb5dd22 100644 --- a/src/com/engine/organization/service/impl/LogViewServiceImpl.java +++ b/src/com/engine/organization/service/impl/LogViewServiceImpl.java @@ -102,10 +102,10 @@ public class LogViewServiceImpl extends Service implements LogViewService { if (null != param.getDepartmentId()) { sqlWhere += " and operator_id in (select id from hrmresource where departmentid = '" + param.getDepartmentId() + "')"; } - if (StringUtils.isNotBlank(param.getOperateDate()) && !"-1".equals(param.getOperateDate())) { + if (StringUtils.isNotBlank(param.getOperateDate()) && !"-1".equals(param.getOperateDate()) && !"0,,".equals(param.getOperateDate())) { if (!"6".equals(param.getOperateDate())) { - sqlWhere += " and create_time >= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "0") + " 00:00:00'"; - sqlWhere += " and create_time <= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "") + " 23:59:59'"; + sqlWhere += " and create_time >= '" + TimeUtil.getDateByOption(param.getOperateDate(), "0") + " 00:00:00'"; + sqlWhere += " and create_time <= '" + TimeUtil.getDateByOption(param.getOperateDate(), "") + " 23:59:59'"; } else { if (StringUtils.isNotBlank(param.getStartDate())) { sqlWhere += " and create_time >= '" + param.getStartDate() + "'"; diff --git a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java index 9e25a326..ff586f3c 100644 --- a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java +++ b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java @@ -13,6 +13,7 @@ import com.engine.organization.util.OrganizationDateUtil; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import weaver.common.DateUtil; +import weaver.general.Util; import weaver.hrm.passwordprotection.domain.HrmResource; import java.sql.Date; @@ -55,7 +56,7 @@ public class DepartmentTriggerRunnable implements Runnable { } public DepartmentTriggerRunnable(Integer oldFparentId, Long departmentId) { - this.oldFparentId = oldFparentId.toString(); + this.oldFparentId = null == oldFparentId ? null : oldFparentId.toString(); this.newDepartment = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(departmentId); } @@ -114,7 +115,7 @@ public class DepartmentTriggerRunnable implements Runnable { jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); // 获取当前生效的本部门map记录 - JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.departmentfielddefined.getValue().toString(), jclMap.getFObjId().toString()); + JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.departmentfielddefined.getValue().toString(), Util.null2String(jclMap.getFObjId())); // 取出以该部门为上级部门的在编、在岗数,转移无需计算 JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, jclMap.getId().toString()); diff --git a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java index 543127dc..488bc8ff 100644 --- a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java +++ b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java @@ -55,6 +55,7 @@ public class HrmResourceTriggerRunnable implements Runnable { if (null != hrmResource && null!=ecHrmResource) { jclMap.setFObjId(hrmResource.getId().intValue()); jclMap.setId(hrmResource.getId().intValue() + sk); + jclMap.setFEcId(ecHrmResource.getId()); jclMap.setFNumber(hrmResource.getWorkCode()); jclMap.setFName(hrmResource.getLastName()); jclMap.setUuid(hrmResource.getUuid()); diff --git a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java index 4db898e0..3717084c 100644 --- a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java +++ b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java @@ -4,6 +4,7 @@ import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; +import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.util.db.MapperProxyFactory; /** @@ -20,6 +21,9 @@ public class HrmResourceTransMethod { public static String getCompanyName(String companyId) { return MapperProxyFactory.getProxy(CompMapper.class).listById(Long.parseLong(companyId)).getCompName(); } + public static String getJobName(String jobTitle) { + return MapperProxyFactory.getProxy(JobMapper.class).getJobById(Long.parseLong(jobTitle)).getJobName(); + } public static String getManagerName(String managerId) { return MapperProxyFactory.getProxy(HrmResourceMapper.class).getLastNameById(Long.parseLong(managerId)); diff --git a/src/com/engine/organization/util/RefreshIsUsedUtil.java b/src/com/engine/organization/util/RefreshIsUsedUtil.java index 7786d2be..9ea6f8c6 100644 --- a/src/com/engine/organization/util/RefreshIsUsedUtil.java +++ b/src/com/engine/organization/util/RefreshIsUsedUtil.java @@ -59,7 +59,6 @@ public class RefreshIsUsedUtil { */ public static void RefreshGrade(String tableName) { List usedIds = MapperProxyFactory.getProxy(GradeMapper.class).listUsedId(); - //usedIds.forEach(System.out ::println); usedIds.removeIf(StringUtils::isBlank); RefreshIsUsedStatus(tableName, usedIds); }