Pre Merge pull request !104 from dxfeng/feature/dxf

pull/104/MERGE
dxfeng 3 years ago committed by Gitee
commit f323ecce2b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

@ -0,0 +1,12 @@
INSERT INTO jcl_field_extendgroup
(id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default)
VALUES(1, 1, '基本信息', 1, 0, '2022-06-17', '2022-06-17', NULL, '1', 1, 0);
INSERT INTO jcl_field_extendgroup
(id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default)
VALUES(2, 2, '基本信息', 1, 0, '2022-06-17', '2022-06-17', NULL, '1', 1, 0);
INSERT INTO jcl_field_extendgroup
(id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default)
VALUES(3, 3, '基本信息', 1, 0, '2022-06-17', '2022-06-17', NULL, '1', 1, 0);
INSERT INTO jcl_field_extendgroup
(id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default)
VALUES(4, 4, '基本信息', 1, 0, '2022-06-17', '2022-06-17', NULL, '1', 1, 0);

@ -0,0 +1,93 @@
INSERT INTO jcl_field_extendinfo
(id, 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(1, 1, 'JCL_ORG_COMP', 'comp_no', '编号', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(2, 1, 'JCL_ORG_COMP', 'comp_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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, 1, 'JCL_ORG_COMP', 'industry', '行业', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, NULL, NULL, '63', NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(5, 1, 'JCL_ORG_COMP', 'comp_name_short', '简称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(6, 1, 'JCL_ORG_COMP', 'org_code', '组织机构代码', 'varchar(100)', 1, 1, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(7, 1, 'JCL_ORG_COMP', 'comp_principal', '负责人', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, NULL, NULL, '1', NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(8, 1, 'JCL_ORG_COMP', 'description', '说明', 'text', 2, 1, 1, 0, 1, 0, 1, 0, 1, 8, 1, 0, NULL, NULL, NULL, NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(9, 1, 'JCL_ORG_COMP', 'forbidden_tag', '禁用标记', 'int', 5, 1, 1, 0, 1, 1, 0, 0, 1, 9, 1, 0, NULL, NULL, '', '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(10, 2, 'JCL_ORG_DEPT', 'dept_no', '编号', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(11, 2, 'JCL_ORG_DEPT', 'dept_name', '名称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, NULL, NULL, '1', NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(12, 2, 'JCL_ORG_DEPT', 'dept_name_short', '简称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, NULL, NULL, '1', NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(13, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(14, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, NULL, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(15, 2, 'JCL_ORG_DEPT', 'dept_principal', '部门负责人', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, NULL, NULL, '1', NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(16, 2, 'JCL_ORG_DEPT', 'show_order', '显示顺序', 'int', 1, 2, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, NULL, NULL, '2', NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(17, 2, 'JCL_ORG_DEPT', 'description', '说明', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 7, 1, 0, NULL, NULL, NULL, NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(18, 2, 'JCL_ORG_DEPT', 'forbidden_tag', '禁用标记', 'int', 5, 2, 1, 0, 1, 1, 0, 0, 1, 7, 1, 0, NULL, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(19, 3, 'JCL_ORG_JOB', 'job_no', '编号', 'varchar(100)', 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(20, 3, 'JCL_ORG_JOB', 'job_name', '名称', 'varchar(100)', 1, 3, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(21, 3, 'JCL_ORG_JOB', 'parent_comp', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 3, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(22, 3, 'JCL_ORG_JOB', 'parent_dept', '所属部门', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, NULL, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(23, 3, 'JCL_ORG_JOB', 'sequence_id', '岗位序列', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"sequenceBrowser","valueSpan":"岗位序列","replaceDatas":[{"showname":"sequenceBrowser","shownamespan":"sequenceBrowser","namespan":"岗位序列","name":"岗位序列","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","randomFieldId":"sequenceBrowser","id":"sequenceBrowser"}]}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(24, 3, 'JCL_ORG_JOB', 'scheme_id', '等级方案', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"schemeBrowser","valueSpan":"等级方案浏览按钮","replaceDatas":[{"showname":"schemeBrowser","shownamespan":"schemeBrowser","namespan":"等级方案浏览按钮","name":"等级方案浏览按钮","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","randomFieldId":"schemeBrowser","id":"schemeBrowser"}]}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(25, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"jobBrowser","valueSpan":"岗位浏览按钮","replaceDatas":[{"showname":"jobBrowser","shownamespan":"jobBrowser","namespan":"岗位浏览按钮","name":"岗位浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"jobBrowser","id":"jobBrowser"}]}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(26, 3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 3, 1, 0, 1, 1, 1, 1, 1, 8, 1, 0, NULL, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(27, 3, 'JCL_ORG_JOB', 'workplace', '工作地点', 'varchar(100)', 1, 3, 1, 0, 1, 1, 1, 0, 1, 9, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0);
INSERT INTO jcl_field_extendinfo
(id, 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(28, 3, 'JCL_ORG_JOB', 'description', '工作概述', 'text', 2, 3, 1, 0, 1, 1, 1, 0, 1, 10, 1, 0, NULL, NULL, NULL, NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(29, 3, 'JCL_ORG_JOB', 'work_duty', '任职职责', 'text', 2, 3, 1, 0, 1, 1, 1, 0, 1, 11, 1, 0, NULL, NULL, NULL, NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(30, 3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 3, 1, 0, 1, 1, 1, 0, 1, 12, 1, 0, NULL, NULL, NULL, NULL, 0);
INSERT INTO jcl_field_extendinfo
(id, 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(31, 3, 'JCL_ORG_JOB', 'forbidden_tag', '禁用标记', 'int', 5, 3, 1, 0, 1, 1, 0, 0, 1, 13, 1, 0, NULL, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0);

@ -0,0 +1,12 @@
INSERT INTO jcl_field_extendtitle
(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default)
VALUES(1, 1, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0);
INSERT INTO jcl_field_extendtitle
(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default)
VALUES(2, 2, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0);
INSERT INTO jcl_field_extendtitle
(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default)
VALUES(3, 3, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0);
INSERT INTO jcl_field_extendtitle
(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default)
VALUES(4, 4, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0);

@ -120,6 +120,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP (
extend_type int null, extend_type int null,
group_name varchar(100) NULL, group_name varchar(100) NULL,
show_order int null, show_order int null,
is_show varchar(100) NULL,
is_system_default int null,
creator int null, creator int null,
delete_type int null, delete_type int null,
create_time date null, create_time date null,
@ -134,6 +136,7 @@ create table JCL_FIELD_EXTENDTITLE (
title varchar(100) null, title varchar(100) null,
show_order int null, show_order int null,
is_show int null, is_show int null,
is_system_default int null,
creator int null, creator int null,
delete_type int null, delete_type int null,
create_time date null, create_time date null,
@ -161,6 +164,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
add_show int null, add_show int null,
browser_show int null, browser_show int null,
show_order int null, show_order int null,
is_system_default int null,
creator int null, creator int null,
delete_type int null, delete_type int null,
create_time date null, create_time date null,
@ -346,3 +350,35 @@ CREATE TABLE JCL_ORG_STAFFS (
update_time date null, update_time date null,
CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id) CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id)
); );
-- JCL_ORG_MAP
CREATE TABLE JCL_ORG_MAP (
id int auto_increment NOT NULL,
ftype int NULL,
fobjid int NULL,
fecid int NULL,
Uuid varchar(100) NULL,
fclass int NULL,
fclassname varchar(100) NULL,
fnumber varchar(100) NULL,
fname varchar(255) NULL,
fleader int NULL,
fleaderimg int NULL,
fleadername varchar(100) NULL,
fleaderjobid int NULL,
fleaderjob varchar(255) NULL,
fleaderlv varchar(100) NULL,
fleaderst varchar(100) NULL,
fparentid int null,
fobjparentid int null,
fplan int null,
fonjob int null,
fisvitual int null,
fdatebegin date null,
fdateend date null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_MAP PRIMARY KEY (id)
);

@ -122,6 +122,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP (
EXTEND_TYPE NUMBER NULL, EXTEND_TYPE NUMBER NULL,
GROUP_NAME NVARCHAR2(100) NULL, GROUP_NAME NVARCHAR2(100) NULL,
SHOW_ORDER NUMBER null, SHOW_ORDER NUMBER null,
IS_SHOW NVARCHAR2(100) NULL,
IS_SYSTEM_DEFAULT NUMBER NULL,
CREATOR NUMBER NULL, CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL, DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL, CREATE_TIME DATE NULL,
@ -136,6 +138,7 @@ CREATE TABLE JCL_FIELD_EXTENDTITLE (
TITLE VARCHAR(100) NULL, TITLE VARCHAR(100) NULL,
SHOW_ORDER NUMBER NULL, SHOW_ORDER NUMBER NULL,
IS_SHOW NUMBER NULL, IS_SHOW NUMBER NULL,
IS_SYSTEM_DEFAULT NUMBER NULL,
CREATOR NUMBER NULL, CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL, DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL, CREATE_TIME DATE NULL,
@ -163,6 +166,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
ADD_SHOW NUMBER NULL, ADD_SHOW NUMBER NULL,
BROWSER_SHOW NUMBER NULL, BROWSER_SHOW NUMBER NULL,
SHOW_ORDER NUMBER NULL, SHOW_ORDER NUMBER NULL,
IS_SYSTEM_DEFAULT NUMBER NULL,
CREATOR NUMBER NULL, CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL, DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL, CREATE_TIME DATE NULL,

@ -120,6 +120,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP (
extend_type int null, extend_type int null,
group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
show_order int null, show_order int null,
is_show varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
is_system_default int null,
creator int null, creator int null,
delete_type int null, delete_type int null,
create_time datetime null, create_time datetime null,
@ -134,10 +136,11 @@ create table JCL_FIELD_EXTENDTITLE (
title varchar(100) COLLATE Chinese_PRC_CI_AS NULL, title varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
show_order int null, show_order int null,
is_show int null, is_show int null,
is_system_default int null,
creator int null, creator int null,
delete_type int null, delete_type int null,
create_time date null, create_time datetime null,
update_time date null, update_time datetime null,
CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (id) CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (id)
); );
@ -161,6 +164,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO (
add_show int null, add_show int null,
browser_show int null, browser_show int null,
show_order int null, show_order int null,
is_system_default int null,
creator int null, creator int null,
delete_type int null, delete_type int null,
create_time datetime null, create_time datetime null,

@ -74,6 +74,9 @@ public class ExtendGroupBO {
case 3: case 3:
tableName = "JCL_ORG_JOB"; tableName = "JCL_ORG_JOB";
break; break;
case 4:
tableName = "JCL_ORG_HRMRESOURCE";
break;
default: default:
break; break;
} }

@ -174,7 +174,7 @@ public class ExtendInfoBO {
// 必填 // 必填
if (1 == extendInfoPO.getIsrequired()) { if (1 == extendInfoPO.getIsrequired()) {
fieldItem.setViewAttr(3); fieldItem.setViewAttr(3);
fieldItem.setRules("required|string"); fieldItem.setRules("required");
} else { } else {
fieldItem.setViewAttr(2); fieldItem.setViewAttr(2);
} }

@ -269,7 +269,6 @@
<select id="getMaxId" resultType="java.lang.Long"> <select id="getMaxId" resultType="java.lang.Long">
select max(id) select max(id)
from jcl_field_extendinfo from jcl_field_extendinfo
order by id desc
</select> </select>
<select id="listFieldsByTableName" resultType="java.lang.Object"> <select id="listFieldsByTableName" resultType="java.lang.Object">
select ${fieldName} select ${fieldName}

@ -82,7 +82,7 @@ public class ExtServiceImpl extends Service implements ExtService {
item.setViewAttr(1); item.setViewAttr(1);
} else if (1 == extendInfoPO.getIsrequired()) { } else if (1 == extendInfoPO.getIsrequired()) {
item.setViewAttr(3); item.setViewAttr(3);
item.setRules("required|string"); item.setRules("required");
} }
} }
conditionItems.add(item); conditionItems.add(item);
@ -194,6 +194,10 @@ public class ExtServiceImpl extends Service implements ExtService {
if ("int".equals(extendInfoPO.getFieldType()) && StringUtils.isEmpty((String) value)) { if ("int".equals(extendInfoPO.getFieldType()) && StringUtils.isEmpty((String) value)) {
value = null; value = null;
} }
if ("text".equals(extendInfoPO.getFieldType()) && null == value) {
value = "";
}
map.put(key, value); map.put(key, value);
} }
if (null != id) { if (null != id) {

Loading…
Cancel
Save